bug修复

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

@@ -523,6 +523,7 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
         return classStudentMap;
     }
 
+    @Transactional
     @Override
     public Boolean sure(SureBandingTaskDto dto) {
         List<BandingTaskClassStudent> classStudents = classStudentService.selectJoinList(BandingTaskClassStudent.class,
@@ -552,7 +553,131 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
         }
 
         //形成学生数据
-        createStudentData(dto.getId(), classStudents, updateList);
+        {
+            Date createDate = new Date();
+            BandingTask bandingTask = this.getById(dto.getId());
+            List<BandingTaskClassSureListVo> classSure = taskClassMapper.getClassSure(new BandingTaskClassStudentPageDto() {{
+                setBandingTaskId(dto.getId());
+            }});
+
+            Map<Long, Integer> classTotal = classSure.stream().collect(Collectors.toMap(BandingTaskClassSureListVo::getId, BandingTaskClassSureListVo::getNumber));
+            Map<Long, Integer> classBoy = classSure.stream().collect(Collectors.toMap(BandingTaskClassSureListVo::getId, BandingTaskClassSureListVo::getMaleCount));
+            Map<Long, Integer> classGirl = classSure.stream().collect(Collectors.toMap(BandingTaskClassSureListVo::getId, BandingTaskClassSureListVo::getFemaleCount));
+
+            //生成班级数据
+            Map<Long, Long> classMap = new HashMap<>();
+            Map<Long, Long> taskClassMajorMap = new HashMap<>();
+            //查询出需要新增的班级信息
+            List<Long> classIds = classStudents.stream().map(BandingTaskClassStudent::getBandingTaskClassId).collect(Collectors.toList());
+            List<BandingTaskClass> classList = taskClassMapper.selectList(new QueryWrapper<BandingTaskClass>().lambda().in(BandingTaskClass::getId, classIds));
+
+            long maxCode = classService.count(
+                    new QueryWrapper<BaseClass>().lambda()
+                            .eq(BaseClass::getGradeId, bandingTask.getGradeId())
+            );
+            BaseGrade baseGrade = gradeService.getById(bandingTask.getGradeId());
+            String gradeCode = baseGrade.getTitle().replace("年", "");
+
+            Map<Long, Long> majorDeptMap = majorSetMapper.selectList(new QueryWrapper<BaseMajorSet>()).stream().collect(Collectors.toMap(BaseMajorSet::getId, BaseMajorSet::getDepartmentId));
+            for (BandingTaskClass taskClass : classList) {
+                BaseClass baseClass = new BaseClass() {{
+                    setName(taskClass.getName());
+                    setClassroomId(taskClass.getClassroomId());
+                    setTeacherId(taskClass.getTeacherId());
+                    setIsGraduate(1);
+                    setIsOrderClass(taskClass.getIsOrderClass()==null?0:taskClass.getIsOrderClass().intValue());
+                    setGradeId(bandingTask.getGradeId());
+                    setDeleteMark(DeleteMark.NODELETE.getCode());
+                    setEnrollType(bandingTask.getEnrollType());
+                    setOrgId(majorDeptMap.get(taskClass.getMajorSetId()));
+                    setCode(gradeCode + String.format("%03d", maxCode));
+                }};
+
+                classService.save(baseClass);
+
+                BaseClassMajorSet majorSet = new BaseClassMajorSet() {{
+                    setCreateDate(createDate);
+                    setMajorSetId(taskClass.getMajorSetId());
+                    setClassId(baseClass.getId());
+                    setPlanTotalStudent(taskClass.getNumber());
+                    setTotalStudent(classTotal.get(taskClass.getId()));
+                    setBoyNum(classBoy.get(taskClass.getId()));
+                    setGirlNum(classGirl.get(taskClass.getId()));
+                }};
+                classMajorSetMapper.insert(majorSet);
+
+                classMap.put(taskClass.getId(), baseClass.getId());
+                taskClassMajorMap.put(taskClass.getId(), taskClass.getMajorSetId());
+            }
+
+            /**
+             * 新增学生数据
+             * 1、新增用户xjr_user
+             * 2、新增用户与角色的关系xjr_user_role_relation
+             * 3、新增学生基本信息base_student
+             * 4、新增学籍信息表base_student_school_roll
+             * 5、新增家庭信息表base_student_family
+             */
+            LocalDateTime now = LocalDateTime.now();
+            Map<Long, Long> studentClassRelation = classStudents.stream().collect(Collectors.toMap(BandingTaskClassStudent::getNewStudentId, BandingTaskClassStudent::getBandingTaskClassId));
+            for (BaseNewStudent student : updateList) {
+                LocalDate birthDate = getBirthDate(student.getCredentialNumber());
+                User xjrUser = new User() {{
+                    setCreateDate(now);
+                    setPassword(BCrypt.hashpw(propertiesConfig.getDefaultPassword(), BCrypt.gensalt()));
+                    setName(student.getName());
+                    setUserName(student.getCredentialNumber());
+                    setCredentialNumber(student.getCredentialNumber());
+                    setCredentialType("ZZLS10007");
+                    setMobile(student.getMobile());
+                    setEnabledMark(EnabledMark.DISABLED.getCode());
+                    setGender(student.getGender());
+                    setIsChangePassword(1);
+                    setBirthDate(birthDate.atStartOfDay());
+                }};
+                userService.save(xjrUser);
+
+                UserRoleRelation userRoleRelation = new UserRoleRelation() {{
+                    setRoleId(RoleEnum.STUDENT.getCode());
+                    setUserId(xjrUser.getId());
+                }};
+                roleRelationService.save(userRoleRelation);
+
+                BaseStudent baseStudent = new BaseStudent() {{
+                    setUserId(xjrUser.getId());
+                    setCreateDate(now);
+                    setStudentId(student.getCredentialNumber());
+                    setHeight(student.getHeight().doubleValue());
+                    setWeight(student.getWeight().doubleValue());
+                }};
+                studentService.save(baseStudent);
+
+                BaseStudentSchoolRoll schoolRoll = new BaseStudentSchoolRoll() {{
+                    setUserId(xjrUser.getId());
+                    if(student.getScore() != null){
+                        setGraduatedScore(student.getScore().doubleValue());
+                    }
+                    setGraduatedUniversity(student.getGraduateSchool());
+                    setClassId(classMap.get(studentClassRelation.get(student.getId())));
+                    setMajorSetId(taskClassMajorMap.get(studentClassRelation.get(student.getId())));
+                    setStduyStatus(student.getStduyStatus());
+                    setEnrollType(bandingTask.getEnrollType());
+                    setStudentSource(student.getSource());
+                    setGradeId(bandingTask.getGradeId());
+                    setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
+                    setCreateDate(now);
+                }};
+                schoolRollService.save(schoolRoll);
+
+                BaseStudentFamily studentFamily = new BaseStudentFamily() {{
+                    setCreateDate(now);
+                    setUserId(xjrUser.getId());
+                    setTelephone(student.getFamilyMobile());
+                    setAddress(student.getFamilyAddress());
+                }};
+                familyService.save(studentFamily);
+            }
+        }
 
         BandingTask bandingTask = this.getById(dto.getId());
         bandingTask.setStatus(1);
@@ -566,132 +691,6 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
         return this.baseMapper.getPage(page, dto);
     }
 
