Переглянути джерело

数据看板教职工查询调整

dzx 8 місяців тому
батько
коміт
8f9f97d936

+ 8 - 0
src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -256,6 +256,13 @@ public class DataboardController {
                 .map(BaseStudentUserPageVo::getId).collect(Collectors.toSet());
         result.setStudentNotStayFemaleCount(studentNotStayFemaleSet.size());
 
+        List<String> jobStates = new ArrayList<>();
+        jobStates.add("JOB_DDSX");
+        jobStates.add("JOB_WCPX");
+        jobStates.add("ZZZT10009");
+        jobStates.add("ZZZT10004");
+
+
         MPJLambdaWrapper<XjrUser> queryWrapper = MPJWrappers.<XjrUser>lambdaJoin()
                 .disableSubLogicDel()
                 .orderByDesc(XjrUser::getId)
@@ -265,6 +272,7 @@ public class DataboardController {
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getJobState, ext -> ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getJobState))
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, XjrUser::getCredentialType, ext -> ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getCredentialType))
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getEmployType, ext -> ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getEmployWay))
+                .in(BaseTeacher::getJobState, jobStates)
                 .selectAsClass(BaseTeacher.class, XjrUserPageVo.class);
 
         List<XjrUserPageVo> teacherList = teacherService.selectJoinList(XjrUserPageVo.class, queryWrapper);