Merge branch 'develop_tzs_register_to_0715' 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/JgChangeRegistrationTransferServiceImpl.java

@@ -198,7 +198,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             //区内移装，需判断是否为同一地市，如果不是同一地市，返回异常 -> 610000#610200#610204#610204002
             if ("0".equals(tableData.get("transferType"))) {
                 deviceList.forEach(device -> {
-                    String deviceCity = Arrays.stream(((String) device.get("USE_SITE_CODE")).split("#"))
+                    String deviceCity = Arrays.stream(((String) device.get("USE_PLACE_CODE")).split("#"))
                             .skip(1)
                             .findFirst()
                             .orElseThrow(() -> new BadRequest("没有查询到地市信息"));
@@ -209,7 +209,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 });
             } else{
                 deviceList.forEach(device -> {
-                    String deviceCity = Arrays.stream(((String) device.get("USE_SITE_CODE")).split("#"))
+                    String deviceCity = Arrays.stream(((String) device.get("USE_PLACE_CODE")).split("#"))
                             .skip(1)
                             .findFirst()
                             .orElseThrow(() -> new BadRequest("没有查询到地市信息"));
@@ -1203,7 +1203,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         Map<String, Object> map1 = new HashMap<>();
         map1.put("USE_PLACE", newUsePlace);
         map1.put("ADDRESS", newAddress);
-        map1.put("USE_SITE_CODE", newUsePlaceCode);
+        map1.put("USE_PLACE_CODE", newUsePlaceCode);
         map1.put("LONGITUDE_LATITUDE", newLongitudeLatitude);
         if (isUpdateRegistrationCode.get()) {
             map1.put("EQU_STATE", "1");

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

@@ -1322,7 +1322,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         map1.put("USE_UNIT_CREDIT_CODE", jgInstallationNotice.getUseUnitCreditCode());
         map1.put("USE_UNIT_NAME", jgInstallationNotice.getUseUnitName());
         map1.put("IS_INTO_MANAGEMENT", true);
-        map1.put("USE_SITE_CODE", dto.getProvince().split("_")[0] + "#" + dto.getCity().split("_")[0] + "#" + dto.getCounty().split("_")[0] + "#" + dto.getFactoryUseSiteStreet().split("_")[0]);
+        map1.put("USE_PLACE_CODE", dto.getProvince().split("_")[0] + "#" + dto.getCity().split("_")[0] + "#" + dto.getCounty().split("_")[0] + "#" + dto.getFactoryUseSiteStreet().split("_")[0]);
         map1.put("USC_UNIT_CREDIT_CODE", jgInstallationNotice.getInstallUnitCreditCode());
         map1.put("USC_UNIT_NAME", jgInstallationNotice.getInstallUnitName());
         map1.put("USE_PLACE", String.format("%s/%s/%s/%s", jgInstallationNotice.getProvinceName(), jgInstallationNotice.getCityName(), jgInstallationNotice.getCountyName(), jgInstallationNotice.getStreetName()));