Skip to content

E
Education
Commit 5c1ecf44 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 6d2ede49
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 5 deletions
Edu.Module.Course/EducationContractModule.cs
View file @ 5c1ecf44
...@@ -176,7 +176,8 @@ namespace Edu.Module.Course ...@@ -176,7 +176,8 @@ namespace Edu.Module.Course
item.SchoolStatusStr = "审核通过"; item.SchoolStatusStr = "审核通过";
item.AdminStatusStr = "驳回"; item.AdminStatusStr = "驳回";
} }
else { else
{
if (item.AuditDate > item.SchoolManageAuditDate) if (item.AuditDate > item.SchoolManageAuditDate)
{ {
item.SchoolStatusStr = "审核通过"; item.SchoolStatusStr = "审核通过";
...@@ -188,14 +189,15 @@ namespace Edu.Module.Course ...@@ -188,14 +189,15 @@ namespace Edu.Module.Course
item.AdminStatusStr = ""; item.AdminStatusStr = "";
} }
} }
} }
else if (item.SchoolManageEmpId > 0) else if (item.SchoolManageEmpId > 0)
{ {
item.SchoolStatusStr = "驳回"; item.SchoolStatusStr = "驳回";
item.AdminStatusStr = ""; item.AdminStatusStr = "";
} }
else { else
{
item.SchoolStatusStr = ""; item.SchoolStatusStr = "";
item.AdminStatusStr = "驳回"; item.AdminStatusStr = "驳回";
} }
...@@ -208,7 +210,7 @@ namespace Edu.Module.Course ...@@ -208,7 +210,7 @@ namespace Edu.Module.Course
else if (item.Status == 5) else if (item.Status == 5)
{ {
item.SchoolStatusStr = "审核通过"; item.SchoolStatusStr = "审核通过";
item.SchoolStatusStr = "待审核"; item.AdminStatusStr = "待审核";
} }
} }
} }
...@@ -238,6 +240,61 @@ namespace Edu.Module.Course ...@@ -238,6 +240,61 @@ namespace Edu.Module.Course
var amodel = alist.Where(x => x.Id == item.CreateBy).FirstOrDefault(); var amodel = alist.Where(x => x.Id == item.CreateBy).FirstOrDefault();
item.CreateByName = amodel?.AccountName ?? ""; item.CreateByName = amodel?.AccountName ?? "";
item.CreateByPhoto = amodel?.UserIcon ?? ""; item.CreateByPhoto = amodel?.UserIcon ?? "";
if (item.Status == 1)
{
item.SchoolStatusStr = "待审核";
item.AdminStatusStr = "待审核";
}
else if (item.Status == 2)
{
item.SchoolStatusStr = "审核通过";
item.AdminStatusStr = "审核通过";
}
else if (item.Status == 3)
{
if (item.AuditEmpId > 0 && item.SchoolManageEmpId > 0)
{
if (item.SchoolManageAuditDate.HasValue)
{
item.SchoolStatusStr = "审核通过";
item.AdminStatusStr = "驳回";
}
else
{
if (item.AuditDate > item.SchoolManageAuditDate)
{
item.SchoolStatusStr = "审核通过";
item.AdminStatusStr = "驳回";
}
else
{
item.SchoolStatusStr = "驳回";
item.AdminStatusStr = "";
}
}
}
else if (item.SchoolManageEmpId > 0)
{
item.SchoolStatusStr = "驳回";
item.AdminStatusStr = "";
}
else
{
item.SchoolStatusStr = "";
item.AdminStatusStr = "驳回";
}
}
else if (item.Status == 4)
{
item.SchoolStatusStr = "合同已取消";
item.AdminStatusStr = "合同已取消";
}
else if (item.Status == 5)
{
item.SchoolStatusStr = "审核通过";
item.AdminStatusStr = "待审核";
}
} }
} }
return list; return list;
...@@ -396,7 +453,7 @@ namespace Edu.Module.Course ...@@ -396,7 +453,7 @@ namespace Edu.Module.Course
} }
else else
{ {
keyValues.Add(nameof(RB_Education_Contract_ViewModel.Status), state); keyValues.Add(nameof(RB_Education_Contract_ViewModel.Status), (state == 6 ? 5 : state));
if (state == 1 || state == 4) if (state == 1 || state == 4)
{ {
keyValues.Add(nameof(RB_Education_Contract_ViewModel.UpdateBy), userInfo.Id); keyValues.Add(nameof(RB_Education_Contract_ViewModel.UpdateBy), userInfo.Id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment