3.3.1 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/PrintCommonServiceImpl.java

@@ -150,7 +150,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     TeachClazzService teachClazzService;
 
     @Resource
-    BasicClazzService basicClazzService;
+    BasicTeachClazzService basicTeachClazzService;
 
     @Resource
     BasicMajorService basicMajorService;
@@ -984,18 +984,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         validateOrg(id);
         boolean result = sysOrgService.removeById(id);
 
-        // 删除学院下专业、班级
-        List<BasicMajor> basicMajorList = basicMajorService.list(new QueryWrapper<BasicMajor>().lambda().eq(BasicMajor::getBelongOrgId, id));
-        if (!CollectionUtils.isEmpty(basicMajorList)) {
-            List<Long> basicMajorIds = basicMajorList.stream().map(BasicMajor::getId).collect(Collectors.toList());
-            List<BasicClazz> basicClazzList = basicClazzService.list(new QueryWrapper<BasicClazz>().lambda().in(BasicClazz::getMajorId, basicMajorIds));
-            if (!CollectionUtils.isEmpty(basicClazzList)) {
-                List<Long> basicClazzIds = basicClazzList.stream().map(BasicClazz::getId).collect(Collectors.toList());
-                basicClazzService.removeBasicClazzBatch(basicClazzIds);
-            }
-            basicMajorService.deleteBasicMajorByIdList(basicMajorIds);
-        }
-
         Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
         commonCacheService.removeOrgCollegeLevelCache(schoolId);
         return result;
@@ -1416,7 +1404,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     public List<ExamStudent> createBatchStudentByStudentList(Long schoolId, Long examId, String semesterId, ExamTask examTask, String extendFields, List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList, Long examDetailCourseId, Long cardRuleId, SysUser sysUser) {
         AtomicInteger atomicInteger = new AtomicInteger(1);
 
-        Map<String, String> map = new HashMap<>();
         List<ExamStudent> examStudentList = new ArrayList<>();
         for (ExamTaskStudentObjectParam student : examTaskStudentObjectParamList) {
             Long studentId = student.getStudentId();
@@ -1431,20 +1418,19 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             if (!Objects.equals(basicStudentResult.getClazzId(), basicClazzId)) {
                 throw ExceptionResultEnum.ERROR.exception("行政班数据不一致");
             }
-            BasicClazz basicClazz = null;
+            BasicTeachClazz basicTeachClazz = null;
             if (SystemConstant.longNotNull(basicClazzId)) {
-                basicClazz = basicClazzService.getById(basicClazzId);
-                if (Objects.isNull(basicClazz)) {
-                    throw ExceptionResultEnum.ERROR.exception("未找到行政班");
+                basicTeachClazz = basicTeachClazzService.getById(basicClazzId);
+                if (Objects.isNull(basicTeachClazz)) {
+                    throw ExceptionResultEnum.ERROR.exception("未找到教学班");
                 }
-                map.putIfAbsent(String.valueOf(basicClazzId), basicClazz.getShortCode());
             }
 
             TeachClazz teachClazz = null;
             if (SystemConstant.longNotNull(teachClazzId)) {
                 teachClazz = teachClazzService.getById(teachClazzId);
                 if (Objects.isNull(teachClazz)) {
-                    throw ExceptionResultEnum.ERROR.exception("未找到教学班");
+                    throw ExceptionResultEnum.ERROR.exception("未找到老师创建的教学班");
                 }
             }
 
@@ -1464,9 +1450,9 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             examStudent.setExtendFields(extendFields);
             examStudent.setCreateId(sysUser.getId());
             // 行政班数据
-            if (Objects.nonNull(basicClazz)) {
-                examStudent.setClazzId(String.valueOf(basicClazz.getId()));
-                examStudent.setClazzName(basicClazz.getClazzName());
+            if (Objects.nonNull(basicTeachClazz)) {
+                examStudent.setClazzId(String.valueOf(basicTeachClazz.getId()));
+                examStudent.setClazzName(basicTeachClazz.getClazzName());
             }
             // 教学班模式 教学班数据
             if (Objects.nonNull(teachClazz)) {