mongodb增加格式处理

删除多余代码
承运合同-托运合同,排序

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

@@ -26,6 +26,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.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -254,14 +255,14 @@ public class KwAcceptCarriageService {
             vo.setCarrierOrder(logisticsOrder.getWOrderNo());
             vo.setCarrierPhone(logisticsOrder.getCarrierPhone());
             vo.setCarryingCapacity(logisticsOrder.getCarryingCapacity() == null ?
-                    null : String.valueOf(logisticsOrder.getCarryingCapacity()));
+                    null : BigDecimal.valueOf(logisticsOrder.getCarryingCapacity()));
             vo.setConsignCompanyId(String.valueOf(logisticsOrder.getCheckEntId()));
             vo.setConsignCompany(logisticsOrder.getCheckFirmName());
             vo.setConsignContacts(logisticsOrder.getCheckContacts());
             vo.setConsignPhone(logisticsOrder.getCheckPhone());
             vo.setContract(logisticsOrder.getContractName());
             vo.setDeficitAmount(logisticsOrder.getDeficitAmount() == null ?
-                    null : String.valueOf(logisticsOrder.getDeficitAmount()));
+                    null : logisticsOrder.getDeficitAmount());
             vo.setGoodsName(logisticsOrder.getGoodsName());
             vo.setLoadCityName(logisticsOrder.getLoadDetailAddress());
             vo.setLoadAddress(logisticsOrder.getLoadCityName() + logisticsOrder.getLoadDetailAddress());
@@ -270,9 +271,9 @@ public class KwAcceptCarriageService {
             vo.setLOrderId(String.valueOf(logisticsOrder.getLOrderId()));
             vo.setLOrderNo(logisticsOrder.getLOrderNo());
             vo.setLoss(logisticsOrder.getLoss() == null ?
-                    null : String.valueOf(logisticsOrder.getLoss()));
+                    null : logisticsOrder.getLoss());
             vo.setPrice(logisticsOrder.getPrice() == null ?
-                    null : String.valueOf(logisticsOrder.getPrice()));
+                    null : logisticsOrder.getPrice());
             vo.setReceiveGoodsContacts(logisticsOrder.getUnloadContacts());
             vo.setReceiveGoodsPhone(logisticsOrder.getUnloadPhone());
             vo.setRemark(logisticsOrder.getRemark());

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

@@ -26,6 +26,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.HashMap;
@@ -164,16 +165,14 @@ public class KwConsignService {
             vo.setCarrierOrder(logisticsOrder.getWOrderNo());
             vo.setCarrierPhone(logisticsOrder.getCarrierPhone());
             vo.setCarryingCapacity(logisticsOrder.getCarryingCapacity() == null ?
-                    null : String.valueOf(logisticsOrder.getCarryingCapacity()));
+                    null : BigDecimal.valueOf(logisticsOrder.getCarryingCapacity()));
             vo.setConsignCompany(logisticsOrder.getCheckFirmName());
             vo.setConsignContacts(logisticsOrder.getCheckContacts());
             vo.setConsignPhone(logisticsOrder.getCheckPhone());
             vo.setContract(logisticsOrder.getContractName());
             vo.setDeficitAmount(logisticsOrder.getDeficitAmount() == null ?
-                    null : String.valueOf(logisticsOrder.getDeficitAmount()));
+                    null : 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());
@@ -181,9 +180,9 @@ public class KwConsignService {
             vo.setLOrderId(String.valueOf(logisticsOrder.getLOrderId()));
             vo.setLOrderNo(logisticsOrder.getLOrderNo());
             vo.setLoss(logisticsOrder.getLoss() == null ?
-                    null : String.valueOf(logisticsOrder.getLoss()));
+                    null : logisticsOrder.getLoss());
             vo.setPrice(logisticsOrder.getPrice() == null ?
-                    null : String.valueOf(logisticsOrder.getPrice()));
+                    null : logisticsOrder.getPrice());
             vo.setReceiveGoodsContacts(logisticsOrder.getUnloadContacts());
             vo.setReceiveGoodsPhone(logisticsOrder.getUnloadPhone());
             vo.setRemark(logisticsOrder.getRemark());

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

@@ -1,7 +1,6 @@
 package com.sckw.report.service;
 
 import com.sckw.core.common.enums.NumberConstant;
-import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
@@ -17,7 +16,10 @@ import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TableTops;
 import com.sckw.report.dao.SckwLogisticsOrderRepository;
-import com.sckw.report.service.param.*;
+import com.sckw.report.service.param.ContractParam;
+import com.sckw.report.service.param.WaybillOrderListExport;
+import com.sckw.report.service.param.WaybillOrderListSelect;
+import com.sckw.report.service.param.WaybillOrderQuery;
 import com.sckw.report.service.vo.CarWaybillVo;
 import com.sckw.report.service.vo.WaybillsCountVo;
 import com.sckw.system.api.RemoteSystemService;
@@ -538,7 +540,6 @@ public class KwTransportService {
         for (List<SckwLogisticsOrder> value : collect.values()) {
             returnList.addAll(value);
         }
-//        PageResult build = PageResult.build(page, pageSize, total, list);
         PageResult build = PageResult.build(page, pageSize, total, returnList);
         return HttpResult.ok(build);
     }

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

@@ -3,6 +3,8 @@ package com.sckw.report.service.vo;
 import com.sckw.core.model.page.PageRequest;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author lfdc
  * @description 承运订单VO
@@ -46,7 +48,7 @@ public class AcceptCarriageOrderVo extends PageRequest {
     /**
      * 分配承运量
      */
-    private String carryingCapacity;
+    private BigDecimal carryingCapacity;
 
     /**
      * 托运单位id
@@ -71,7 +73,7 @@ public class AcceptCarriageOrderVo extends PageRequest {
     /**
      * 扣亏货值/元/吨
      */
-    private String deficitAmount;
+    private BigDecimal deficitAmount;
     /**
      * 货物名称
      */
@@ -95,7 +97,7 @@ public class AcceptCarriageOrderVo extends PageRequest {
     /**
      * 合理损耗
      */
-    private String loss;
+    private BigDecimal loss;
     /**
      * 计划时间
      */
@@ -103,7 +105,7 @@ public class AcceptCarriageOrderVo extends PageRequest {
     /**
      * 运价
      */
-    private String price;
+    private BigDecimal price;
     /**
      * 收货联系人
      */

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

@@ -3,6 +3,7 @@ package com.sckw.report.service.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author lfdc
@@ -42,7 +43,7 @@ public class ConsignOrderVo implements Serializable {
     /**
      * 分配承运量
      */
-    private String carryingCapacity;
+    private BigDecimal carryingCapacity;
     /**
      * 托运单位
      */
@@ -62,7 +63,7 @@ public class ConsignOrderVo implements Serializable {
     /**
      * 扣亏货值/元/吨
      */
-    private String deficitAmount;
+    private BigDecimal deficitAmount;
     /**
      * 货物名称
      */
@@ -82,7 +83,7 @@ public class ConsignOrderVo implements Serializable {
     /**
      * 合理损耗
      */
-    private String loss;
+    private BigDecimal loss;
     /**
      * 计划时间
      */
@@ -90,7 +91,7 @@ public class ConsignOrderVo implements Serializable {
     /**
      * 运价
      */
-    private String price;
+    private BigDecimal price;
     /**
      * 收货联系人
      */