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/dto/JgInstallationNoticeDto.java

@@ -280,4 +280,7 @@ public class JgInstallationNoticeDto extends BaseDto {
 
     @ApiModelProperty (value = "其他附件")
     private String otherAccessories;
+
+    @ApiModelProperty (value = "其他附件")
+    private List<Map<String, Object>> otherAccessoriesList;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -91,6 +91,7 @@
             isn.install_leader_phone AS installLeaderPhone,
             isn.use_unit_name AS useUnitName,
             isn.inform_number AS informNumber,
+            isn.other_accessories AS otherAccessories,
             tec2.name                       AS equCategory,
             tec1.name                       AS equList,
             tec.name                        AS equDefine,

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

@@ -12,12 +12,10 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
@@ -220,6 +218,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         equInfo.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
         equInfo.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
         equInfo.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
+        equInfo.put("otherAccessoriesList", JSON.parse(String.valueOf(detail.get("otherAccessories"))));
         BeanUtil.copyProperties(equInfo, detail);
         BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum", "equRegisterCode");
         detail.put("companyLevel", companyLevel);
@@ -682,6 +681,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         if(!ValidationUtil.isEmpty(model.getInstallContractAttachmentList())) {
             model.setInstallContractAttachment(JSON.toJSONString(model.getInstallContractAttachmentList()));
         }
+        if(!ValidationUtil.isEmpty(model.getOtherAccessoriesList())) {
+            model.setOtherAccessories(JSON.toJSONString(model.getOtherAccessoriesList()));
+        }
 
         // 分割省市区字段
         String province = model.getProvince();