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/edit/event/listener/ChangeEquipImpactCertListener.java

@@ -144,6 +144,9 @@ public class ChangeEquipImpactCertListener {
             case "useOrgCode":
                 manage.setUseRegistrationCode(afterValue);
                 break;
+            case "carNumber":
+                manage.setCarNumber(afterValue);
+                break;
             case "city":
             case "county":
             case "street":

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

@@ -1246,7 +1246,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 );
                             }
                             //场车更新车牌号
-                            if ("5000".equals(dto.getEquListCode()) && newCarNumber != null && useCode != null){
+                            if ("5000".equals(dto.getEquListCode()) && newCarNumber != null && !"null".equals(newCarNumber) && useCode != null){
                                     idxBizJgRegisterInfoService.update(new IdxBizJgRegisterInfo().setCarNumber(newCarNumber),
                                             new LambdaQueryWrapper<IdxBizJgRegisterInfo>().in(IdxBizJgRegisterInfo::getUseOrgCode, useCode)
                                     );
@@ -1277,6 +1277,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 dto.getRegistrationList().stream()
                                         .filter(item -> targetCode.equals(item.get("useRegistrationCode")))
                                         .map(item -> String.valueOf(item.get("newCarNumber")))
+                                        .filter(carNumber -> carNumber != null && !"null".equalsIgnoreCase(carNumber.trim()))
                                         .findFirst()
                                         .ifPresent(registrationManage::setCarNumber);
                             }

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

@@ -582,9 +582,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         dataList.forEach(item -> {
             JSONObject object = JSONObject.parseObject(JSON.toJSONString(item));
             JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
-            jgCertificateChangeRecordEq.setEquId(object.get("record").toString());
+            jgCertificateChangeRecordEq.setEquId(Objects.toString(object.get("record"),""));
             jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
-            jgCertificateChangeRecordEq.setProductCode(object.get("factoryNum").toString());
+            jgCertificateChangeRecordEq.setProductCode(Objects.toString(object.get("factoryNum"),""));
             jgCertificateChangeRecordEqs.add(jgCertificateChangeRecordEq);
         });
         // 保存设备流水信息

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

@@ -100,7 +100,6 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
     private final JgOverDesignServiceLifeEqServiceImpl jgOverDesignServiceLifeEqService;
     private final JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
     private final RedissonClient redissonClient;
-    private final CommonServiceImpl commonServiceImpl;
     private final RedisUtils redisUtils;
     private final CmWorkflowServiceImpl cmWorkflowService;
     private final JgOverDesignServiceLifeEqMapper jgOverDesignServiceLifeEqMapper;
@@ -409,14 +408,14 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                 throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
             }
             // 撤回校验
-            commonServiceImpl.checkForRevocationFlow(nextTaskId, instanceId);
+            commonService.checkForRevocationFlow(nextTaskId, instanceId);
 
             JgOverDesignServiceLife overDesign = new JgOverDesignServiceLife();
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(instanceId);
             ArrayList<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
             processTaskDTOS.add(processTaskDTO);
-            List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
+            List<WorkflowResultDto> resultDto = commonService.buildWorkFlowInfo(processTaskDTOS);
             String taskCode = "";
             String roles = "";
             if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
@@ -442,7 +441,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
             jsonObject.put("nextTaskId", data.getNextTaskId());
             jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
             jsonObject.put("taskType", BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getCode());
-            jsonObject.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(overDesign.getStatus()));
+            jsonObject.put("flowStatus", commonService.getDictionaryCodeByName(overDesign.getStatus()));
             jsonObject.put("flowStatusLabel", overDesign.getStatus());
             jsonObject.remove("otherAccessories");
             jsonObject.remove("instanceStatus");
@@ -459,9 +458,9 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                 jsonObject.put("pageType", "look");
             }
             // 撤回删除代办
-            commonServiceImpl.rollbackTask(instanceId, jsonObject);
+            commonService.rollbackTask(instanceId, jsonObject);
             // redis流程实时数据更新
-            commonServiceImpl.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(data));
+            commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(data));
             this.clearDataForCheckEquipRepeatUsed(data);
         } catch (InterruptedException e) {
             e.printStackTrace();
@@ -925,7 +924,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
     @Transactional(rollbackFor = Exception.class)
     public Boolean delete(Long sequenceNbr) {
         JgOverDesignServiceLife overDesignServiceLife = this.baseMapper.selectById(sequenceNbr);
-        commonServiceImpl.deleteTaskModel(String.valueOf(sequenceNbr), overDesignServiceLife.getInstanceId());
+        commonService.deleteTaskModel(String.valueOf(sequenceNbr), overDesignServiceLife.getInstanceId());
         this.baseMapper.deleteById(sequenceNbr);
         jgOverDesignServiceLifeEqService.remove(new LambdaQueryWrapper<JgOverDesignServiceLifeEq>()
                 .eq(JgOverDesignServiceLifeEq::getOverDesignId, sequenceNbr));
@@ -1035,7 +1034,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
         BeanUtils.copyProperties(overDesignServiceLife, taskMessageDto);
         this.setEquListForWorkSpace(overDesignServiceLife, taskMessageDto);
         taskMap.put("model", taskMessageDto);
-        commonServiceImpl.updateTaskModel(taskMap);
+        commonService.updateTaskModel(taskMap);
     }
 
     public Map<String, Object> getNewWTJYInspectionDetailByRecord(String record, String equListCode) {

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

@@ -2079,7 +2079,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             String orgCode = "";
             if (jsonObject.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(jsonObject.get("orgBranchCode"))) {
                 orgCode = String.valueOf(jsonObject.get("orgBranchCode")).split("_")[0];
-                ;
             }
             //驳回
             if ("1".equals(operate)) {