fix(jg)：详情接口“其他附加”字段解析

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgMaintenanceContractVo.java

 package com.yeejoin.amos.boot.module.jg.api.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -174,5 +175,5 @@ public class JgMaintenanceContractVo {
     private String maintenanceManagerPhone;
 
     @ApiModelProperty (value = "其他附件")
-    private String otherAccessories;
+    private JSONArray otherAccessories;
 }

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

@@ -474,7 +474,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 designInfoMap.put("designDoc", JSON.parseArray(designInfo.getDesignDoc()));
                 designInfoMap.put("designStandard", JSON.parseArray(designInfo.getDesignStandard()));
             } else {
-                String[] fields = {"DESIGN_DOC", "DESIGN_STANDARD"};
+                String[] fields = {"DESIGN_DOC", "DESIGN_STANDARD","OTHER_ACCESSORIES_DES"};
                 designInfoMap = convertCamelToUnderscore(designInfo, fields);
                 designInfoMap.put("DESIGNINFO_SEQ", designInfo.getSequenceNbr());
             }
@@ -503,7 +503,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 factoryInfoMap.put("productQualityYieldProve", JSON.parseArray(factoryInfo.getProductQualityYieldProve()));
                 factoryInfoMap.put("insUseMaintainExplain", JSON.parseArray(factoryInfo.getInsUseMaintainExplain()));
             } else {
-                String[] fields = {"FACTORY_STANDARD", "PRODUCT_QUALITY_YIELD_PROVE", "INS_USE_MAINTAIN_EXPLAIN"};
+                String[] fields = {"FACTORY_STANDARD", "PRODUCT_QUALITY_YIELD_PROVE", "INS_USE_MAINTAIN_EXPLAIN","OTHER_ACCESSORIES_FACT"};
                 factoryInfoMap = convertCamelToUnderscore(factoryInfo, fields);
                 String imported = factoryInfo.getImported();
                 if ("0".equals(imported)) {
@@ -560,7 +560,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     registerInfoMap.put("equDefineDesc", categoryList2.get(0).getName());
                 }
             } else {
-                String[] fields = {"PRODUCT_PHOTO"};
+                String[] fields = {"PRODUCT_PHOTO","OTHER_ACCESSORIES_REG"};
                 registerInfoMap = convertCamelToUnderscore(registerInfo, fields);
                 registerInfoMap.put("REGISTERINFO_SEQ", registerInfo.getSequenceNbr());
                 registerInfoMap.put("SEQUENCE_NBR", registerInfo.getSequenceNbr());

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

@@ -689,6 +689,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
         BeanUtil.copyProperties(jgChangeRegistrationName, dtoMap);
         dtoMap.put("changeCertificate", JSON.parseArray(jgChangeRegistrationName.getChangeCertificate()));
+        dtoMap.put("otherAccessories", JSON.parseArray(jgChangeRegistrationName.getOtherAccessories()));
         map.put("jgRegistrationInfo", dtoMap);
         return map;
     }

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

@@ -462,6 +462,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
             detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
         }
+        if (!ObjectUtils.isEmpty(detail.get("otherAccessories"))) {
+            detail.put("otherAccessories", JSONObject.parse(detail.get("otherAccessories").toString()));
+        }
         detail.remove("submit");
         detail.remove("instanceId");
         return detail;

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

@@ -165,7 +165,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         changeInfo.put("changeCertificateList", notice.getChangeCertificate());
 
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
-                "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
+                "productQualityYieldProve", "insUseMaintainExplain", "inspectReport", "otherAccessories",
                 "proxyStatementAttachment", "installContractAttachment", "changeCertificateList"};
 
         // 设备信息

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

@@ -196,7 +196,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
-                "proxyStatementAttachment", "installContractAttachment"};
+                "proxyStatementAttachment", "installContractAttachment","otherAccessories"};
         // 设备信息
         List<Map<String, Object>> equipmentInfos = jgInstallationNoticeMapper.queryEquipInformation(sequenceNbr);
         for (String s:fields) {

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

@@ -144,6 +144,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         JgMaintenanceContractVo vo = new JgMaintenanceContractVo();
         BeanUtils.copyProperties(dto, vo);
         vo.setMaintenanceContract(ObjectUtils.isEmpty(dto.getMaintenanceContract()) ? null : JSON.parseArray(dto.getMaintenanceContract()));
+        vo.setOtherAccessories(ObjectUtils.isEmpty(dto.getOtherAccessories()) ? null : JSON.parseArray(dto.getOtherAccessories()));
         List<Map<String, Object>> list = maintenanceContractMapper.selectEquipList(sequenceNbr);
         if (!ObjectUtils.isEmpty(list)) {
             vo.setEquipmentLists(list);

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

@@ -126,7 +126,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         }
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
-                "proxyStatementAttachment", "installContractAttachment"};
+                "proxyStatementAttachment", "installContractAttachment","otherAccessories"};
         // 设备信息
         List<Map<String, Object>> equipmentInfos = jgReformNoticeMapper.queryEquipInformation(sequenceNbr);
         Map<String, Object> equipMap = null;

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

@@ -521,6 +521,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         Map<String, Object> installationInfo = BeanUtil.beanToMap(notice);
         installationInfo.put("receiveOrgCode", notice.getReceiveCompanyCode() + "_" + notice.getReceiveOrgName());
         installationInfo.put("cancelCertificateList", JSON.parseArray(String.valueOf(installationInfo.get("cancelCertificate"))));
+        installationInfo.put("otherAccessories", JSON.parseArray(String.valueOf(installationInfo.get("otherAccessories"))));
         LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
         lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, sequenceNbr);
         JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);

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

@@ -130,7 +130,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             transferNotice.put("constructionManagerId", notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
         }
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
-                "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
+                "productQualityYieldProve", "insUseMaintainExplain", "inspectReport","otherAccessories",
                 "proxyStatementAttachment", "installContractAttachment", "powerOfAttorney", "constructionContract"};
         // 设备信息
         List<Map<String, Object>> equipmentInfos = jgTransferNoticeMapper.queryEquipInformation(sequenceNbr);