Merge remote-tracking branch 'origin/dev_v3.0.0' into dev_v3.0.0

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

@@ -148,10 +148,10 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
     @Override
     public boolean enable(BasicTemplate template) {
         // 校验模板是否已有绑定命题任务
-        boolean used = examCardService.usedCardByTemplateId(template.getId());
-        if (used && !template.getEnable()) {
-            throw ExceptionResultEnum.ERROR.exception("通用题卡模板已绑定任务，不能禁用");
-        }
+//        boolean used = examCardService.usedCardByTemplateId(template.getId());
+//        if (used && !template.getEnable()) {
+//            throw ExceptionResultEnum.ERROR.exception("通用题卡模板已绑定任务，不能禁用");
+//        }
         UpdateWrapper<BasicTemplate> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(BasicTemplate::getEnable, template.getEnable()).eq(BasicTemplate::getId, template.getId());
         return this.update(updateWrapper);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -175,7 +175,16 @@ public class CreatePdfUtil {
             htmlMap.put("courseCode", "");
             htmlMap.put("collegeName", "");
         }
-        List<Long> classIds = examDetailCourseList.stream().filter(m -> StringUtils.isNotBlank(m.getClazzId())).map(m -> Long.valueOf(m.getClazzId())).distinct().collect(Collectors.toList());
+        Set<Long> clazzIdSet = new HashSet<>();
+        for (ExamDetailCourse examDetailCourse : examDetailCourseList) {
+            String clazzInfo = examDetailCourse.getClazzId();
+            if (SystemConstant.strNotNull(clazzInfo)){
+                Set<Long> clazzIdSetCell = Arrays.stream(clazzInfo.split(",")).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
+                clazzIdSet.addAll(clazzIdSetCell);
+            }
+        }
+        List<Long> classIds = new ArrayList<>(clazzIdSet);
+
         String campusName = CollectionUtils.isEmpty(classIds) ? "" : basicCampusService.findCampusNamesByClazzIdList(classIds, ",");
         htmlMap.put("schoolName", schoolName);
         htmlMap.put("campusName", campusName);

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicCourseMapper.java

@@ -50,5 +50,5 @@ public interface BasicCourseMapper extends BaseMapper<BasicCourse> {
                                                  @Param("schoolId") Long schoolId,
                                                  @Param("orgIds") Set<Long> orgIds);
 
-    List<Map<String, Object>> findExamTaskByCourseCode(@Param("schoolId") Long schoolId, @Param("courseCodeSet") Set<String> courseCodeSet);
+    Set<Map<String, Object>> findExamTaskByCourseCode(@Param("schoolId") Long schoolId, @Param("courseCodeSet") Set<String> courseCodeSet);
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicClazzServiceImpl.java

@@ -244,11 +244,9 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
                 throw ExceptionResultEnum.ERROR.exception("所选专业不存在");
             }
 
-            // 检验班级名称在学校的唯一性
+            // 检验班级名称在学校的唯一性（字典班级在全校唯一）
             BasicClazz checkName = this.getOne(new QueryWrapper<BasicClazz>().lambda()
                     .eq(BasicClazz::getSchoolId, schoolId)
-                    .eq(BasicClazz::getMajorId, majorId)
-                    .eq(BasicClazz::getEnable, true)
                     .eq(BasicClazz::getClazzName, clazzName));
             if (Objects.nonNull(checkName)) {
                 if (!checkName.getId().equals(id)) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -185,7 +185,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                 }
                 return basicCourse.getCode();
             }).collect(Collectors.toSet());
-            List<Map<String, Object>> mapList = basicCourseMapper.findExamTaskByCourseCode(schoolId, courseCodeSet);
+            Set<Map<String, Object>> mapList = basicCourseMapper.findExamTaskByCourseCode(schoolId, courseCodeSet);
             if (mapList.size() > 0) {
                 StringBuilder courseNames = new StringBuilder();
                 for (Map<String, Object> map : mapList) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicStudentServiceImpl.java

@@ -259,6 +259,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                     if (clazzMap.containsKey(clazzKey)) {
                         clazzId = clazzMap.get(clazzKey);
                     } else {
+                        // 2022-03-30 字典班级在全校唯一
                         BasicClazz basicClazz = basicClazzService.getOne(new QueryWrapper<BasicClazz>().lambda()
                                 .eq(BasicClazz::getSchoolId, schoolId)
                                 .eq(BasicClazz::getClazzName, clazzName));

teachcloud-common/src/main/resources/mapper/BasicCourseMapper.xml

@@ -115,6 +115,7 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY course_code,course_name
     </select>
 
 </mapper>