Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ClientPrintTaskDto.java

@@ -26,6 +26,8 @@ public class ClientPrintTaskDto {
     private String examPlace;
     @ExcelProperty(name = "考场", width = 30, index = 8)
     private String examRoom;
+    private String classId;
+    private String className;
     @ExcelProperty(name = "单科次A3（页）", width = 30, index = 9)
     private String singlePagesA3;
     private String singlePagesA4;
@@ -156,6 +158,22 @@ public class ClientPrintTaskDto {
         this.examRoom = examRoom;
     }
 
+    public String getClassId() {
+        return classId;
+    }
+
+    public void setClassId(String classId) {
+        this.classId = classId;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
     public String getSinglePagesA3() {
         return singlePagesA3;
     }

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

@@ -148,7 +148,6 @@ public class ClientServiceImpl implements ClientService {
     @Override
     public IPage<ClientPrintTaskDto> listClientPrintTask(String machineCode, Long orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-//        Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         Page<ClientPrintTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<ClientPrintTaskDto> pirntTaskDtoIPage = examPrintPlanService.listClientPrintTask(page, schoolId, machineCode, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, orgId);
         return pirntTaskDtoIPage;

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

@@ -80,6 +80,9 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
     @Resource
     TeachcloudCommonService teachcloudCommonService;
 
+    @Autowired
+    BasicClazzService basicClazzService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public IPage<PrintPlanResult> printPlanPage(Long schoolId, List<Long> printPlanIdList, PrintPlanStatusEnum status, Long startTime, Long endTime, int pageNumber, int pageSize) {
@@ -364,6 +367,9 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
                 }
             }
 
+            // 班级
+            String className = basicClazzService.findClazzNamesByClazzIds(record.getClassId(), ",");
+            record.setClassName(className);
         }
         return clientPrintTaskDtoIPage;
     }

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

@@ -1731,6 +1731,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 .stream()
                 .filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType()))
                 .collect(Collectors.toList());
+//        List<SysOrg> collegeList = sysOrgService.findByConnectByParentId(teachingRoom.getId(),true)
+//                .stream()
+//                .filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType()))
+//                .collect(Collectors.toList());
         if (CollectionUtils.isEmpty(collegeList)){
             throw ExceptionResultEnum.ERROR.exception("找不到学院");
         }

distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

@@ -183,6 +183,7 @@
             b.exam_end_time examEndTime,
             c.courseNameCode,
             c.paperNumber,
+            c.classId,
             b.exam_place examPlace,
             b.exam_room examRoom,
             b.total_subjects totalSubjects,
@@ -209,6 +210,7 @@
                     c.print_plan_id,
                     GROUP_CONCAT(CONCAT(a.course_name, '(', a.course_code, ')')) courseNameCode,
                     GROUP_CONCAT(a.paper_number) paperNumber,
+                    GROUP_CONCAT(a.clazz_id) classId,
                     GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
                     SUM(CASE b.is_download
                         WHEN true THEN 0

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

@@ -15,7 +15,7 @@ import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.mapper.BasicClazzMapper;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.tomcat.util.buf.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -221,8 +221,10 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
         if (!SystemConstant.strNotNull(separator)) {
             separator = ",";
         }
-        String[] strArr;
-        strArr = clazzIds.split(separator);
+        if(StringUtils.isBlank(clazzIds)){
+            return null;
+        }
+        String[] strArr = clazzIds.split(separator);
         Set<Long> clazzIdSet = Arrays.stream(strArr).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
         List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
         return String.join(separator, clazzNameList);

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

@@ -60,9 +60,9 @@ public class OrgCenterDataDisposeServiceImpl implements OrgCenterDataDisposeServ
             String logo = String.valueOf(map.get("logo"));
             String accessKey = String.valueOf(map.get("accessKey"));
             String accessSecret = String.valueOf(map.get("accessSecret"));
-            Map typeMap = JSONObject.parseObject(String.valueOf(map.get("type")));
-            String typeCode = String.valueOf(typeMap.get("code"));
-            String typeName = String.valueOf(typeMap.get("name"));
+//            Map typeMap = JSONObject.parseObject(String.valueOf(map.get("type")));
+//            String typeCode = String.valueOf(typeMap.get("code"));
+//            String typeName = String.valueOf(typeMap.get("name"));
 
             List<BasicSchool> oldSchoolList = basicSchoolList.stream().filter(e -> e.getCode().equals(code)).collect(Collectors.toList());
             if (oldSchoolList.size() > 1) {