fix（注销报废）:流程执行添加下一节点机构code

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

@@ -196,6 +196,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 dto.setProcessDefinitionKey("scrapCancelNew");
                 dto.setBusinessKey(applyNoList.get(i));
                 dto.setCompleteFirstTask(Boolean.TRUE);
+                //下一节点执行人单位（下节点接收机构code）
+                dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
@@ -347,6 +349,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     dto.setProcessDefinitionKey("unitRename");
                     dto.setBusinessKey(jgScrapCancelDto.getApplyNo());
                     dto.setCompleteFirstTask(true);
+                    dto.setNextExecuteUserCompanyCode(jgScrapCancelDto.getReceiveOrgCode());
                     list.add(dto);
                     actWorkflowBatchDTO.setProcess(list);
                     processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
@@ -569,6 +572,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
+            //下一节点执行人单位（下节点接收机构code）
+            dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, jgScrapCancel));
             //执行流程
             ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
             // 更新下一步执行人、创建待办
@@ -669,4 +674,19 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jgScrapCancel.setAuditPassDate(new Date());
     }
 
+    public String getNextUserOrgCode(String operate, JgScrapCancel jgScrapCancel) {
+        String code = null;
+        if ("0".equals(operate)) {
+            code = jgScrapCancel.getReceiveOrgCode();
+        } else {
+            //驳回
+            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getName().equals(jgScrapCancel.getAuditStatus()) ||
+                    WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) ||
+                    WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
+                code = jgScrapCancel.getUseUnitCode();
+            }
+        }
+        return code == null ? jgScrapCancel.getReceiveOrgCode() : code;
+    }
+
 }
\ No newline at end of file