问题处理

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContract.java

@@ -85,17 +85,17 @@ public class SalesContract extends BasePo {
      */
     private Long sellCorporationId;
     /**
-     * 卖方国家表id
+     * 卖方国家名称
      */
-    private Long sellCountryId;
+    private String sellCountryName;
     /**
-     * 卖方省份id
+     * 卖方省名称
      */
-    private Long sellProvinceId;
+    private String sellProvinceName;
     /**
-     * 卖方城市id
+     * 卖方市名称
      */
-    private Long sellCityId;
+    private String sellCityName;
     /**
      * 卖方详细地址
      */

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractVo.java

@@ -83,17 +83,4 @@ public class SalesContractVo extends SalesContract {
      */
     private String sellAccountOpening;
 
-    /**
-     * 卖方国家名称
-     */
-    private String sellCountryName;
-    /**
-     * 卖方省名称
-     */
-    private String sellProvinceName;
-    /**
-     * 卖方市名称
-     */
-    private String sellCityName;
-
 }

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -113,11 +113,7 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
         Map<Long, String> areaMapByIds = CustomizeAreaUtil.getAreaMapByIds(Arrays.asList(
                 result.getBuyCountryId(),
                 result.getBuyProvinceId(),
-                result.getBuyCityId(),
-
-                result.getSellCountryId(),
-                result.getSellProvinceId(),
-                result.getSellCityId())
+                result.getBuyCityId())
         );
         result.setBuyCountryName(areaMapByIds.get(result.getBuyCountryId()));
         result.setBuyProvinceName(areaMapByIds.get(result.getBuyProvinceId()));
@@ -132,10 +128,6 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
         result.setSellOpeningBank(accountManagement.getOpeningBank());
         result.setSellSwiftCode(accountManagement.getSwiftCode());
         result.setSellAccountOpening(accountManagement.getAccountOpening());
-        //赋值卖方国省市名称
-        result.setSellCountryName(areaMapByIds.get(result.getSellCountryId()));
-        result.setSellProvinceName(areaMapByIds.get(result.getSellProvinceId()));
-        result.setSellCityName(areaMapByIds.get(result.getSellCityId()));
 
         return result;
     }