采购/样品单 打印地址信息更换

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -1206,6 +1206,18 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         contractPdfInfoVo.setSellContactName(contract.getSellContactName());
         contractPdfInfoVo.setSellContactNumber(contract.getSellContactNumber());
 
+        //赋值地址中文信息
+        List<Long> areaIdList = Arrays.asList(
+                corporation.getCountryId(),
+                corporation.getProvinceId(),
+                corporation.getCityId()
+        );
+        Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
+        contractPdfInfoVo.setSellCountryName(areaMap.get(corporation.getCountryId()));
+        contractPdfInfoVo.setSellProvinceName(areaMap.get(corporation.getProvinceId()));
+        contractPdfInfoVo.setSellCityName(areaMap.get(corporation.getCityId()));
+        contractPdfInfoVo.setSellDetailedAddress(corporation.getAddress());
+
         //赋值英文名地址信息
         contractPdfInfoVo.setSellCountryNameEn(corporation.getCountryEnStr());
         contractPdfInfoVo.setSellProvinceNameEn(corporation.getProvinceEnStr());
@@ -1240,10 +1252,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
         Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
 
-        contractPdfInfoVo.setSellCountryName(contract.getSellCountryName());
-        contractPdfInfoVo.setSellProvinceName(contract.getSellProvinceName());
-        contractPdfInfoVo.setSellCityName(contract.getSellCityName());
-        contractPdfInfoVo.setSellDetailedAddress(contract.getSellAddress());
+//        contractPdfInfoVo.setSellCountryName(contract.getSellCountryName());
+//        contractPdfInfoVo.setSellProvinceName(contract.getSellProvinceName());
+//        contractPdfInfoVo.setSellCityName(contract.getSellCityName());
+//        contractPdfInfoVo.setSellDetailedAddress(contract.getSellAddress());
 
         contractPdfInfoVo.setBuyCountryName(areaMap.get(contract.getBuyCountryId()));
         contractPdfInfoVo.setBuyProvinceName(areaMap.get(contract.getBuyProvinceId()));

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -377,6 +377,19 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         contractPdfInfoVo.setSellContactName(sample.getSellContactName());
         contractPdfInfoVo.setSellContactNumber(sample.getSellContactNumber());
 
+
+        //赋值地址中文信息
+        List<Long> areaIdList = Arrays.asList(
+                corporation.getCountryId(),
+                corporation.getProvinceId(),
+                corporation.getCityId()
+        );
+
+        Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
+        contractPdfInfoVo.setSellCountryName(areaMap.get(corporation.getCountryId()));
+        contractPdfInfoVo.setSellProvinceName(areaMap.get(corporation.getProvinceId()));
+        contractPdfInfoVo.setSellCityName(areaMap.get(corporation.getCityId()));
+        contractPdfInfoVo.setSellDetailedAddress(corporation.getAddress());
         //赋值英文名地址信息
         contractPdfInfoVo.setSellCountryNameEn(corporation.getCountryEnStr());
         contractPdfInfoVo.setSellProvinceNameEn(corporation.getProvinceEnStr());
@@ -412,10 +425,10 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
 
 
-        contractPdfInfoVo.setSellCountryName(sample.getSellCountryName());
-        contractPdfInfoVo.setSellProvinceName(sample.getSellProvinceName());
-        contractPdfInfoVo.setSellCityName(sample.getSellCityName());
-        contractPdfInfoVo.setSellDetailedAddress(sample.getSellAddress());
+//        contractPdfInfoVo.setSellCountryName(sample.getSellCountryName());
+//        contractPdfInfoVo.setSellProvinceName(sample.getSellProvinceName());
+//        contractPdfInfoVo.setSellCityName(sample.getSellCityName());
+//        contractPdfInfoVo.setSellDetailedAddress(sample.getSellAddress());
 
         contractPdfInfoVo.setBuyCountryName(areaMap.get(sample.getBuyCountryId()));
         contractPdfInfoVo.setBuyProvinceName(areaMap.get(sample.getBuyProvinceId()));