广药子流程update

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

@@ -387,6 +387,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                 if (Objects.nonNull(task)) {
                     Map<String, Object> map1 = new HashMap<>();
                     map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
+                    map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
                     activitiService.taskApprove(map1);
                 }
             }

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

@@ -983,6 +983,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 Map<String, Object> map1 = new HashMap<>();
                 map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
                 map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskDetail.getApproveUserIds());
+                map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
                 activitiService.taskApprove(map1);
             }
         }
@@ -1526,6 +1527,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         Map<String, Object> map1 = new HashMap<>();
                         map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
                         map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyParam.getApproveUserIds());
+                        map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
                         activitiService.taskApprove(map1);
                     }
                 }
@@ -1749,10 +1751,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     Map<String, Object> map1 = new HashMap<>();
                     map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
                     map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyTemp.getApproveUserIds());
+                    map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
                     activitiService.taskApprove(map1);
                 }
             }
-
             return examTask;
         } catch (Exception e) {
             log.error("请求出错", e);

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

@@ -12,13 +12,13 @@ spring.application.name=distributed-print
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=192.168.10.136
 db.port=3307
-db.name=dps_test
+db.name=dps-v2.2.2-test
 db.username=dps_test
 db.password=dps_test
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=14
+com.qmth.redis.db=15
 com.qmth.redis.port=6379
 com.qmth.redis.password=123456
 
@@ -79,8 +79,8 @@ sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-1
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-2
+sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
 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

@@ -216,6 +216,7 @@ public class SystemConstant {
     public static final String APPROVE_PRESIDENT_SYSTEM = "presidentApprove";//流程院长自动审批
     public static final String EXAM_TASK_ID = "examTaskId";
     public static final String APPROVE_TF_FLOW_LOG = "TFFlowLog";//流程院长自动审批
+    public static final String PAPAER_ATTACHMENT_IDS = "paperAttachmentIds";//命题附件ids
     public static final String REDIS_LOCK_FLOW_TASK_PREFIX = "redis:lock:flow:task:";//流程节点锁
     public static final String REDIS_LOCK_EXAM_TASK_FLOW_PREFIX = "redis:lock:exam:task:flow:";//考试任务流程节点锁
     public static final long REDIS_LOCK_FLOW_TASK_TIME_OUT = 60L * 2;