fix(jg):历史有证登记设备详情bug修改

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

@@ -1567,13 +1567,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = iIdxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(record);
         if (!ValidationUtil.isEmpty(maintenanceRecordInfo)) {
             Map<String, Object> maintenanceRecordInfoMap;
-
-            if (!ValidationUtil.isEmpty(fieldType)) {
+            if (fieldType != null && !fieldType.isEmpty()) {
                 maintenanceRecordInfoMap = Bean.BeantoMap(maintenanceRecordInfo);
                 maintenanceRecordInfoMap.put("repairInform", JSON.parse(maintenanceRecordInfo.getRepairInform()));
                 maintenanceRecordInfoMap.put("maintenancerecordinfoSeq", maintenanceRecordInfo.getSequenceNbr());
             } else {
-                String[] toArrayFields = {"repairInform"};
+                String[] toArrayFields = {"REPAIR_INFORM"};
                 maintenanceRecordInfoMap = convertCamelToUnderscore(maintenanceRecordInfo, toArrayFields);
                 maintenanceRecordInfoMap.put("MAINTENANCERECORDINFO_SEQ", maintenanceRecordInfo.getSequenceNbr());
             }
@@ -1676,7 +1675,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public String judgeTheBusinessAccordingByRecord(String record, Map<String, Object> objMap) {
         String business = "";
         // 安装告知
-        Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetail(record);
+        Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetailByIdx(record);
         if (!ObjectUtils.isEmpty(installDetail)) {
             business = business + ",安装告知";
             objMap.putAll(installDetail);
@@ -1685,7 +1684,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             objMap.put("installContractAttachment", JSON.parse(Optional.ofNullable(installDetail.get("installContractAttachment")).orElse("").toString()));
         }
         // 维保备案
-        Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetail(record);
+        Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetailByIdx(record);
         if (!ObjectUtils.isEmpty(maintenanceDetail)) {
             business = business + ",维保合同备案";
             objMap.putAll(maintenanceDetail);

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

@@ -2147,6 +2147,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
             jsonObject.put("status", jgUseRegistration.getStatus());
             jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
+            jsonObject.put("installLeaderName", jsonObject.getString("installLeaderId"));
+            jsonObject.put("installProxyStatementAttachment", JSONArray.parseArray(jsonObject.getString("proxyStatementAttachmentList")));
             jsonObject.put("installAddress", jsonObject.getString("address"));// 前端展示填充数据
             Optional.ofNullable(jsonObject.get("safetyManagerName")).ifPresent(name -> jsonObject.put("maintenanceManagerName", name));
             Optional.ofNullable(jsonObject.get("phone")).ifPresent(phone -> jsonObject.put("maintenanceManagerPhone", phone));
@@ -4006,8 +4008,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             certificateChangeRecordEqService.save(changeRecordEq1);
         }
 
-        // 使用登记证变更记录 -> 维保备案记录
-        if (!ValidationUtil.isEmpty(map.get("meUnitName"))) {
+        // 使用登记证变更记录 -> 维保备案记录,历史登记不写维保记录日志，测试说的
+        /*if (!ValidationUtil.isEmpty(map.get("meUnitName"))) {
             long jgMaintenanceSeq = sequence.nextId();//登记证记录主键
             String useRegistrationCode = jgUseRegistration.getUseRegistrationCode();// 使用登记证编号
             genJgCertChangeRecordForMaintenance(jgMaintenanceSeq, useRegistrationCode, map, jgUseRegistration, registerInfo);
@@ -4017,7 +4019,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             changeRecordEq2.setEquId(registerInfo.getRecord());//设备主键
             changeRecordEq2.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
             certificateChangeRecordEqService.save(changeRecordEq2);
-        }
+        }*/
     }
 
     public void genJgCertChangeRecordForInstall(Long sequenceNbr, String registrationCode, JSONObject map, JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo idxBizJgRegisterInfo) {
@@ -4062,8 +4064,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         try {
 
             FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(jgUseRegistration.getCreateUserId());
-            changeContent = jgUseRegistration.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "】，" +
-                    "办理日期" + map.get("installStartDate");
+            changeContent = jgUseRegistration.getUseUnitName() + "的" +
+                    agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" +
+                    BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "】，办理日期：" +
+                    Objects.toString(map.get("installStartDate"), "");
             jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("informEnd")));
             jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("informStart")));
         } catch (Exception e) {