fix（设备注销）:更新接口

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

@@ -58,7 +58,9 @@ public class JgScrapCancelController extends BaseController {
             throw new IllegalArgumentException("参数jgScrapCancelAdd不能为空");
         }
         Object o = ((LinkedHashMap<?, ?>) model.get("jgScrapCancelAdd")).get("cancelCertificateList");
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(model.get("jgScrapCancelAdd")));
         jgScrapCancelDto.setCancelCertificateList((List<Map<String, Object>>) o);
+        jgScrapCancelDto.setSEQUENCE_NBR(String.valueOf(jsonObject.get("record")));
         return ResponseHelper.buildResponse(jgScrapCancelService.updateInfo(submitType, jgScrapCancelDto, op));
     }
 

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

@@ -151,10 +151,13 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         ReginParams reginParams = this.getSelectedOrgInfo();
         Map<?, ?> noticeParams = (Map) mapParams.get(PAGE_KEY);
         String equipId = noticeParams.get("record").toString();
+        String[] receiveOrg = String.valueOf(noticeParams.get("receiveOrgCreditCode")).split("_");
         noticeParams.remove("record");
         String[] taskName = new String[]{"流程结束"};
         JgScrapCancelDto model = JSON.parseObject(JSON.toJSONString(noticeParams), JgScrapCancelDto.class);
         model.setSEQUENCE_NBR(equipId);
+        model.setReceiveOrgCode(receiveOrg[0]);
+        model.setReceiveOrgName(receiveOrg[1]);
         // 字段转换
         convertField(model);
         // 获取告知设备信息
@@ -312,11 +315,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return String.format(template, supervisoryCode, type, applyNo);
     }
 
-
-    private Integer getTaskCodeByName(String auditStatus) {
-        return commonService.getDictionaryCodeByName(auditStatus);
-    }
-
     public void deleteBatch(List<Long> ids) {
         JgScrapCancel jgScrapCancel = new JgScrapCancel();
         jgScrapCancel.setIsDelete(true);
@@ -331,7 +329,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
         // 字段转换
         this.convertField(jgScrapCancelDto);
-        WorkflowResultDto workflowResultDto;
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
@@ -340,7 +337,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
                 //未进流程直接发起并执行
                 try {
-                    List<ProcessTaskDTO> processTasks = new ArrayList<>();
+                    List<ProcessTaskDTO> processTasks;
                     ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                     List<ActWorkflowStartDTO> list = new ArrayList<>();
                     ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
@@ -403,6 +400,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             jgScrapCancelEq.setEquId(jgScrapCancelDto.getRecord());
             jgScrapCancelEqMapper.update(jgScrapCancelEq, updateWrapper);
         } else {
+            LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
+            otherLambda.eq(OtherInfo::getRecord, jgScrapCancelDto.getSEQUENCE_NBR());
+            OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
+            String supervisoryCode = otherInfo.getSupervisoryCode();
+            jgScrapCancelDto.setSupervisoryCode(supervisoryCode);
             //更新操作
             JgScrapCancel bean = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, bean);