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

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/JgChangeRegistrationUnitServiceImpl.java

@@ -913,7 +913,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         model.setCreateUserName(reginParams.getUserModel().getRealName());
         model.setUseRegistCode(String.join(",", registrationNoList));
         model.setEquList(registrationList.get(0).get("equList").toString());
-        this.setFullAddress(tableData, model);
+        this.setEquAddress(tableData, model);
         JgChangeRegistrationUnit registrationUnit = new JgChangeRegistrationUnit();
         BeanUtils.copyProperties(model, registrationUnit);
         setNewUnitInfo(reginParams, registrationUnit);
@@ -996,15 +996,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         return Collections.singletonList(model);
     }
 
-    public void setFullAddress(Map<String, Object> tableData, JgChangeRegistrationUnitDto model) {
+    public void setEquAddress(Map<String, Object> tableData, JgChangeRegistrationUnitDto model) {
         tableData.put("region", tableData.get("county"));
-        String fullAddress = Stream.of("province", "city", "region", "street")
+        String address = Stream.of("province", "city", "region", "street")
                 .map(key -> getRegionName(key, tableData))
                 .filter(s -> !s.isEmpty())
                 .collect(Collectors.joining())
-                + Objects.toString(tableData.get("changeAddress"), "");
-        model.setFullAddress(fullAddress);
-        model.setAddress(Objects.toString(tableData.get("changeAddress"), ""));
+                + Objects.toString(tableData.get("fullAddress"), "");
+        model.setEquAddress(address);
+        model.setFullAddress(Objects.toString(tableData.get("fullAddress"), ""));
     }
 
     /**
@@ -1414,7 +1414,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 // 新证属性重置
                                 newManage.setCertificateStatus("已登记");
                                 newManage.setVersion(1);
-
+                                newManage.setEquUseAddress(registration.getEquAddress());
                                 // 如果 equListCode = 5000，则设置车牌号
                                 if (EQU_CODE_CC.equals(registrationManage.getEquListCode())) {
                                     String targetCode = registrationManage.getUseRegistrationCode();