承运订单-托运订单-列表新增展示字段

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwAcceptCarriageService.java

@@ -261,8 +261,10 @@ public class KwAcceptCarriageService {
             vo.setDeficitAmount(logisticsOrder.getDeficitAmount() == null ?
                     null : String.valueOf(logisticsOrder.getDeficitAmount()));
             vo.setGoodsName(logisticsOrder.getGoodsName());
-            vo.setLoadAddress(logisticsOrder.getLoadDetailAddress());
-            vo.setUnloadAddress(logisticsOrder.getUnloadDetailAddress());
+            vo.setLoadCityName(logisticsOrder.getLoadDetailAddress());
+            vo.setLoadAddress(logisticsOrder.getLoadCityName() + logisticsOrder.getLoadDetailAddress());
+            vo.setUnloadAddress(logisticsOrder.getUnloadCityName() + logisticsOrder.getUnloadDetailAddress());
+            vo.setUnloadCityName(logisticsOrder.getUnloadDetailAddress());
             vo.setLOrderId(String.valueOf(logisticsOrder.getLOrderId()));
             vo.setLOrderNo(logisticsOrder.getLOrderNo());
             vo.setLoss(logisticsOrder.getLoss() == null ?

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwConsignService.java

@@ -172,8 +172,12 @@ public class KwConsignService {
             vo.setDeficitAmount(logisticsOrder.getDeficitAmount() == null ?
                     null : String.valueOf(logisticsOrder.getDeficitAmount()));
             vo.setGoodsName(logisticsOrder.getGoodsName());
-            vo.setLoadAddress(logisticsOrder.getLoadDetailAddress());
-            vo.setUnloadAddress(logisticsOrder.getUnloadDetailAddress());
+//            vo.setLoadAddress(logisticsOrder.getLoadDetailAddress());
+//            vo.setUnloadAddress(logisticsOrder.getUnloadDetailAddress());
+            vo.setLoadCityName(logisticsOrder.getLoadDetailAddress());
+            vo.setLoadAddress(logisticsOrder.getLoadCityName() + logisticsOrder.getLoadDetailAddress());
+            vo.setUnloadAddress(logisticsOrder.getUnloadCityName() + logisticsOrder.getUnloadDetailAddress());
+            vo.setUnloadCityName(logisticsOrder.getUnloadDetailAddress());
             vo.setLOrderId(String.valueOf(logisticsOrder.getLOrderId()));
             vo.setLOrderNo(logisticsOrder.getLOrderNo());
             vo.setLoss(logisticsOrder.getLoss() == null ?
@@ -403,7 +407,7 @@ public class KwConsignService {
         packageReturnStatistics(mappedResults, arrayList);
         // 查询结果
         Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("tableTop",arrayList);
+        map.put("tableTop", arrayList);
         return HttpResult.ok(map);
     }
 
@@ -439,7 +443,7 @@ public class KwConsignService {
                 arrayList.add(top);
             }
         }
-        if (CollectionUtils.isNotEmpty(arrayList)){
+        if (CollectionUtils.isNotEmpty(arrayList)) {
             /**补全统计【全部字段】*/
             Integer sum = Math.toIntExact(arrayList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getTotal())).collect(Collectors.summarizingInt(item -> item.getTotal())).getSum());
             TableTops top = new TableTops();

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/AcceptCarriageOrderVo.java

@@ -70,6 +70,10 @@ public class AcceptCarriageOrderVo extends PageRequest {
      * 装货地点
      */
     private String loadAddress;
+    /**
+     * 装货区域名称
+     */
+    private String loadCityName;
     /**
      * 数据库id
      */
@@ -130,6 +134,10 @@ public class AcceptCarriageOrderVo extends PageRequest {
      * 卸货地点
      */
     private String unloadAddress;
+    /**
+     * 卸货区域名称
+     */
+    private String unloadCityName;
     /**
      * 关联承运订单号
      */

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/ConsignOrderVo.java

@@ -131,6 +131,14 @@ public class ConsignOrderVo implements Serializable {
      * 卸货地点
      */
     private String unloadAddress;
+    /**
+     * 卸货区域名称
+     */
+    private String unloadCityName;
+    /**
+     * 装货区域名称
+     */
+    private String loadCityName;
     /**
      * 关联承运订单号
      */