Merge branch 'develop_tzs_register' of…

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

@@ -15,8 +15,10 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeEqSe
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +54,7 @@ public class ChangeEquipImpactCertListener {
     private final IdxBizJgProjectContraptionServiceImplService jgProjectContraptionService;
     private final JgInstallationNoticeEqServiceImpl jgInstallationNoticeEqService;
     private final IdxBizJgUseInfoMapper useInfoMapper;
+    private final IdxBizJgRegisterInfoMapper registerInfoMapper;
 
     /**
      * 事件监听：只把事件放入队列
@@ -141,6 +144,9 @@ public class ChangeEquipImpactCertListener {
             case "useOrgCode":
                 manage.setUseRegistrationCode(afterValue);
                 break;
+            case "carNumber":
+                manage.setCarNumber(afterValue);
+                break;
             case "city":
             case "county":
             case "street":
@@ -296,6 +302,25 @@ public class ChangeEquipImpactCertListener {
 
     private void handleNewEquipEdit(BaseBizDataChangeEvent event) {
         log.info("处理 handleNewEquipEdit 类型逻辑");
+        if (event.getBizRelationData().getBizIsFinished()){
+            String useOrgCode = "";
+            for (FieldChangeMeta meta : event.getData()) {
+                String columnKey = meta.getColumnKey();
+                if (columnKey.equals("useOrgCode")){
+                    useOrgCode = meta.getColumnOldValue();
+                }else{
+                    LambdaQueryWrapper<IdxBizJgRegisterInfo> queryRegisterWrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
+                    queryRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, event.getBizRelationData().getBizId());
+                    IdxBizJgRegisterInfo registerInfo = registerInfoMapper.selectOne(queryRegisterWrapper);
+                    useOrgCode = registerInfo.getUseOrgCode();
+                }
+            }
+            JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
+                    .eq(JgUseRegistrationManage::getUseRegistrationCode, useOrgCode)
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
+                    .one();
+            this.handleFieldChange(event.getData(), jgUseRegistrationManage);
+        }
     }
 
     private void handleNewProjectEdit(List<FieldChangeMeta> fieldChangeMetaList, String projectContraptionId) {

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

@@ -3190,7 +3190,7 @@ public class CommonServiceImpl implements ICommonService {
      */
     public String castDataQualityScore2Name(String dataQualityScore, Boolean isIntoManagement){
         String name = dataDictTypeHandler.handle(DATA_QUALITY_SCORE, dataQualityScore);
-        return name == null ?  (isIntoManagement == null || !isIntoManagement) ? "Ⅱ级" : "Ⅲ级" : name;
+        return name == null ?  (isIntoManagement == null || !isIntoManagement) ? "二级" : "三级" : name;
     }
 
     public void setDataQualityScore2Json(Map<String, Object> result, String bizId, BusinessTypeEnum businessTypeEnum) {

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

@@ -1248,7 +1248,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)
                                     );
@@ -1279,6 +1279,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

@@ -597,9 +597,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/JgInstallationNoticeServiceImpl.java

@@ -415,7 +415,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 installationInfo.put("equDefineName", projectContraption.getEquDefineName());
                 equipListMaps = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionId);
                 equipListMaps.forEach(item ->
-                        item.put("deviceLevel", Optional.ofNullable(dataDictionaryMapper.getByCode(String.valueOf(item.get("deviceLevel")),"8300"))
+                        item.put("deviceLevel", Optional.ofNullable(dataDictionaryMapper.getByCode(String.valueOf(item.get("deviceLevel")), projectContraption.getEquCategory()))
                                 .map(DataDictionary::getName)
                                 .orElse("")));
             } else {
@@ -2027,7 +2027,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         List<Map<String, Object>> deviceList = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionSeq);
         deviceList.forEach(device -> {
             String deviceLevel = String.valueOf(device.get("deviceLevel"));
-            device.put("deviceLevel", dataDictionaryMapper.getByCode(deviceLevel,"8300").getName());
+            device.put("deviceLevel", dataDictionaryMapper.getByCode(deviceLevel, projectContraption.getEquCategory()).getName());
             device.put("sequenceNbr", projectContraptionSeq);
             device.put("equListName", projectContraption.getEquListName());
         });

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

@@ -1954,7 +1954,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 更新es的下次检验日期
             param.put("NEXT_INSPECT_DATE", this.castDate2TimeStr(dataMap.getString("nextInspectDate")));
             param.put("USE_INNER_CODE", useInfo.getUseInnerCode());
-            if (!Arrays.asList("temp", "tempEdit").contains(dataMap.get("historySubmitType"))) {
+            String historySubmitType = String.valueOf(dataMap.get("historySubmitType"));
+            if (!"temp".equals(historySubmitType) && !"tempEdit".equals(historySubmitType)) {
                 param.put("IS_INTO_MANAGEMENT", true);
             }
             param.put("USE_PLACE_CODE", jsonObject.get("province") + "#" + jsonObject.get("city") + "#" + jsonObject.get("county") + "#" + jsonObject.get("factoryUseSiteStreet"));
@@ -1966,6 +1967,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             param.put("EQU_CODE", dataMap.get("equCode"));
             param.put("USE_ORG_CODE", jgUseRegistration.getUseRegistrationCode());
             param.put("CYLINDER_CATEGORY", dataMap.get("cylinderCategory"));
+            param.put("FACTORY_NUM", MapUtil.getStr(dataMap, "factoryNum"));
             objMap.put((String) dataMap.get("equipId"), param);
             tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
         }
@@ -2080,7 +2082,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)) {
@@ -2375,7 +2376,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             new FillingUseRegisterResult(sequenceNbr, jsonObject, applicationContext).getData();
             // 结果增强，填充当前人是否有编辑按钮权限
             new FillingEditPermForCurrentUser(jsonObject, Optional.ofNullable(selectedOrgInfo).map(ReginParams::getCompany).orElse(null), BusinessTypeEnum.JG_USAGE_REGISTRATION).getData();
-            commonServiceImpl.setDataQualityScore2Json(jsonObject, sequenceNbr + "", BusinessTypeEnum.JG_USAGE_REGISTRATION);
+            //commonServiceImpl.setDataQualityScore2Json(jsonObject, sequenceNbr + "", BusinessTypeEnum.JG_USAGE_REGISTRATION);
             return jsonObject;
         }
         // 基本信息 + 制造信息

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonServiceImpl.java

@@ -268,6 +268,6 @@ public class CommonServiceImpl {
     public String castDataQualityScore2Name(String dataQualityScore, Boolean isIntoManagement) {
         DataDictionary dataDictionary = dictionaryService.getByCode("DATA_QUALITY_SCORE", dataQualityScore);
         String name = Optional.ofNullable(dataDictionary).map(DataDictionary::getName).orElse(null);
-        return name == null ? (isIntoManagement == null || !isIntoManagement) ? "Ⅱ级" : "Ⅲ级" : name;
+        return name == null ? (isIntoManagement == null || !isIntoManagement) ? "二级" : "三级" : name;
     }
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/json/unitTypeLimitUserType.json

@@ -65,5 +65,14 @@
     "6616": [],
     "6617": [],
     "6549": []
+  },
+  "个人主体": {
+    "6552": ["6713"],
+    "6546": [],
+    "6547": [],
+    "6548": [],
+    "6616": [],
+    "6617": [],
+    "6549": []
   }
 }