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

@@ -777,18 +777,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetail(record);
         if (!ObjectUtils.isEmpty(installDetail)){
             businessList.add("安装告知");
+            objMap.putAll(installDetail);
             objMap.put("insOtherAccessories",JSON.parse(Optional.ofNullable(installDetail.get("insOtherAccessories")).orElse("").toString()));
             objMap.put("installProxyStatementAttachment",JSON.parse(Optional.ofNullable(installDetail.get("installProxyStatementAttachment")).orElse("").toString()));
             objMap.put("installContractAttachment",JSON.parse(Optional.ofNullable(installDetail.get("installContractAttachment")).orElse("").toString()));
-            objMap.putAll(installDetail);
         }
         // 维保备案
         Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetail(record);
         if (!ObjectUtils.isEmpty(maintenanceDetail)){
             businessList.add("维保备案");
+            objMap.putAll(maintenanceDetail);
             objMap.put("maintenanceContract",JSON.parse(Optional.ofNullable(installDetail.get("maintenanceContract")).orElse("").toString()));
             objMap.put("maintOtherAccessories",JSON.parse(Optional.ofNullable(installDetail.get("maintOtherAccessories")).orElse("").toString()));
-            objMap.putAll(maintenanceDetail);
         }
         // 使用登记
         Map<String, Object> useRegistrationDetail = jgUseRegistrationMapper.getUseRegistrationDetail(record);