新增四川外国语学院

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

@@ -155,11 +155,11 @@ public class ActivitiServiceImpl implements ActivitiService {
     public ProcessInstance flowStart(Map<String, Object> map) {
         BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
         ProcessInstance processInstance = null;
-        Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
+        Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
         //广东医科大学
-        if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
+        if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
             processInstance = this.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
-        } else if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))) {//江西中医药大学
+        } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {//江西中医药大学
             processInstance = this.startActivity(SystemConstant.JXZYY_FLOW_KEY, map);
         } else {
             throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
@@ -663,15 +663,15 @@ public class ActivitiServiceImpl implements ActivitiService {
                     break;
             }
         } else {//获取整个节点审批人
-            Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
+            Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
             BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
-            if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
+            if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
                 if (Objects.isNull(courseCode) || Objects.equals(courseCode, "")) {
                     throw ExceptionResultEnum.ERROR.exception("课程编码为空");
                 }
                 flowTaskApprovePeopleResultList = getApproveUserAll(courseCode, flowTaskApprovePeopleResultList, SystemConstant.GDYKDX_FLOW_KEY, null, null);
                 flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
-            } else if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))) {//江西中医药大学
+            } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {//江西中医药大学
                 flowTaskApprovePeopleResultList = getApproveUserAll(courseCode, flowTaskApprovePeopleResultList, SystemConstant.JXZYY_FLOW_KEY, null, null);
                 flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
             } else {
@@ -922,15 +922,15 @@ public class ActivitiServiceImpl implements ActivitiService {
                     break;
             }
         } else {//获取整个节点审批人
-            Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
+            Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
             List<ApproveUserResult> approveUserResultList = null;
             BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
-            if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
+            if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
                 if (Objects.isNull(courseCode) || Objects.equals(courseCode, "")) {
                     throw ExceptionResultEnum.ERROR.exception("课程编码为空");
                 }
                 approveUserResultList = sysUserService.findByRootApprove(courseCode, null, null, FlowApproveNameEnum.DIRECTOR);
-            } else if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))) {//江西中医药大学
+            } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {//江西中医药大学
                 approveUserResultList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
             } else {
                 throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");

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

@@ -147,7 +147,7 @@ public class PrintCommonServiceServiceImpl implements PrintCommonService {
     public BasicAttachment saveAttachmentPdf(ClassifyEnum classifyEnum, ExamDetail examDetail, BasicAttachment basicAttachment, List<PdfDto> pdfList, Integer printCount, Integer sequence) throws IOException, DocumentException {
         try {
             BasicSchool basicSchool = basicSchoolService.getById(examDetail.getSchoolId());
-            Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
+            Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
 
             boolean oss = dictionaryConfig.sysDomain().isOss();
             JSONObject jsonObject = JSONObject.parseObject(basicAttachment.getPath());
@@ -186,9 +186,9 @@ public class PrintCommonServiceServiceImpl implements PrintCommonService {
                 pdfFile.getParentFile().mkdirs();
                 pdfFile.createNewFile();
             }
-            if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
+            if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
                 HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A3);
-            } else if(Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))){
+            } else if(flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())){
                 HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A4);
             }
 
@@ -226,9 +226,9 @@ public class PrintCommonServiceServiceImpl implements PrintCommonService {
             examDetail.setAttachmentPath(attachmentPath.toJSONString());
             basicAttachment.setPages(pdfDto.getActualPageCount());
             for (int i = 0; i < printCount; i++) {
-                if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
+                if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
                     pdfList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A3, pdfDto.getPageCount(), sequence));
-                } else if(Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))){
+                } else if(flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())){
                     pdfList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount(), sequence));
                 }
             }

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

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.databind.introspect.BasicClassIntrospector;
 import com.google.gson.Gson;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentCourseDto;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentDto;
