分班调整

src/main/java/com/xjrsoft/module/banding/controller/BandingTaskController.java

@@ -171,7 +171,7 @@ public class BandingTaskController {
     @SaCheckPermission("bandingTaskClass:sure")
     @XjrLog(value = "确认分班")
     public RT<Boolean> sure(@Valid @RequestBody SureBandingTaskDto dto){
-        Boolean isSuccess = bandingTaskService.sure(dto);
+        Boolean isSuccess = bandingTaskService.sureReport(dto);
         return RT.ok(isSuccess);
     }
 

src/main/java/com/xjrsoft/module/banding/service/IBandingTaskService.java

@@ -49,4 +49,7 @@ public interface IBandingTaskService extends MPJBaseService<BandingTask> {
 
     Page<BandingTaskPageVo> getPage(Page<BandingTaskPageVo> page, BandingTaskPageDto dto);
 
+
+    Boolean sureReport(SureBandingTaskDto dto);
+
 }

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassServiceImpl.java

@@ -274,6 +274,7 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
                 baseClass.setClassroomId(taskClass.getClassroomId());
                 baseClass.setIsOrderClass(taskClass.getIsOrderClass());
                 baseClass.setOrgId(majorDeptMap.get(taskClass.getMajorSetId()));
+                baseClass.setEnrollType(task.getEnrollType());
                 updateClassList.add(baseClass);
             }else{
                 BaseClass baseClass = new BaseClass();
@@ -283,7 +284,12 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
                 baseClass.setClassroomId(taskClass.getClassroomId());
                 baseClass.setIsOrderClass(taskClass.getIsOrderClass());
                 baseClass.setOrgId(majorDeptMap.get(taskClass.getMajorSetId()));
+                baseClass.setName(taskClass.getName());
                 baseClass.setGradeId(task.getGradeId());
+                baseClass.setEnrollType(task.getEnrollType());
+                baseClass.setIsGraduate(1);
+                baseClass.setCreateUserId(StpUtil.getLoginIdAsLong());
+                baseClass.setCreateDate(new Date());
                 insertClassList.add(baseClass);
             }
         }

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -528,6 +528,9 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
         return classStudentMap;
     }
 
+    /**
+     * 确认分班，老规则，确认之后直接进入学生基本信息中（2025年3月6日停用）
+     */
     @Transactional
     @Override
     public Boolean sure(SureBandingTaskDto dto) {
@@ -709,6 +712,17 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
         return this.baseMapper.getPage(page, dto);
     }
 
