安装告知 产权单位组件替换

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

@@ -101,6 +101,9 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "产权单位")
     private String propertyUnitName;
 
+    @ApiModelProperty("产权单位统一信用代码")
+    private String propertyUnitCreditCode;
+
     @ApiModelProperty(value = "使用单位id")
     private String useUnitCreditCode;
 

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

@@ -192,6 +192,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             installationInfo.put("orgBranchCode", notice.getOrgBranchCode() + "_" + notice.getOrgBranchName());
         }
 
+        if(!ValidationUtil.isEmpty(notice.getPropertyUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getPropertyUnitName())) {
+            installationInfo.put("propertyUnitName", notice.getPropertyUnitCreditCode() + "_" + notice.getPropertyUnitName());
+        }
+
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment"};
@@ -692,6 +696,16 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
         }
 
+        String propertyUnitName = model.getPropertyUnitName();
+        if (!ObjectUtils.isEmpty(propertyUnitName)) {
+            String[] split = propertyUnitName.split("_");
+            if (split.length > 1) {
+                model.setPropertyUnitCreditCode(split[0]);
+                model.setPropertyUnitName(split[1]);
+            }
+        }
+
+
         String county = model.getCounty();
         if (!ObjectUtils.isEmpty(county)) {
             String[] countyList = county.split("_");