1、班级合并

2、数据看板详情教职工数据统计调整

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassMergeServiceImpl.java

@@ -158,12 +158,12 @@ public class BaseClassMergeServiceImpl extends MPJBaseServiceImpl<BaseClassMerge
                 .selectAs(BaseClass::getName, BaseClassMergeStudentVo::getClassName)
                 .selectAs(User::getName, BaseClassMergeStudentVo::getName)
                 .selectAs(User::getCredentialNumber, BaseClassMergeStudentVo::getCredentialNumber)
-                .selectAs(DictionaryDetail::getName, BaseClassMergeStudentVo::getGender)
-                .select("t4.name", BaseClassMergeStudentVo::getTeacherName)
+                .select("t4.name", BaseClassMergeStudentVo::getGender)
+                .select("t3.name", BaseClassMergeStudentVo::getTeacherName)
                 .innerJoin(User.class, User::getId, BaseClassMergeStudent::getUserId)
-                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, User::getGender)
                 .innerJoin(BaseClass.class, BaseClass::getId, BaseClassMergeStudent::getClassId)
                 .leftJoin(User.class, User::getId, BaseClass::getTeacherId)
+                .innerJoin("xjr_dictionary_detail t4 ON (t4.code = t1.gender) ")
                 .eq(BaseClassMergeStudent::getBaseClassMergeId, dto.getBaseClassMergeId())
                 .orderByDesc(BaseClassMergeStudent::getId);
         IPage<BaseClassMergeStudentVo> page = mergeStudentMapper.selectJoinPage(ConventPage.getPage(dto), BaseClassMergeStudentVo.class, queryWrapper);

src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -364,6 +364,12 @@ public class DatadetailController {
         }
         result.setDeptList(deptList);
 
+        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)
@@ -373,8 +379,8 @@ public class DatadetailController {
                 .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::getEmployWay, ext -> ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getEmployWay))
-
-                .selectAsClass(BaseTeacher.class, XjrUserPageVo.class);
+                .selectAsClass(BaseTeacher.class, XjrUserPageVo.class)
+                .in(BaseTeacher::getJobState, jobStates);
 
         List<XjrUserPageVo> teacherList = teacherService.selectJoinList(XjrUserPageVo.class, queryWrapper);
         List<String> idCardList = teacherList.stream().map(XjrUserPageVo::getCredentialNumber).collect(Collectors.toList());