+    /**
+     * 确认分班后，进入
+     * @param dto
+     * @return
+     */
+    @Override
+    @Transactional
+    public Boolean sureReport(SureBandingTaskDto dto) {
+        return null;
+    }
+
     LocalDate getBirthDate(String idCardNumber){
         // 获取出生日期前6位，即yyyyMM
         String birthdayString = idCardNumber.substring(6, 14);

src/main/java/com/xjrsoft/module/job/BaseNewStudentTask.java

@@ -8,6 +8,7 @@ import com.xjrsoft.common.enums.EnrollTypeEnum;
 import com.xjrsoft.common.enums.GenderDictionaryEnum;
 import com.xjrsoft.common.enums.StudentTypeEnum;
 import com.xjrsoft.common.enums.StudyStatusEnum;
+import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.entity.BaseMajorSet;
 import com.xjrsoft.module.base.service.IBaseGradeService;
@@ -63,8 +64,10 @@ public class BaseNewStudentTask {
 
     void doExecute(){
         List<PbCseFeeobjupdate> dataList = cseFeeobjupdateService.list();
-        Map<String, String> gradeMap = dataList.stream().filter(x -> StrUtil.isNotEmpty(x.getEnteryear()) && StrUtil.isNotEmpty(x.getUserdef6()))
-                .collect(Collectors.toMap(PbCseFeeobjupdate::getEnteryear, PbCseFeeobjupdate::getUserdef6));
+
+        String sql = "select distinct enteryear, userdef6 from pb_cse_feeobjupdate";
+        List<Map<String, Object>> gradeList = SqlRunnerAdapter.db().selectList(sql);
+
 
         List<EnrollmentPlan> planDataList = planService.list(
                 new QueryWrapper<EnrollmentPlan>().lambda()
@@ -75,14 +78,14 @@ public class BaseNewStudentTask {
 
         Map<String, Long> planMap = new HashMap<>();
         //插入招生计划数据
-        gradeMap.forEach((enteryear, userdef6)->{
+        gradeList.forEach((x)->{
             EnrollmentPlan plan = new EnrollmentPlan();
             plan.setCreateDate(new Date());
             plan.setEnabledMark(EnabledMark.ENABLED.getCode());
             plan.setDeleteMark(DeleteMark.NODELETE.getCode());
-            if("1".equals(userdef6)){
+            if("1".equals(x.get("userdef6").toString())){
                 plan.setEnrollType(EnrollTypeEnum.SPRING_ENROLLMENT.getCode());
-            }else if("2".equals(userdef6)){
+            }else if("2".equals(x.get("userdef6").toString())){
                 plan.setEnrollType(EnrollTypeEnum.AUTUMN_ENROLLMENT.getCode());
             }
 
@@ -90,18 +93,18 @@ public class BaseNewStudentTask {
             BaseGrade grade = gradeService.getOne(
                     new QueryWrapper<BaseGrade>().lambda()
                             .eq(BaseGrade::getDeleteMark, DeleteMark.NODELETE.getCode())
-                            .like(BaseGrade::getTitle, enteryear)
+                            .like(BaseGrade::getTitle, x.get("enteryear").toString())
             );
             plan.setGradeId(grade.getId());
 
             Long oldPlanId = planDataMap.get(plan.getEnrollType() + plan.getGradeId());
 
-            planMap.put(enteryear + userdef6, oldPlanId);
+            planMap.put(x.get("enteryear").toString() + x.get("userdef6").toString(), oldPlanId);
 
             //判断是否已经存在，不存在就新增
             if(oldPlanId == null){
                 planService.save(plan);
-                planMap.put(enteryear + userdef6, plan.getId());
+                planMap.put(x.get("enteryear").toString() + x.get("userdef6").toString(), plan.getId());
             }
         });
 

src/test/java/com/xjrsoft/module/job/BaseNewStudentTaskTest.java

@@ -9,6 +9,7 @@ import com.xjrsoft.common.enums.EnrollTypeEnum;
 import com.xjrsoft.common.enums.GenderDictionaryEnum;
 import com.xjrsoft.common.enums.StudentTypeEnum;
 import com.xjrsoft.common.enums.StudyStatusEnum;
+import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.entity.BaseMajorSet;
 import com.xjrsoft.module.base.service.IBaseGradeService;
@@ -67,8 +68,10 @@ class BaseNewStudentTaskTest {
 
     void doExecute(){
         List<PbCseFeeobjupdate> dataList = cseFeeobjupdateService.list();
-        Map<String, String> gradeMap = dataList.stream().filter(x -> StrUtil.isNotEmpty(x.getEnteryear()) && StrUtil.isNotEmpty(x.getUserdef6()))
-                .collect(Collectors.toMap(PbCseFeeobjupdate::getEnteryear, PbCseFeeobjupdate::getUserdef6));
+
+        String sql = "select distinct enteryear, userdef6 from pb_cse_feeobjupdate";
+        List<Map<String, Object>> gradeList = SqlRunnerAdapter.db().selectList(sql);
+
 
         List<EnrollmentPlan> planDataList = planService.list(
                 new QueryWrapper<EnrollmentPlan>().lambda()
@@ -79,14 +82,14 @@ class BaseNewStudentTaskTest {
 
         Map<String, Long> planMap = new HashMap<>();
         //插入招生计划数据
-        gradeMap.forEach((enteryear, userdef6)->{
+        gradeList.forEach((x)->{
             EnrollmentPlan plan = new EnrollmentPlan();
             plan.setCreateDate(new Date());
             plan.setEnabledMark(EnabledMark.ENABLED.getCode());
             plan.setDeleteMark(DeleteMark.NODELETE.getCode());
-            if("1".equals(userdef6)){
+            if("1".equals(x.get("userdef6").toString())){
                 plan.setEnrollType(EnrollTypeEnum.SPRING_ENROLLMENT.getCode());
-            }else if("2".equals(userdef6)){
+            }else if("2".equals(x.get("userdef6").toString())){
                 plan.setEnrollType(EnrollTypeEnum.AUTUMN_ENROLLMENT.getCode());
             }
 
@@ -94,18 +97,18 @@ class BaseNewStudentTaskTest {
             BaseGrade grade = gradeService.getOne(
                     new QueryWrapper<BaseGrade>().lambda()
                             .eq(BaseGrade::getDeleteMark, DeleteMark.NODELETE.getCode())
-                            .like(BaseGrade::getTitle, enteryear)
+                            .like(BaseGrade::getTitle, x.get("enteryear").toString())
             );
             plan.setGradeId(grade.getId());
 
             Long oldPlanId = planDataMap.get(plan.getEnrollType() + plan.getGradeId());
 
-            planMap.put(enteryear + userdef6, oldPlanId);
+            planMap.put(x.get("enteryear").toString() + x.get("userdef6").toString(), oldPlanId);
 
             //判断是否已经存在，不存在就新增
             if(oldPlanId == null){
                 planService.save(plan);
-                planMap.put(enteryear + userdef6, plan.getId());
+                planMap.put(x.get("enteryear").toString() + x.get("userdef6").toString(), plan.getId());
             }
         });