bug修改

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

@@ -206,8 +206,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
     private void checkRepeatUsed(List<Map<String, Object>> deviceList, JgTransferNotice notice) {
-        deviceList.forEach(obj -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                .equipRepeatUsedCheck(String.valueOf(obj.get("SEQUENCE_NBR")), notice.getInstallUnitCreditCode()));
+        deviceList.forEach(obj -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).equipRepeatUsedCheck(String.valueOf(obj.get("SEQUENCE_NBR")), notice.getInstallUnitCreditCode()));
     }
 
     private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {
@@ -221,16 +220,17 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         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());
+            List<JgTransferNoticeEq> jgTransferNoticeEqs = jgTransferNoticeEqMapper.selectList(queryWrapper);
+            for (JgTransferNoticeEq noticeEq : jgTransferNoticeEqs) {
+                EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                        .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getEquId()), notice.getInstallUnitCreditCode());
+            }
         }
     }
 
     private void rollBackForDelRedisData() {
         FlowingEquipRedisContext.getContext().forEach(e -> {
-            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                    .delDataForCheckWithKey(e.getData(), e.getRedisKey());
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey());
         });
     }
 
@@ -266,11 +266,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             // 删除业务单
             this.getBaseMapper().deleteById(sequenceNbr);
             // 删除对应eq
-            jgTransferNoticeEqMapper.delete(new LambdaQueryWrapper<JgTransferNoticeEq>()
-                    .eq(JgTransferNoticeEq::getEquipTransferId, sequenceNbr));
+            jgTransferNoticeEqMapper.delete(new LambdaQueryWrapper<JgTransferNoticeEq>().eq(JgTransferNoticeEq::getEquipTransferId, sequenceNbr));
             // 删除单子对应历史表数据
-            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgTransferNotice.getSequenceNbr()));
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, jgTransferNotice.getSequenceNbr()));
         }
         return Boolean.TRUE;
     }
@@ -560,10 +558,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     /**
      * 组装业务数据
      */
-    private void businessData(String submitType, ReginParams reginParams, JgTransferNoticeDto model,
-                              List<Map<String, Object>> deviceList, ResponseModel<List<String>> responseModel,
-                              List<WorkflowResultDto> workflowResultList, List<JgTransferNotice> list,
-                              List<JgTransferNoticeEq> equipList) {
+    private void businessData(String submitType, ReginParams reginParams, JgTransferNoticeDto model, List<Map<String, Object>> deviceList, ResponseModel<List<String>> responseModel, List<WorkflowResultDto> workflowResultList, List<JgTransferNotice> list, List<JgTransferNoticeEq> equipList) {
         CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
         JgTransferNotice dto = new JgTransferNotice();
         BeanUtils.copyProperties(model, dto);
@@ -757,6 +752,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void cancel(JgTransferNoticeDto noticeDto) {
         String instanceId = noticeDto.getInstanceId();
         String nextTaskId = noticeDto.getNextTaskId();
@@ -803,11 +799,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 
 
     public InstanceRuntimeData buildInstanceRuntimeData(JgTransferNotice jgTransferNotice) {
-        return InstanceRuntimeData.builder()
-                .nextExecuteUserIds(jgTransferNotice.getNextExecuteUserIds())
-                .promoter(jgTransferNotice.getPromoter())
-                .nextTaskId(jgTransferNotice.getNextTaskId())
-                .build();
+        return InstanceRuntimeData.builder().nextExecuteUserIds(jgTransferNotice.getNextExecuteUserIds()).promoter(jgTransferNotice.getPromoter()).nextTaskId(jgTransferNotice.getNextTaskId()).build();
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -853,8 +845,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                     queryWrapper2.eq(RegistrationInfo::getRecord, jgTransferNoticeEq.getEquId());
                     RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                    String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine())
-                            .orElse(tzsJgRegistrationInfo.getEquCategory());
+                    String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine()).orElse(tzsJgRegistrationInfo.getEquCategory());
                     String registrationCode = equCode + jgTransferNotice.getReceiveCompanyCode() + ym;
                     ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                     String deviceRegistrationCode = responseModel.getResult();
@@ -988,8 +979,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         Iterable<ESEquipmentCategoryDto> allById = esEquipmentCategory.findAllById(ids);
         List<Map<String, Object>> equipListMaps = getEquipListMaps(allById);
         json.put("deviceList", equipListMaps);
-        commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName(),
-                json, equId, jgTransferNotice.getSequenceNbr().toString());
+        commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName(), json, equId, jgTransferNotice.getSequenceNbr().toString());
     }