fix（注销报废）:列表数据查询到已删除数据，驳回修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml

@@ -64,8 +64,8 @@
             <if test="roleIds != null and dto.type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     ur.instance_status like concat('%',#{role},'%')
+                    or ur.create_user_id = #{dto.createUserId}
                 </foreach>
-                or ur.create_user_id = #{dto.createUserId}
             </if>
             <if test="dto.type == 'supervision'">
                 AND ur.receive_org_code = #{orgCode}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -463,6 +463,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtils.copyProperties(jgScrapCancelDto, taskMessageDto);
         modelDto.setModel(taskMessageDto);
+        modelDto.setPageType(this.getPageTypeForReject(operate, jgScrapCancelDto.getAuditStatus()));
         commonService.buildTaskModel(Collections.singletonList(modelDto));
     }
 
@@ -470,6 +471,21 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return commonService.getDictionaryCodeByName(auditStatus);
     }
 
+    private String getPageTypeForReject(String operate, String auditStatus) {
+        // 驳回
+        if ("1".equals(operate)) {
+            // 且驳回到的节点为使用单位提交 则可编辑
+            if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus) ||
+                    WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus) ||
+                    WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)
+            ) {
+                return "edit";
+            }
+            return "look";
+        }
+        return "look";
+    }
+
     private TaskV2Model updateTaskModel(JgScrapCancelDto jgScrapCancelDto, String operate) {
         Map<String, Object> params = new HashMap<>();
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
@@ -557,6 +573,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jsonObject.put("taskType", businessTypeJudgment(jgScrapCancel.getCancelType()).getCode());
         jsonObject.put("flowStatus", this.getTaskCodeByName(jgScrapCancel.getAuditStatus()));
         jsonObject.put("flowStatusLabel", jgScrapCancel.getAuditStatus());
+        // 判断撤回后当前的节点，如果当前节点为提交节点则页面可编辑
+        jsonObject.put("pageType", this.getPageTypeByCurrentNode(jgScrapCancel.getAuditStatus()));
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -564,6 +582,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return commonService.getDictionaryCodeByName(auditStatus);
     }
 
+    private String getPageTypeByCurrentNode(String auditStatus) {
+        if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus)
+                || WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus)
+                || WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)
+        ) {
+            return "edit";
+        } else {
+            return "look";
+        }
+    }
+
     @Transactional
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {