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/service/impl/JgUseRegistrationServiceImpl.java

@@ -471,7 +471,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
                     if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
                         WorkflowResultDto workflowResultDto = resultDto.get(0);
-                        updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, Boolean.TRUE, "");
+                        updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, Boolean.TRUE);
                     }
 
                 }
@@ -800,7 +800,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         this.getBaseMapper().updateById(jgUseRegistration);
     }
 
-    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst, String carNumber) {
+    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String role = workflowResultDto.getNextExecutorRoleIds();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -814,24 +814,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setNextTaskId(workflowResultDto.getNextTaskId());
         jgUseRegistration.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
 
-        if (!ObjectUtils.isEmpty(carNumber)) {
-            // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
-
-            LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(IdxBizJgRegisterInfo::getCarNumber, carNumber);
-            wrapper.ne(!ObjectUtils.isEmpty(jgUseRegistrationEq.getEquId()), IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
-            Integer count = idxBizJgRegisterInfoMapper.selectCount(wrapper);
-            if (count > 0) {
-                throw new BadRequest("车牌号已存在，请重新输入！");
-            }
-
-            LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
-                    .eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
-            IdxBizJgRegisterInfo idxBizJgRegisterInfo = new IdxBizJgRegisterInfo();
-            idxBizJgRegisterInfo.setCarNumber(carNumber);
-            idxBizJgRegisterInfoMapper.update(idxBizJgRegisterInfo, updateWrapper);
-        }
-
         if (isFirst) {
             jgUseRegistration.setInstanceStatus(workflowResultDto.getExecutorRoleIds());
             jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
@@ -1089,6 +1071,26 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             commonService.checkForExecuteFlow(nextTaskId, instanceId);
 
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
+
+            if (!ObjectUtils.isEmpty(carNumber)) {
+                // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
+                LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
+                        .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
+                JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
+                LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(IdxBizJgRegisterInfo::getCarNumber, carNumber);
+                wrapper.ne(!ObjectUtils.isEmpty(jgUseRegistrationEq.getEquId()), IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
+                Integer count = idxBizJgRegisterInfoMapper.selectCount(wrapper);
+                if (count > 0) {
+                    throw new BadRequest("车牌号已存在，请重新输入！");
+                }
+
+                LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
+                        .eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
+                IdxBizJgRegisterInfo idxBizJgRegisterInfo = new IdxBizJgRegisterInfo();
+                idxBizJgRegisterInfo.setCarNumber(carNumber);
+                idxBizJgRegisterInfoMapper.update(idxBizJgRegisterInfo, updateWrapper);
+            }
             // 组装信息
             TaskResultDTO dto = new TaskResultDTO();
             dto.setResultCode("approvalStatus");
@@ -1117,7 +1119,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 if ("unit".equals(manageType)) {
                     this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, false);
                 } else {
-                    this.updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, false, carNumber);
+                    this.updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, false);
                 }
             }
             this.clearDataForCheckEquipRepeatUsed(jgUseRegistration);