Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -59,6 +59,6 @@
     </select>
 
 <delete id="deleteHistoryInfoById">
-    delete from tzs_jg_change_registration_name_eq where current_document_id = #{code}
+    delete from tzs_jg_registration_history where current_document_id = #{code}
     </delete>
 </mapper>

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

@@ -213,25 +213,51 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      */
     private Map<String, Object> getStringObjectMap(String record, String fieldType) {
         Map<String, Object> objMap = new HashMap<>();
+        String province="";
+        String city="";
+        String county="";
+        String street="";
+        String fullAddress="";
         //使用信息
         IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(useInfo)) {
+
+            if(!ValidationUtil.isEmpty(useInfo.getProvince()) && !ValidationUtil.isEmpty(useInfo.getProvinceName())){
+                province = useInfo.getProvince()+"_"+useInfo.getProvinceName();
+                fullAddress += useInfo.getProvinceName();
+            }
+            if(!ValidationUtil.isEmpty(useInfo.getCity()) && !ValidationUtil.isEmpty(useInfo.getCityName())) {
+                city = useInfo.getCity() + "_" + useInfo.getCityName();
+                fullAddress += useInfo.getCityName();
+            }
+            if(!ValidationUtil.isEmpty(useInfo.getCounty()) && !ValidationUtil.isEmpty(useInfo.getCountyName())) {
+                county = useInfo.getCounty() + "_" + useInfo.getCountyName();
+                fullAddress += useInfo.getCountyName();
+            }
+            if(!ValidationUtil.isEmpty(useInfo.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(useInfo.getStreetName())) {
+                street = useInfo.getFactoryUseSiteStreet() + "_" + useInfo.getStreetName();
+                fullAddress += useInfo.getStreetName();
+            }
+            if(!ValidationUtil.isEmpty(useInfo.getAddress())) {
+                fullAddress += useInfo.getAddress();
+            }
+
             Map<String, Object> useInfoMap = null;
             if(!ValidationUtil.isEmpty(fieldType)){
                 useInfoMap = Bean.BeantoMap(useInfo);
-                useInfoMap.put("province", useInfo.getProvince()+"_"+useInfo.getProvinceName());
-                useInfoMap.put("city", useInfo.getCity()+"_"+useInfo.getCityName());
-                useInfoMap.put("county", useInfo.getCounty()+"_"+useInfo.getCountyName());
-                useInfoMap.put("street", useInfo.getFactoryUseSiteStreet()+"_"+useInfo.getStreetName());
-                useInfoMap.put("fullAddress",useInfo.getProvinceName()+useInfo.getCityName()+useInfo.getCountyName()+useInfo.getStreetName()+useInfo.getAddress());
+                if(!ValidationUtil.isEmpty(province)){ useInfoMap.put("province", province); }
+                if(!ValidationUtil.isEmpty(city)) { useInfoMap.put("city", city); }
+                if(!ValidationUtil.isEmpty(county)) { useInfoMap.put("county", county); }
+                if(!ValidationUtil.isEmpty(street)) { useInfoMap.put("street", street); }
+                if(!ValidationUtil.isEmpty(fullAddress)) { useInfoMap.put("fullAddress", fullAddress); }
                 useInfoMap.put("useinfoSeq", useInfo.getSequenceNbr());
             }else {
                 useInfoMap = convertCamelToUnderscore(useInfo, null);
-                useInfoMap.put("PROVINCE", useInfo.getProvince()+"_"+useInfo.getProvinceName());
-                useInfoMap.put("CITY", useInfo.getCity()+"_"+useInfo.getCityName());
-                useInfoMap.put("COUNTY", useInfo.getCounty()+"_"+useInfo.getCountyName());
-                useInfoMap.put("STREET", useInfo.getFactoryUseSiteStreet()+"_"+useInfo.getStreetName());
-                useInfoMap.put("FULLADDRESS",useInfo.getProvinceName()+useInfo.getCityName()+useInfo.getCountyName()+useInfo.getStreetName()+useInfo.getAddress());
+                if(!ValidationUtil.isEmpty(province)){ useInfoMap.put("PROVINCE", province); }
+                if(!ValidationUtil.isEmpty(city)) { useInfoMap.put("CITY", city); }
+                if(!ValidationUtil.isEmpty(county)) { useInfoMap.put("COUNTY", county); }
+                if(!ValidationUtil.isEmpty(street)) { useInfoMap.put("STREET", street); }
+                if(!ValidationUtil.isEmpty(fullAddress)){ useInfoMap.put("FULLADDRESS", fullAddress); }
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
             }
             if(!useInfoMap.isEmpty()){