@@ -24,7 +23,6 @@ import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ConvertUtil;
 import com.qmth.teachcloud.common.util.FileStoreUtil;
 import com.qmth.teachcloud.common.util.RedisUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -103,7 +101,7 @@ public class CreatePdfUtil {
      */
     public void createCheckIn(ExamDetail examDetail, BasicAttachment basicAttachment, List<PdfDto> ordinaryPdfList, Integer printCount) throws Exception {
         BasicSchool basicSchool = basicSchoolService.getById(examDetail.getSchoolId());
-        Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
+        Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
         if (Objects.isNull(basicAttachment)) {
             throw ExceptionResultEnum.ATTACHMENT_IS_NULL.exception();
         }
@@ -119,9 +117,9 @@ public class CreatePdfUtil {
             File localFile = fileStoreUtil.ossDownload(filePath, url, uploadFileEnum.getFssType());
             PdfDto pdfDto = PdfUtil.addPdfPage(localFile);
             for (int i = 0; i < printCount; i++) {
-                if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
+                if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
                     ordinaryPdfList.add(new PdfDto(localFile.getPath(), PageSizeEnum.A3, pdfDto.getPageCount()));
-                } else if(Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))){
+                } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
                     ordinaryPdfList.add(new PdfDto(localFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount()));
                 }
             }
@@ -693,7 +691,7 @@ public class CreatePdfUtil {
                                           List<PdfDto> mergePdfDeleteList) throws Exception {
         StringJoiner stringJoiner = new StringJoiner("").add(SystemConstant.PDF_TEMP_FILES_DIR).add(File.separator);
         // oss上只认"/"，windows生成的路径分隔符全部替换为"/"
-        File localA4PdfFile = null, localA3PdfFile = null, localA3PdfCardFile =null;
+        File localA4PdfFile = null, localA3PdfFile = null, localA3PdfCardFile = null;
         BasicAttachment basicAttachment = null;
         if (Objects.nonNull(dirNameA4)) {
             dirNameA4 = dirNameA4.replaceAll("\\\\", "/");
@@ -905,7 +903,7 @@ public class CreatePdfUtil {
             BasicClazz basicClazz = basicClazzService.getById(examStudentDto.getClazzId());
             clazzName = Objects.nonNull(basicClazz) ? basicClazz.getClazzName() : null;
         }
-        if(StringUtils.isNotBlank(clazzName)){
+        if (StringUtils.isNotBlank(clazzName)) {
             return clazzName;
         }
         List<Map> mapList = JSONObject.parseArray(examStudentDto.getExtendFields(), Map.class);

distributed-print/src/main/resources/application-36dev.properties

@@ -80,7 +80,7 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-3
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn

distributed-print/src/main/resources/application-dev.properties

@@ -80,7 +80,7 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-3
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn

distributed-print/src/main/resources/application-release.properties

@@ -80,7 +80,7 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=gdpu
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=jxutcm
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=jxutcm,sisu
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn

distributed-print/src/main/resources/application-test.properties

@@ -80,7 +80,7 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-3
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -412,9 +412,9 @@ public class SystemConstant {
      *
      * @return
      */
-    public static Map<String, String> getFlowSchoolCodeMap() {
+    public static Map<String, List<String>> getFlowSchoolCodeMap() {
         DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
-        Map<String, String> flowSchoolCodeMap = dictionaryConfig.sysDomain().getFlowSchoolCodeMap();
+        Map<String, List<String>> flowSchoolCodeMap = dictionaryConfig.sysDomain().getFlowSchoolCodeMap();
         Optional.ofNullable(flowSchoolCodeMap).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置学校流程code"));
         return flowSchoolCodeMap;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SysDomain.java

@@ -48,13 +48,13 @@ public class SysDomain implements Serializable {
 
     String loginAuthenUrl;
 
-    Map<String, String> flowSchoolCodeMap;
+    Map<String, List<String>> flowSchoolCodeMap;
 
-    public Map<String, String> getFlowSchoolCodeMap() {
+    public Map<String, List<String>> getFlowSchoolCodeMap() {
         return flowSchoolCodeMap;
     }
 
-    public void setFlowSchoolCodeMap(Map<String, String> flowSchoolCodeMap) {
+    public void setFlowSchoolCodeMap(Map<String, List<String>> flowSchoolCodeMap) {
         this.flowSchoolCodeMap = flowSchoolCodeMap;
     }
 

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

@@ -375,9 +375,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             throw ExceptionResultEnum.ERROR.exception("找不到此课程信息");
         }
 
-        Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
+        Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
         BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
-        if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))) {
+        if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
             List<ApproveUserResult> approveUserResultList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.TEACHER);
             if (Objects.nonNull(approveUserResultList) && approveUserResultList.size() > 0) {//说明是实施人员提交
                 List<BlurryUserDto> blurryUserDtoList = new ArrayList<>();