update 修复运单bug

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

@@ -37,6 +37,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
@@ -385,16 +386,18 @@ public class KwTransportService {
             vo.setSendCarTime(waybillOrder.getCreateTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getCreateTime()));
             vo.setStartTime(waybillOrder.getStartTime() == null ?
-                    null : DateUtil.getDateTime(waybillOrder.getStartTime()));
+                    null : waybillOrder.getStartTime());
             vo.setEndTime(waybillOrder.getEndTime() == null ?
-                    null : DateUtil.getDateTime(waybillOrder.getEndTime()));
+                    null : waybillOrder.getEndTime());
             vo.setEntrustAmount(String.valueOf(waybillOrder.getEntrustAmount()));
             vo.setLoadName(waybillOrder.getLoadName() == null ?
                     null : waybillOrder.getLoadName());
-            vo.setLoadAddress(waybillOrder.getLoadCityName().concat(waybillOrder.getLoadDetailAddress()));
+            vo.setLoadAddress((waybillOrder.getLoadCityName() == null ? "" : waybillOrder.getLoadCityName())
+                    .concat(waybillOrder.getLoadDetailAddress() == null ? "" : waybillOrder.getLoadDetailAddress()));
             vo.setUnloadName(waybillOrder.getUnloadName() == null ?
                     null : waybillOrder.getUnloadName());
-            vo.setUnloadAddress(waybillOrder.getUnloadCityName().concat(waybillOrder.getUnloadDetailAddress()));
+            vo.setUnloadAddress((waybillOrder.getUnloadCityName() == null ? "" : waybillOrder.getUnloadCityName())
+                    .concat(waybillOrder.getUnloadDetailAddress() == null ? "" : waybillOrder.getUnloadDetailAddress()));
             vo.setLoadAmount(waybillOrder.getLoadAmount() == null ?
                     null : String.valueOf(waybillOrder.getLoadAmount()));
             vo.setUnloadAmount(waybillOrder.getUnloadAmount() == null ?
@@ -409,6 +412,13 @@ public class KwTransportService {
                     null : DateUtil.getDateTime(waybillOrder.getUpdateTime()));
             vo.setDeficitAmount(waybillOrder.getDeficitAmount() == null ?
                     null : String.valueOf(waybillOrder.getDeficitAmount()));
+            BigDecimal deficitLoss = waybillOrder.getLoss() == null ? BigDecimal.valueOf(0) : waybillOrder.getLoss();
+            BigDecimal deficitAmount = waybillOrder.getDeficitAmount() == null ? BigDecimal.valueOf(0) : waybillOrder.getDeficitAmount();
+            BigDecimal deficitRealAmount = BigDecimal.valueOf(0);
+            if(deficitAmount.compareTo(BigDecimal.valueOf(0)) > 0) {
+                deficitRealAmount = deficitLoss.subtract(deficitAmount);
+            }
+            vo.setDeficitRealAmount(deficitRealAmount.toString());
             vo.setGoodsPriceUnit(waybillOrder.getGoodsPriceUnit() == null ?
                     null : String.valueOf(waybillOrder.getGoodsPriceUnit()));
             returnList.add(vo);
@@ -595,9 +605,11 @@ public class KwTransportService {
                     .setEndTime(e.getEndTime() == null ? null : DateUtil.getDateTime(e.getEndTime()))
                     .setEntrustAmount(String.valueOf(e.getEntrustAmount()))
                     .setLoadName(e.getLoadName())
-                    .setLoadAddress(e.getLoadCityName().concat(e.getLoadDetailAddress()))
+                    .setLoadAddress((e.getLoadCityName() == null ? "" : e.getLoadCityName())
+                            .concat(e.getLoadDetailAddress() == null ? "" : e.getLoadDetailAddress()))
                     .setUnloadName(e.getUnloadName())
-                    .setUnloadAddress(e.getLoadCityName().concat(e.getLoadDetailAddress()))
+                    .setUnloadAddress((e.getUnloadCityName() == null ? "" : e.getUnloadCityName())
+                            .concat(e.getUnloadDetailAddress() == null ? "" : e.getUnloadDetailAddress()))
                     .setLoadAmount(String.valueOf(e.getLoadAmount()))
                     .setUnloadAmount(String.valueOf(e.getUnloadAmount()))
                     .setDeficitAmount(String.valueOf(e.getDeficitAmount()))

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

@@ -1,11 +1,13 @@
 package com.sckw.report.service.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author lfdc
@@ -69,12 +71,14 @@ public class CarWaybillVo implements Serializable {
     /**
      * 计划开始时间
      */
-    private String startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startTime;
 
     /**
      * 计划结束时间
      */
-    private String endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endTime;
 
     /**
      * 派单量/吨
@@ -131,6 +135,11 @@ public class CarWaybillVo implements Serializable {
      */
     private String goodsPriceUnit;
 
+    /**
+     * 扣亏量(合理损耗-(实装-实卸))-单位
+     */
+    private String deficitRealAmount;
+
     /**
      * 创建时间
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillBoardListVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -51,6 +52,11 @@ public class WaybillBoardListVO {
      */
     private String loadDetailAddress;
 
+    /**
+     * 装货重量
+     */
+    private BigDecimal loadAmount;
+
     /**
      * 卸货地点名称
      */
@@ -61,6 +67,11 @@ public class WaybillBoardListVO {
      */
     private String unloadDetailAddress;
 
+    /**
+     * 卸货重量
+     */
+    private BigDecimal unloadAmount;
+
     /**
      * 开始时间
      */

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

@@ -306,8 +306,10 @@ public class WaybillManagementService {
             waybillBoardListVO.setType(String.valueOf(sckwWaybillOrder.getType()));
             waybillBoardListVO.setStatusLabel(CarWaybillEnum.getName(sckwWaybillOrder.getStatus()));
             waybillBoardListVO.setGoodsName(String.valueOf(sckwWaybillOrder.getGoodsName()));
+            waybillBoardListVO.setLoadAmount(sckwWaybillOrder.getLoadAmount());
             waybillBoardListVO.setLoadName(sckwWaybillOrder.getLoadName());
             waybillBoardListVO.setLoadDetailAddress(String.valueOf(sckwWaybillOrder.getLoadDetailAddress()));
+            waybillBoardListVO.setUnloadAmount(sckwWaybillOrder.getUnloadAmount());
             waybillBoardListVO.setUnloadName(sckwWaybillOrder.getUnloadName());
             waybillBoardListVO.setUnloadDetailAddress(String.valueOf(sckwWaybillOrder.getUnloadDetailAddress()));
             waybillBoardListVO.setStartTime(DateUtil.getDateTime(sckwWaybillOrder.getStartTime()));