28180 【监管】移装告知业务改为批量提交批量审批

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/JgTransferNoticeServiceImpl.java

@@ -77,6 +77,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PROCESS_DEFINITION_KEY = "transferNotice";
     private static final String TABLE_PAGE_ID = "transferNoticeAdd";
+    private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
 
     @Autowired
     EquipmentCategoryMapper equipmentCategoryMapper;
@@ -217,11 +218,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * 删除 redis校验重复引用设备的数据
      */
     private void delRepeatUseEquipData(JgTransferNotice notice) {
-        LambdaQueryWrapper<JgTransferNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(JgTransferNoticeEq::getEquipTransferId, notice.getSequenceNbr());
-        JgTransferNoticeEq noticeEq = jgTransferNoticeEqMapper.selectOne(queryWrapper);
-        EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getEquId()), notice.getInstallUnitCreditCode());
+        if (NOT_FLOWING_STATE.contains(notice.getNoticeStatus())) {
+            LambdaQueryWrapper<JgTransferNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(JgTransferNoticeEq::getEquipTransferId, notice.getSequenceNbr());
+            JgTransferNoticeEq noticeEq = jgTransferNoticeEqMapper.selectOne(queryWrapper);
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getEquId()), notice.getInstallUnitCreditCode());
+        }
     }
 
     private void rollBackForDelRedisData() {
@@ -581,9 +584,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         } else {
             dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
         }
-//        dto.setEquipCateName(obj.getOrDefault("EQU_CATEGORY", "").toString());
-//        dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
-//        dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
+        dto.setEquipCateName(deviceList.get(0).getOrDefault("EQU_CATEGORY", "").toString());
+        dto.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
+        dto.setSupervisoryCode(String.valueOf(deviceList.get(0).get("SUPERVISORY_CODE")));
         dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
         dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
         if (!CollectionUtils.isEmpty(workflowResultList)) {
@@ -963,6 +966,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 jgTransferNoticeMapper.updateById(jgTransferNotice);
             }
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgTransferNotice));
+            this.delRepeatUseEquipData(jgTransferNotice);
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {