fix(equip): 解决设备登记日期为空时的处理逻辑

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -828,9 +828,13 @@ public class CommonEquipDataProcessService {
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
                     .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .eq(JgUseRegistrationManage::getCertificateStatus,YIDENGJI.getName())
-                    .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();
+                    .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode, JgUseRegistrationManage::getRegDate).one();
             if (!ValidationUtil.isEmpty(jgUseRegistrationManage)) {
                 result.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
+                // 如果设备使用信息表里的首次登记日期为空则用使用登记证表里的登记日期
+                if (ObjectUtils.isEmpty(result.get("O_REG_DATE")) || "null".equals(result.get("O_REG_DATE"))) {
+                    result.put("O_REG_DATE", jgUseRegistrationManage.getRegDate());
+                }
             }
         }
         // 返回当前登录人单位类型（企业还是监管、审批）

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

@@ -1557,14 +1557,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String fullAddress = "";
 
         // 设备问题信息（大屏二级页面使用）
-        LambdaQueryWrapper<SafetyProblemTracing> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SafetyProblemTracing::getSourceId, record);
-        lambdaQueryWrapper.orderByDesc(SafetyProblemTracing::getRecDate);
-        List<SafetyProblemTracing> safetyProblemTracings = safetyProblemTracingMapper.selectList(lambdaQueryWrapper);
-        if (!ObjectUtils.isEmpty(safetyProblemTracings)) {
-            objMap.put("problemStatus", ProblemStatusEnum.getNameByDesc.get(safetyProblemTracings.get(0).getProblemStatus()));
-            objMap.put("problemTime", safetyProblemTracings.get(0).getProblemTime());
-        }
+        // 接口已经挪到大屏服务了，先注释掉
+//        LambdaQueryWrapper<SafetyProblemTracing> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        lambdaQueryWrapper.eq(SafetyProblemTracing::getSourceId, record);
+//        lambdaQueryWrapper.orderByDesc(SafetyProblemTracing::getRecDate);
+//        List<SafetyProblemTracing> safetyProblemTracings = safetyProblemTracingMapper.selectList(lambdaQueryWrapper);
+//        if (!ObjectUtils.isEmpty(safetyProblemTracings)) {
+//            objMap.put("problemStatus", ProblemStatusEnum.getNameByDesc.get(safetyProblemTracings.get(0).getProblemStatus()));
+//            objMap.put("problemTime", safetyProblemTracings.get(0).getProblemTime());
+//        }
 
         // 使用信息
         IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(record);
@@ -1897,7 +1898,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
         }
 
-        objMap.put("completedBusinessTypes", judgeTheBusinessAccordingByRecord(record, objMap));
+        objMap.put("completedBusinessTypes", this.judgeTheBusinessAccordingByRecord(record, objMap));
         // 账号类型（用于车用气瓶流程页面-》监管审核-》打开设备详情 时隐藏保存按钮）
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         objMap.put("accountType", reginParams.getCompany().getCompanyType());
@@ -1969,7 +1970,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             List<JgUseRegistrationManage> regs = jgUseRegistrationManageService.lambdaQuery()
                     .select(JgUseRegistrationManage::getSequenceNbr,
                             JgUseRegistrationManage::getReceiveOrgName,
-                            JgUseRegistrationManage::getReceiveCompanyCode)
+                            JgUseRegistrationManage::getReceiveCompanyCode,
+                            JgUseRegistrationManage::getRegDate)
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
                     .eq(JgUseRegistrationManage::getIsDelete, false)
                     .eq(JgUseRegistrationManage::getCertificateStatus, YIDENGJI.getName())
@@ -1982,6 +1984,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 JgUseRegistrationManage jgUseRegistrationManage = regs.get(0);
                 businessBuilder.append(",使用登记");
                 objMap.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
+                // 如果设备使用信息表里的首次登记日期为空则用使用登记证表里的登记日期
+                if (ObjectUtils.isEmpty(objMap.get("O_REG_DATE")) || "null".equals(objMap.get("O_REG_DATE"))) {
+                    objMap.put("O_REG_DATE", jgUseRegistrationManage.getRegDate());
+                }
             }
         }
 

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

@@ -1926,24 +1926,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
      */
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
-    @FieldMapping({
-            @FieldMapping.FieldMap(
-                    sourceField = "installUnitCode",
-                    paramIndex = 1,
-                    targetField = "installUnitSeq",
-                    serviceClass = CommonServiceImpl.class,
-                    queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
-                    secondParamValue = "AGW"
-            ),
-            @FieldMapping.FieldMap(
-                    sourceField = "inspectUnitCreditCode",
-                    paramIndex = 1,
-                    targetField = "inspectUnitSeq",
-                    serviceClass = CommonServiceImpl.class,
-                    queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
-                    secondParamValue = "JY,JC"
-            )
-    })
     public List<JgVehicleInformation> saveOrUpdateHisData(JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         CompanyBo company = reginParams.getCompany();
@@ -2061,15 +2043,13 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         }
         //检验机构信息
         if (!StringUtils.isEmpty(vehicleInfoDto.getInspectUnitCreditCode())) {
-            String inspectUnitSeq = MapUtil.getStr(map, "inspectUnitSeq");
-            Map<String, String> inspectUnit = commonService.queryTcmUnitInfoBySeq(inspectUnitSeq, TcmUnitTypeEnum.JY.getCode());
+            Map<String, String> inspectUnit = commonService.queryTcmUnitInfoBySeq(vehicleInfoDto.getInspectUnitCreditCode(), TcmUnitTypeEnum.JY.getCode());
             vehicleInfoDto.setInspectUnitCreditCode(MapUtil.getStr(inspectUnit, "unitCode"));
             vehicleInfoDto.setInspectUnitName(MapUtil.getStr(inspectUnit, "unitName"));
         }
         //安装单位信息
         if (!StringUtils.isEmpty(vehicleInfoDto.getInstallUnitCode())) {
-            String installUnitSeq = MapUtil.getStr(map, "installUnitSeq");
-            Map<String, String> installUnit = commonService.queryTcmUnitInfoBySeq(installUnitSeq, TcmUnitTypeEnum.JY.getCode());
+            Map<String, String> installUnit = commonService.queryTcmUnitInfoBySeq(vehicleInfoDto.getInstallUnitCode(), TcmUnitTypeEnum.AGW.getCode());
             vehicleInfoDto.setInstallUnitCode(MapUtil.getStr(installUnit, "unitCode"));
             vehicleInfoDto.setInstallUnitName(MapUtil.getStr(installUnit, "unitName"));
         }