Răsfoiți Sursa

pdf生成bug

xiaof 3 ani în urmă
părinte
comite
2fcbee1ad1

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

@@ -1359,19 +1359,16 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setCreateId(sysUser.getId());
             examTask.setReview(basicExamRule.getReview());
             examTask.setUserId(sysUser.getId());
-            if (examTask.getUserId() == null || !ExamStatusEnum.SUBMIT.name().equals(examTaskDetail.getOperateType())) {
-                examTask.setStatus(ExamStatusEnum.DRAFT);
-            } else {
-                if (Objects.isNull(examTask.getFlowId())) {
-                    //TODO 这里以后要判断学校code来取流程key
-                    examTask.setStatus(ExamStatusEnum.STAGE);
-                    if (basicExamRule.getReview()) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
-                        ProcessInstance processInstance = activitiService.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
-                        examTask.setFlowId(Long.parseLong(processInstance.getId()));
 
-                    }
+            examTask.setStatus(ExamStatusEnum.valueOf(examTaskDetail.getOperateType()));
+            if (Objects.isNull(examTask.getFlowId())) {
+                //TODO 这里以后要判断学校code来取流程key
+                if (basicExamRule.getReview()) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
+                    ProcessInstance processInstance = activitiService.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
+                    examTask.setFlowId(Long.parseLong(processInstance.getId()));
+
                 }
             }
             this.saveOrUpdate(examTask);

+ 2 - 0
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -276,6 +276,7 @@
         <where>
             a.enable = true
             AND a.review = true
+            AND a.status = 'SUBMIT'
             and EXISTS(
             <include refid="findFlowIdToMySelfSql" />
             and art.PROC_INST_ID_ = a.flow_id)
@@ -354,6 +355,7 @@
         <where>
             a.enable = true
             AND a.review = true
+            AND a.status = 'SUBMIT'
             and EXISTS(
             select * from(
             <include refid="findFlowIdToNotMySelfSql" />