21092 【web端】监管业务>维修告知，新增维修告知设备应该只能被添加一次，现在可多次被添加（附图）

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml

@@ -283,7 +283,7 @@
             tzs_jg_maintain_notice_eq b
         where
             a.sequence_nbr = b.equip_transfer_id
-          and a.notice_status not in('6614','6615','6610','6617','6616')
+          and a.notice_status = '6612'
         GROUP BY a.install_unit_credit_code
     </select>
 </mapper>

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

@@ -72,6 +72,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PROCESS_DEFINITION_KEY = "maintainNotice";
     private static final String TABLE_PAGE_ID = "maintainInfo";
+    private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
 
     @Autowired
     IJgInstallationNoticeService iJgInstallationNoticeService;
@@ -199,15 +200,19 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {
         equipList.forEach(equipMap -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).equipRepeatUsedCheck(String.valueOf(equipMap.get("SEQUENCE_NBR")), companyCode));
     }
+
     /**
      * 删除 redis校验重复引用设备的数据
      */
     private void delRepeatUseEquipData(JgMaintainNotice notice) {
-        LambdaQueryWrapper<JgMaintainNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(JgMaintainNoticeEq::getEquipTransferId, notice.getSequenceNbr());
-        JgMaintainNoticeEq noticeEq = jgMaintainNoticeEqMapper.selectOne(queryWrapper);
-        EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getEquId()), notice.getInstallUnitCreditCode());
+        if (NOT_FLOWING_STATE.contains(notice.getNoticeStatus())) {
+
+            LambdaQueryWrapper<JgMaintainNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(JgMaintainNoticeEq::getEquipTransferId, notice.getSequenceNbr());
+            JgMaintainNoticeEq noticeEq = jgMaintainNoticeEqMapper.selectOne(queryWrapper);
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getEquId()), notice.getInstallUnitCreditCode());
+        }
     }
 
     private void rollBackForDelRedisData() {
@@ -932,9 +937,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
                 jgMaintainNoticeMapper.updateById(jgMaintainNotice);
-                this.delRepeatUseEquipData(jgMaintainNotice);
             }
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgMaintainNotice));
+            this.delRepeatUseEquipData(jgMaintainNotice);
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {