update 更新运单列表字段等

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

@@ -169,7 +169,7 @@ public class KwTransportService {
         List<SckwWaybillOrder> list = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
         List<CarWaybillVo> returnList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
-            packageWayBillReturnList(list, returnList);
+            packageWayBillReturnList(list, returnList, query.getStatus());
         }
         PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, returnList);
         return HttpResult.ok(build);
@@ -192,14 +192,14 @@ public class KwTransportService {
 
         if (StringUtils.isNotBlank(query.getStatus())) {
             // TODO 此处需要修改
-            if (query.getStatus().equals(NumberConstant.ONE_ZERO_ZERO)) {
+            if (query.getStatus().equals(String.valueOf(NumberConstant.ONE_ZERO_ZERO))) {
                 List<Long> statuses = new ArrayList<>();
                 statuses.add(CarWaybillEnum.REJECT_ORDER.getCode().longValue());
                 statuses.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode().longValue());
                 statuses.add(CarWaybillEnum.REVOKED.getCode().longValue());
                 criteria.and("status").in(statuses);
-            } else {
-                criteria.and("status").is(query.getStatus());
+            } else if (!query.getStatus().equals("all")) {
+                criteria.and("status").is(Integer.valueOf(query.getStatus()));
             }
         }
         // 装载时间
@@ -355,15 +355,13 @@ public class KwTransportService {
      * @param list
      * @param returnList
      */
-    private void packageWayBillReturnList(List<SckwWaybillOrder> list, List<CarWaybillVo> returnList) {
+    private void packageWayBillReturnList(List<SckwWaybillOrder> list, List<CarWaybillVo> returnList, String status) {
         for (SckwWaybillOrder waybillOrder : list) {
             CarWaybillVo vo = new CarWaybillVo();
             vo.setWOrderNo(waybillOrder.getWOrderNo() == null ?
                     null : String.valueOf(waybillOrder.getWOrderNo()));
             vo.setWOrderId(waybillOrder.getWOrderId() == null ?
                     null : String.valueOf(waybillOrder.getWOrderId()));
-            vo.setFirmName(waybillOrder.getFirmName() == null ?
-                    null : String.valueOf(waybillOrder.getFirmName()));
             vo.setTruckNo(waybillOrder.getTruckNo());
             vo.setDriverName(waybillOrder.getDriverName() == null ?
                     null : String.valueOf(waybillOrder.getDriverName()));
@@ -375,6 +373,12 @@ public class KwTransportService {
                 typeString = "循环";
             }
             vo.setType(typeString);
+            if(status.equals(String.valueOf(NumberConstant.ONE_ZERO_ZERO))) {
+                vo.setStatus(String.valueOf(NumberConstant.ONE_ZERO_ZERO));
+            } else {
+                vo.setStatus(waybillOrder.getStatus() == null ?
+                        null : String.valueOf(waybillOrder.getStatus()));
+            }
             vo.setSendCarTime(waybillOrder.getCreateTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getCreateTime()));
             vo.setStartTime(waybillOrder.getStartTime() == null ?
@@ -382,15 +386,19 @@ public class KwTransportService {
             vo.setEndTime(waybillOrder.getEndTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getEndTime()));
             vo.setEntrustAmount(String.valueOf(waybillOrder.getEntrustAmount()));
-            vo.setLoadingAddress(waybillOrder.getLoadCityName().concat(waybillOrder.getLoadDetailAddress()));
-            vo.setUnloadingAddress(waybillOrder.getUnloadCityName().concat(waybillOrder.getUnloadDetailAddress()));
+            vo.setLoadName(waybillOrder.getLoadName() == null ?
+                    null : waybillOrder.getLoadName());
+            vo.setLoadAddress(waybillOrder.getLoadCityName().concat(waybillOrder.getLoadDetailAddress()));
+            vo.setUnloadName(waybillOrder.getUnloadName() == null ?
+                    null : waybillOrder.getUnloadName());
+            vo.setUnloadAddress(waybillOrder.getUnloadCityName().concat(waybillOrder.getUnloadDetailAddress()));
             vo.setLoadAmount(waybillOrder.getLoadAmount() == null ?
                     null : String.valueOf(waybillOrder.getLoadAmount()));
             vo.setUnloadAmount(waybillOrder.getUnloadAmount() == null ?
                     null : String.valueOf(waybillOrder.getUnloadAmount()));
-            vo.setLoadTime(waybillOrder.getLoadTime() == null ?
+            vo.setLoadDateTime(waybillOrder.getLoadTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getLoadTime()));
-            vo.setUnloadTime(waybillOrder.getUnloadTime() == null ?
+            vo.setUnloadDateTime(waybillOrder.getUnloadTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getUnloadTime()));
             vo.setCreateTime(waybillOrder.getCreateTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getCreateTime()));

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/WaybillOrderQuery.java

@@ -1,7 +1,9 @@
 package com.sckw.report.service.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.page.PageRequest;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -83,5 +85,7 @@ public class WaybillOrderQuery extends PageRequest implements Serializable {
     /**
      * 运单状态
      */
-    private Integer status;
+    @JsonProperty("status")
+    @NotNull(message = "订单状态不能为空")
+    private String status;
 }

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

@@ -1,9 +1,11 @@
 package com.sckw.report.service.vo;
 
-import com.sckw.core.model.page.PageResult;
+import com.fasterxml.jackson.annotation.JsonAlias;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -15,21 +17,20 @@ import java.io.Serializable;
 @Accessors(chain = true)
 public class CarWaybillVo implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 4526063761808958350L;
     /**
      * 物流订单id
      */
+    @JsonProperty(value="wOrderId")
     private String wOrderId;
 
     /**
      * 物流订单号
      */
+    @JsonProperty(value="wOrderNo")
     private String wOrderNo;
 
-    /**
-     * 承运车队
-     */
-    private String firmName;
-
     /**
      * 车辆牌照
      */
@@ -45,6 +46,11 @@ public class CarWaybillVo implements Serializable {
      */
     private String type;
 
+    /**
+     * 运单状态
+     */
+    private String  status;
+
     /**
      * 派车时间
      */
@@ -65,15 +71,25 @@ public class CarWaybillVo implements Serializable {
      */
     private String entrustAmount;
 
+    /**
+     * 装货地点名称
+     */
+    private String loadName;
+
     /**
      * 装货地点
      */
-    private String loadingAddress;
+    private String loadAddress;
+
+    /**
+     * 卸货地点点名称
+     */
+    private String unloadName;
 
     /**
      * 卸货地点
      */
-    private String unloadingAddress;
+    private String unloadAddress;
 
     /**
      * 实装量/吨
@@ -88,12 +104,12 @@ public class CarWaybillVo implements Serializable {
     /**
      * 装货时间
      */
-    private String loadTime;
+    private String loadDateTime;
 
     /**
      * 卸货时间
      */
-    private String unloadTime;
+    private String unloadDateTime;
 
     /**
      * 亏吨重量