教职工异动记录

src/main/java/com/xjrsoft/module/teacher/controller/BaseTeacherChangeRecordController.java

@@ -77,6 +77,10 @@ public class BaseTeacherChangeRecordController {
                                 .selectAs(XjrUser::getName, BaseTeacherChangeRecordPageVo::getCreateUserIdCn)
                                 .like(StringUtils.isNotEmpty(dto.getCreateUserIdCn()), XjrUser::getName, dto.getCreateUserIdCn())
                 )
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacherChangeRecord::getChangeType,
+                        wrapper -> wrapper
+                                .selectAs(DictionaryDetail::getName, BaseTeacherChangeRecordPageVo::getChangeTypeCn)
+                )
                 .eq(StringUtils.isNotEmpty(dto.getChangeType()), BaseTeacherChangeRecord::getChangeType, dto.getChangeType())
                 .ge(ObjectUtils.isNotEmpty(dto.getStartCreateDate()), BaseTeacherChangeRecord::getCreateDate, dto.getStartCreateDate())
                 .le(ObjectUtils.isNotEmpty(dto.getEndCreateDate()), BaseTeacherChangeRecord::getCreateDate, dto.getEndCreateDate())

src/main/java/com/xjrsoft/module/teacher/service/impl/TeacherbaseManagerServiceImpl.java

@@ -78,6 +78,7 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
     private final IDictionarydetailService dictionaryService;
     private final IDepartmentService departmentService;
     private final IPostService postService;
+    private final BaseTeacherMapper baseTeacherMapper;
     private IDictionarydetailService dictionarydetailService;
 
     private WfTeacherDepartMapper wfTeacherDepartMapper;
@@ -746,6 +747,17 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
             }
 
             // 处理在职状态
+            // 更新教职工在职状态
+            List<BaseTeacher> baseTeacherList = old.getBaseTeacherList();
+            BaseTeacher updateBaseTeacher;
+            for (BaseTeacher baseTeacher : baseTeacherList){
+                updateBaseTeacher = new BaseTeacher();
+                updateBaseTeacher.setId(baseTeacher.getId());
+                updateBaseTeacher.setJobState("JOB_LZ");
+                baseTeacherMapper.updateById(updateBaseTeacher);
+            }
+
+            // 处理变更记录
             // 获取字典值
             List<DictionaryDetail> detailList = dictionarydetailService.list(
                     new MPJLambdaWrapper<DictionaryDetail>()