运单看板数据兼容详细地址存在省市区展示

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -121,10 +121,16 @@ public class WaybillManagementService {
             wayBillDetailDTO.setEndTime(info.getEndTime());
             wayBillDetailDTO.setCreateBy(info.getCreateByName());
             wayBillDetailDTO.setGoodsName(info.getGoodsName());
-//            wayBillDetailDTO.setLoadDetailAddress(info.getLoadCityName().concat(info.getLoadDetailAddress()));
-//            wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadCityName().concat(info.getUnloadDetailAddress()));
-            wayBillDetailDTO.setLoadDetailAddress(info.getLoadDetailAddress());
-            wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadDetailAddress());
+            if (info.getLoadDetailAddress().contains(info.getLoadCityName())){
+                wayBillDetailDTO.setLoadDetailAddress(info.getLoadDetailAddress());
+            }else {
+                wayBillDetailDTO.setLoadDetailAddress(info.getLoadCityName().concat(info.getLoadDetailAddress()));
+            }
+            if (info.getUnloadDetailAddress().contains(info.getUnloadCityName())){
+                wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadDetailAddress());
+            }else {
+                wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadCityName().concat(info.getUnloadDetailAddress()));
+            }
             wayBillDetailDTO.setLoadName(info.getLoadName());
             wayBillDetailDTO.setUnloadName(info.getUnloadName());
             wayBillDetailDTO.setCarrierFirmName(info.getCarrierFirmName());