讲师等级异动

Tiobon.Core.Api/Controllers/Ghre/Ghre_TeacherChangeController.cs

@@ -29,12 +29,7 @@ public class Ghre_TeacherChangeController : BaseController<IGhre_TeacherChangeSe
     [HttpPost, Route("QueryList/{status}")]
     public async Task<ServicePageResult<Ghre_TeacherChangeDto>> QueryByStatus([FromBody] QueryBody body, string status)
     {
-        if (status == "Active")
-            return await _service.QueryFilterPage(body, $"(Status ='{status}' OR (WorkID IS NOT NULL AND WorkState IN (0,1)))");
-        else if (status == "Disable")
-            return await _service.QueryFilterPage(body, null, false);
-        else
-            return await _service.QueryFilterPage(body, $"Status ='{status}' AND WorkID IS NULL");
+        return await _service.QueryFilterPage(body, $"Status ='{status}'");
     }
     #endregion
 

Tiobon.Core.Services/CommonServices.cs

@@ -1132,7 +1132,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
 
             case "F_Training_Demand_ToDo":
             case "F_TeacherManageTemporary":
-            case "F_TeacherChangeManageTemporary":
+            case "F_TeacherChangeTemporary":                
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
                 if (toolbar != null) { toolbar.fnKey = "TBD1YN"; }
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault();
@@ -1186,8 +1186,9 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
             case "F_TeacherManage":
             case "F_TeacherManageActive":
             case "F_TeacherChangeManage":
-            case "F_TeacherChangeManageActive":
+            case "F_TeacherChangeActive":
             case "F_TeacherDisabled":
+            case "F_TeacherChangeDisabled":
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
                 if (toolbar != null) { toolbar.fnKey = "TBD1YN"; }
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault();
@@ -1197,7 +1198,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault();
                 if (toolbar != null) toolbar.fnKey = "TBD4YN";
                 break;
-            case "F_TeacherChangeManageWaitConfirm":
+            case "F_TeacherChangeWaitConfirm":
             case "F_TeacherManageWaitConfirm":
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
                 if (toolbar != null) { toolbar.fnKey = "TBD1YN"; }

Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs

@@ -43,23 +43,24 @@ public class Ghre_TeacherChangeServices : BaseServices<Ghre_TeacherChange, Ghre_
 
         var data = result.result.DT_TableDataT1;
 
-        var schoolIds = data.Where(x => x.SchoolId != null).Select(x => x.SchoolId.Value).Distinct().ToList();
-        var deptIDs = data.Where(x => x.DeptID != null).Select(x => x.DeptID).Distinct().ToList();
         var teacherIds = data.Where(x => x.TeacherId != null).Select(x => x.TeacherId).Distinct().ToList();
+        var teachers = await Db.Queryable<Ghre_Teacher>().Where(x => teacherIds.Contains(x.Id)).Select(x => new { x.Id, x.SchoolId, x.DeptID, x.TeacherType, TeacherName = x.TeacherName + " (" + x.TeacherNo + ")" }).ToListAsync();
+        var schoolIds = teachers.Where(x => x.SchoolId != null).Select(x => x.SchoolId.Value).Distinct().ToList();
+        var deptIDs = teachers.Where(x => x.DeptID != null).Select(x => x.DeptID).Distinct().ToList();
 
         var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIDs.Contains(x.DeptID)).Select(x => new { x.DeptID, x.DeptName }).ToListAsync();
         var schools = await Db.Queryable<Ghre_School>().Where(x => schoolIds.Contains(x.Id)).Select(x => new { x.Id, x.SchoolName }).ToListAsync();
-        var teachers = await Db.Queryable<Ghre_Teacher>().Where(x => teacherIds.Contains(x.Id)).Select(x => new { x.Id, TeacherName = x.TeacherName + " （" + x.TeacherNo + "）" }).ToListAsync();
 
         data.ForEach(async x =>
         {
+            var teacher = teachers.FirstOrDefault(o => o.Id == x.TeacherId);
             x.TeacherTypeLabel = await GetParaLabel("TrainingTeacherType", x.TeacherType);
             x.TeacherLevelLabel = await GetParaLabel("TrainingTeacherLevel", x.TeacherLevel);
             x.OriginTeacherLevelLabel = await GetParaLabel("TrainingTeacherLevel", x.OriginTeacherLevel);
             x.ChangeTypeLabel = await GetParaLabel("TrainingTeacherChangeType", x.ChangeType);
             x.OriginChangeTypeLabel = await GetParaLabel("TrainingTeacherChangeType", x.OriginChangeType);
-            x.DeptOrSchoolName = x.TeacherType == "Out" ? schools.FirstOrDefault(o => o.Id == x.SchoolId)?.SchoolName : depts.FirstOrDefault(o => o.DeptID == x.DeptID)?.DeptName;
-            x.TeacherName = teachers.FirstOrDefault(o => o.Id == x.TeacherId)?.TeacherName;
+            x.DeptOrSchoolName = x.TeacherType == "Out" ? schools.FirstOrDefault(o => o.Id == teacher?.SchoolId)?.SchoolName : depts.FirstOrDefault(o => o.DeptID == teacher?.DeptID)?.DeptName;
+            x.TeacherName = teacher?.TeacherName;
             x.OriginChangeDate1 = DateTimeHelper.ConvertToDayString(x.OriginChangeDate);
             x.ChangeDate1 = DateTimeHelper.ConvertToDayString(x.ChangeDate);
         });

Tiobon.Core/Tiobon.Core.Model.xml

@@ -5345,6 +5345,11 @@
             默认标志
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.SponsorId">
+            <summary>
+            发起人
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Status">
             <summary>
             状态
@@ -5705,6 +5710,11 @@
             申请理由
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChangeBase.SponsorId">
+            <summary>
+            发起人
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChangeBase.Status">
             <summary>
             状态
@@ -13051,6 +13061,11 @@
             默认标志
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.SponsorId">
+            <summary>
+            发起人
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Status">
             <summary>
             状态
@@ -13416,6 +13431,11 @@
             状态
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChange.SponsorId">
+            <summary>
+            发起人
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChange.IsDefault">
             <summary>
             默认标志