fix(jg):作废停用状态不一致

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java

@@ -155,4 +155,16 @@ public class JgScrapCancelController extends BaseController {
     }
 
 
+    /**
+     * 处理设备报废注销流程结束，业务未结束单子问题
+     * @param applyNo 申请单号
+     * @return s
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/handleNoticeWrongData")
+    @ApiOperation(httpMethod = "POST", value = "处理设备报废注销流程结束，业务未结束单子问题", notes = "处理设备报废注销流程结束，业务未结束单子问题")
+    public ResponseModel<Object> handleScrapCancelWrongData(@RequestParam("applyNo") String applyNo) {
+        jgScrapCancelService.handleScrapCancelWrongData(applyNo);
+        return ResponseHelper.buildResponse("ok");
+    }
 }

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

@@ -1131,4 +1131,30 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         commonService.saveExecuteFlowData2Redis(jgScrapCancel.getInstanceId(), this.buildInstanceRuntimeData(jgScrapCancel));
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public void handleScrapCancelWrongData(String applyNo) {
+        JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(new LambdaQueryWrapper<JgScrapCancel>()
+                .in(JgScrapCancel::getApplyNo, applyNo)
+                .eq(JgScrapCancel::getIsDelete, 0));
+        WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+        workflowResultDto.setNextExecutorRoleIds(jgScrapCancel.getNextExecuteIds());
+        workflowResultDto.setNextTaskCode("已完成");
+        workflowResultDto.setNextTaskId(jgScrapCancel.getNextTaskId());
+        workflowResultDto.setNextExecutorUserIds(jgScrapCancel.getNextExecuteUserIds());
+
+        jgScrapCancel.setNextExecuteUserIds("");
+        jgScrapCancel.setNextTaskId(jgScrapCancel.getNextTaskId());
+        JgScrapCancelDto scrapCancelDto = new JgScrapCancelDto();
+        BeanUtils.copyProperties(jgScrapCancel, scrapCancelDto);
+        scrapCancelDto.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
+        // 更新代办
+        TaskV2Model taskV2Model = updateTaskModel(scrapCancelDto, "0");
+        // 修改业务信息
+        updateInfoOther(jgScrapCancel, taskV2Model.getRoutePath());
+        // 发送数据变更消息
+        this.sendDataRefreshMsg(jgScrapCancel);
+        //  创建设备履历
+        this.createResume(jgScrapCancel, taskV2Model.getRoutePath());
+    }
 }