-    void createStudentData(Long badingTaskId,List<BandingTaskClassStudent> classStudents, List<BaseNewStudent> updateList){
-        Date createDate = new Date();
-        BandingTask bandingTask = this.getById(badingTaskId);
-        List<BandingTaskClassSureListVo> classSure = taskClassMapper.getClassSure(new BandingTaskClassStudentPageDto() {{
-            setBandingTaskId(badingTaskId);
-        }});
-
-        Map<Long, Integer> classTotal = classSure.stream().collect(Collectors.toMap(BandingTaskClassSureListVo::getId, BandingTaskClassSureListVo::getNumber));
-        Map<Long, Integer> classBoy = classSure.stream().collect(Collectors.toMap(BandingTaskClassSureListVo::getId, BandingTaskClassSureListVo::getMaleCount));
-        Map<Long, Integer> classGirl = classSure.stream().collect(Collectors.toMap(BandingTaskClassSureListVo::getId, BandingTaskClassSureListVo::getFemaleCount));
-
-        //生成班级数据
-        Map<Long, Long> classMap = new HashMap<>();
-        Map<Long, Long> taskClassMajorMap = new HashMap<>();
-        //查询出需要新增的班级信息
-        List<Long> classIds = classStudents.stream().map(BandingTaskClassStudent::getBandingTaskClassId).collect(Collectors.toList());
-        List<BandingTaskClass> classList = taskClassMapper.selectList(new QueryWrapper<BandingTaskClass>().lambda().in(BandingTaskClass::getId, classIds));
-
-        long maxCode = classService.count(
-                new QueryWrapper<BaseClass>().lambda()
-                        .eq(BaseClass::getGradeId, bandingTask.getGradeId())
-        );
-        BaseGrade baseGrade = gradeService.getById(bandingTask.getGradeId());
-        String gradeCode = baseGrade.getTitle().replace("年", "");
-
-        Map<Long, Long> majorDeptMap = majorSetMapper.selectList(new QueryWrapper<BaseMajorSet>()).stream().collect(Collectors.toMap(BaseMajorSet::getId, BaseMajorSet::getDepartmentId));
-        for (BandingTaskClass taskClass : classList) {
-            BaseClass baseClass = new BaseClass() {{
-                setName(taskClass.getName());
-                setClassroomId(taskClass.getClassroomId());
-                setTeacherId(taskClass.getTeacherId());
-                setIsGraduate(1);
-                setIsOrderClass(taskClass.getIsOrderClass()==null?0:taskClass.getIsOrderClass().intValue());
-                setGradeId(bandingTask.getGradeId());
-                setDeleteMark(DeleteMark.NODELETE.getCode());
-                setEnrollType(bandingTask.getEnrollType());
-                setOrgId(majorDeptMap.get(taskClass.getMajorSetId()));
-                setCode(gradeCode + String.format("%03d", maxCode));
-            }};
-
-            classService.save(baseClass);
-
-            BaseClassMajorSet majorSet = new BaseClassMajorSet() {{
-                setCreateDate(createDate);
-                setMajorSetId(taskClass.getMajorSetId());
-                setClassId(baseClass.getId());
-                setPlanTotalStudent(taskClass.getNumber());
-                setTotalStudent(classTotal.get(taskClass.getId()));
-                setBoyNum(classBoy.get(taskClass.getId()));
-                setGirlNum(classGirl.get(taskClass.getId()));
-            }};
-            classMajorSetMapper.insert(majorSet);
-
-            classMap.put(taskClass.getId(), baseClass.getId());
-            taskClassMajorMap.put(taskClass.getId(), taskClass.getMajorSetId());
-        }
-
-        /**
-         * 新增学生数据
-         * 1、新增用户xjr_user
-         * 2、新增用户与角色的关系xjr_user_role_relation
-         * 3、新增学生基本信息base_student
-         * 4、新增学籍信息表base_student_school_roll
-         * 5、新增家庭信息表base_student_family
-         */
-        LocalDateTime now = LocalDateTime.now();
-        Map<Long, Long> studentClassRelation = classStudents.stream().collect(Collectors.toMap(BandingTaskClassStudent::getNewStudentId, BandingTaskClassStudent::getBandingTaskClassId));
-        for (BaseNewStudent student : updateList) {
-            LocalDate birthDate = getBirthDate(student.getCredentialNumber());
-            User xjrUser = new User() {{
-                setCreateDate(now);
-                setPassword(BCrypt.hashpw(propertiesConfig.getDefaultPassword(), BCrypt.gensalt()));
-                setName(student.getName());
-                setUserName(student.getCredentialNumber());
-                setCredentialNumber(student.getCredentialNumber());
-                setCredentialType("ZZLS10007");
-                setMobile(student.getMobile());
-                setEnabledMark(EnabledMark.DISABLED.getCode());
-                setGender(student.getGender());
-                setIsChangePassword(1);
-                setBirthDate(birthDate.atStartOfDay());
-            }};
-            userService.save(xjrUser);
-
-            UserRoleRelation userRoleRelation = new UserRoleRelation() {{
-                setRoleId(RoleEnum.STUDENT.getCode());
-                setUserId(xjrUser.getId());
-            }};
-            roleRelationService.save(userRoleRelation);
-
-            BaseStudent baseStudent = new BaseStudent() {{
-                setUserId(xjrUser.getId());
-                setCreateDate(now);
-                setStudentId(student.getCredentialNumber());
-                setHeight(student.getHeight().doubleValue());
-                setWeight(student.getWeight().doubleValue());
-            }};
-            studentService.save(baseStudent);
-
-            BaseStudentSchoolRoll schoolRoll = new BaseStudentSchoolRoll() {{
-                setUserId(xjrUser.getId());
-                if(student.getScore() != null){
-                    setGraduatedScore(student.getScore().doubleValue());
-                }
-                setGraduatedUniversity(student.getGraduateSchool());
-                setClassId(classMap.get(studentClassRelation.get(student.getId())));
-                setMajorSetId(taskClassMajorMap.get(studentClassRelation.get(student.getId())));
-                setStduyStatus(student.getStduyStatus());
-                setEnrollType(bandingTask.getEnrollType());
-                setStudentSource(student.getSource());
-                setGradeId(bandingTask.getGradeId());
-                setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
-                setCreateDate(now);
-            }};
-            schoolRollService.save(schoolRoll);
-
-            BaseStudentFamily studentFamily = new BaseStudentFamily() {{
-                setCreateDate(now);
-                setUserId(xjrUser.getId());
-                setTelephone(student.getFamilyMobile());
-                setAddress(student.getFamilyAddress());
-            }};
-            familyService.save(studentFamily);
-        }
-    }
-
     LocalDate getBirthDate(String idCardNumber){
         // 获取出生日期前6位，即yyyyMM
         String birthdayString = idCardNumber.substring(6, 14);