fix（设备注销）:删除代办

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

@@ -528,7 +528,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
         jgScrapCancel.setNextExecuteUserIds(nextUserIds);
         jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
-        jgScrapCancel.setNextExecuteIds(Objects.isNull(workflowResultDto) ? null : workflowResultDto.getNextExecutorRoleIds());
+        jgScrapCancel.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         this.update(jgScrapCancel, lambda);
 
         // 删除待办
@@ -536,9 +536,15 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jsonObject.put("nextTaskId", jgScrapCancel.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgScrapCancel.getNextExecuteIds());
         jsonObject.put("taskType", businessTypeJudgment(jgScrapCancel.getCancelType()).getCode());
+        jsonObject.put("flowStatus", this.getTaskCodeByName(jgScrapCancel.getAuditStatus()));
+        jsonObject.put("flowStatusLabel", jgScrapCancel.getAuditStatus());
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
+    private Integer getTaskCodeByName(String auditStatus) {
+        return commonService.getDictionaryCodeByName(auditStatus);
+    }
+
     @Transactional
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {