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

@@ -476,7 +476,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);
                     }
 
                 }
@@ -805,7 +805,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         this.getBaseMapper().updateById(jgUseRegistration);
     }
 
-    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) {
+    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto,String carNumber, 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();
@@ -838,6 +838,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 驳回操作
                 jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgUseRegistration.setPromoter("");
+                // 如果 驳回到使用单位  厂车设备  有车牌号，清除车牌号
+                // 避免出现以下情况：
+                // 厂车使用登记 -》 使用单位提交 -》 一级填写了厂车车牌号，例如：场内陕AB1234，通过 -》 到二级或者三级，驳回到使用单位
+                // -》 使用单位重新编辑提交，并且换了另一个设备 —-》 一级审批继续使用车牌号：场内陕AB1234，会出现车牌号已存在
+                if ( WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode)  && !ObjectUtils.isEmpty(carNumber)) {
+                    idxBizJgRegisterInfoMapper.update(null, new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
+                            .set(IdxBizJgRegisterInfo::getCarNumber, null)
+                            .eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId()));
+                }
             }
             if (isFirst) {
                 buildTask(jgUseRegistration, workflowResultDto);
@@ -1109,18 +1118,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if ("1".equals(operate) && WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus())) {
                 // 驳回到使用单位
                 dto.setNextExecuteUserCompanyCode(jgUseRegistration.getUseUnitCreditCode());
-                // 如果厂车设备 有车牌号，清除车牌号
-                // 避免出现以下情况：
-                // 厂车使用登记 -》 使用单位提交 -》 一级填写了厂车车牌号，例如：场内陕AB1234，通过 -》 到二级或者三级，驳回到使用单位
-                // -》 使用单位重新编辑提交，并且换了另一个设备 —-》 一级审批继续使用车牌号：场内陕AB1234，会出现车牌号已存在
-                if (!ObjectUtils.isEmpty(carNumber)) {
-                    LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
-                            .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
-                    JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
-                    idxBizJgRegisterInfoMapper.update(null, new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
-                            .set(IdxBizJgRegisterInfo::getCarNumber, null)
-                            .eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId()));
-                }
             } else {
                 dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
             }
@@ -1134,7 +1131,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);
+                    this.updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto,carNumber, false);
                 }
             }
             this.clearDataForCheckEquipRepeatUsed(jgUseRegistration);