根据原型修改日期/时间格式传递

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwLogisticsOrder.java

@@ -10,6 +10,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -446,13 +447,15 @@ public class SckwLogisticsOrder {
     /**
      * 计划开始时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startTime;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate startTime;
     /**
      * 计划结束时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate endTime;
 }

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

@@ -96,17 +96,36 @@ public class KwAcceptCarriageService {
             criteria.and("unloadDetailAddress").is(query.getUnloadAddress());
         }
         if (StringUtils.isNotBlank(query.getStatus())) {
-            criteria.and("status").is(query.getStatus());
+            if (String.valueOf(NumberConstant.EIGHT).equals(query.getStatus())){
+                List<String> status=new ArrayList<>();
+                status.add(LogisticsOrderEnum.REJECT_ORDER.getStatus());
+                status.add(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
+                criteria.and("status").in(status);
+            }else {
+                criteria.and("status").is(query.getStatus());
+            }
         }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         // 4. 日期范围
-        if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
-            criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")
+//        if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
+//            criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")
+//                    .lte(query.getEndDateTime()));
+//        } else if (StringUtils.isNotEmpty(query.getStartDateTime())) {
+//            criteria.and("createTime").gte(query.getStartDateTime());
+//        } else if (StringUtils.isNotEmpty(query.getEndDateTime())) {
+//            criteria.and("createTime").lte(query.getStartDateTime());
+//        }
+        if (StringUtils.isNotEmpty(query.getStartDateTime())) {
+            criteria.andOperator(Criteria.where("startTime").gte(query.getStartDateTime()), Criteria.where("startTime")
+                    .lte(query.getStartDateTime()));
+        }
+        if (StringUtils.isNotEmpty(query.getEndDateTime())) {
+            criteria.andOperator(Criteria.where("endTime").gte(query.getEndDateTime()), Criteria.where("endTime")
                     .lte(query.getEndDateTime()));
-        } else if (StringUtils.isNotEmpty(query.getStartDateTime())) {
-            criteria.and("createTime").gte(query.getStartDateTime());
-        } else if (StringUtils.isNotEmpty(query.getEndDateTime())) {
-            criteria.and("createTime").lte(query.getStartDateTime());
+        }
+        if (StringUtils.isNotEmpty(query.getCreateTime())) {
+            criteria.andOperator(Criteria.where("createTime").gte(query.getCreateTime()), Criteria.where("createTime")
+                    .lte(query.getCreateTime()));
         }
         //多条件模糊查询
         Criteria c1 = new Criteria();
@@ -191,13 +210,25 @@ public class KwAcceptCarriageService {
         }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         // 4. 日期范围
-        if (StringUtils.isNotEmpty(param.getStartDateTime()) && StringUtils.isNotEmpty(param.getEndDateTime())) {
-            criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
+//        if (StringUtils.isNotEmpty(param.getStartDateTime()) && StringUtils.isNotEmpty(param.getEndDateTime())) {
+//            criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
+//                    .lte(param.getEndDateTime()));
+//        } else if (StringUtils.isNotEmpty(param.getStartDateTime())) {
+//            criteria.and("createTime").gte(param.getStartDateTime());
+//        } else if (StringUtils.isNotEmpty(param.getEndDateTime())) {
+//            criteria.and("createTime").lte(param.getStartDateTime());
+//        }
+        if (StringUtils.isNotEmpty(param.getStartDateTime())) {
+            criteria.andOperator(Criteria.where("startTime").gte(param.getStartDateTime()), Criteria.where("startTime")
+                    .lte(param.getStartDateTime()));
+        }
+        if (StringUtils.isNotEmpty(param.getEndDateTime())) {
+            criteria.andOperator(Criteria.where("endTime").gte(param.getEndDateTime()), Criteria.where("endTime")
                     .lte(param.getEndDateTime()));
-        } else if (StringUtils.isNotEmpty(param.getStartDateTime())) {
-            criteria.and("createTime").gte(param.getStartDateTime());
-        } else if (StringUtils.isNotEmpty(param.getEndDateTime())) {
-            criteria.and("createTime").lte(param.getStartDateTime());
+        }
+        if (StringUtils.isNotEmpty(param.getCreateTime())) {
+            criteria.andOperator(Criteria.where("createTime").gte(param.getCreateTime()), Criteria.where("createTime")
+                    .lte(param.getCreateTime()));
         }
         List<String> stringList = StringUtils.splitStrToList(param.getIds(), StringConstant.COMMA, String.class);
         if (CollectionUtils.isNotEmpty(stringList)) {
@@ -279,9 +310,9 @@ public class KwAcceptCarriageService {
             vo.setShipmentsContacts(logisticsOrder.getLoadContacts());
             vo.setShipmentsPhone(logisticsOrder.getLoadPhone());
             vo.setShipmentsDateTime(logisticsOrder.getStartTime() == null ?
-                    null : DateUtil.getDateTime(logisticsOrder.getStartTime()));
+                    null : logisticsOrder.getStartTime());
             vo.setReceiveGoodsDateTime(logisticsOrder.getEndTime() == null ?
-                    null : DateUtil.getDateTime(logisticsOrder.getEndTime()));
+                    null : logisticsOrder.getEndTime());
             vo.setShipmentsPhone(logisticsOrder.getLoadPhone());
             vo.setSigning(logisticsOrder.getContractSigningWay());
             vo.setStatus(logisticsOrder.getStatus());

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

@@ -101,13 +101,25 @@ public class KwConsignService {
         }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         // 4. 日期范围
-        if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
-            criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")
+//        if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
+//            criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")
+//                    .lte(query.getEndDateTime()));
+//        } else if (StringUtils.isNotEmpty(query.getStartDateTime())) {
+//            criteria.and("createTime").gte(query.getStartDateTime());
+//        } else if (StringUtils.isNotEmpty(query.getEndDateTime())) {
+//            criteria.and("createTime").lte(query.getStartDateTime());
+//        }
+        if (StringUtils.isNotEmpty(query.getStartDateTime())) {
+            criteria.andOperator(Criteria.where("startTime").gte(query.getStartDateTime()), Criteria.where("startTime")
+                    .lte(query.getStartDateTime()));
+        }
+        if (StringUtils.isNotEmpty(query.getEndDateTime())) {
+            criteria.andOperator(Criteria.where("endTime").gte(query.getEndDateTime()), Criteria.where("endTime")
                     .lte(query.getEndDateTime()));
-        } else if (StringUtils.isNotEmpty(query.getStartDateTime())) {
-            criteria.and("createTime").gte(query.getStartDateTime());
-        } else if (StringUtils.isNotEmpty(query.getEndDateTime())) {
-            criteria.and("createTime").lte(query.getStartDateTime());
+        }
+        if (StringUtils.isNotEmpty(query.getCreateTime())) {
+            criteria.andOperator(Criteria.where("createTime").gte(query.getCreateTime()), Criteria.where("createTime")
+                    .lte(query.getCreateTime()));
         }
         //多条件模糊查询
         Criteria c1 = new Criteria();
@@ -365,13 +377,25 @@ public class KwConsignService {
         }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         // 4. 日期范围
-        if (StringUtils.isNotEmpty(param.getStartDateTime()) && StringUtils.isNotEmpty(param.getEndDateTime())) {
-            criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
+//        if (StringUtils.isNotEmpty(param.getStartDateTime()) && StringUtils.isNotEmpty(param.getEndDateTime())) {
+//            criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
+//                    .lte(param.getEndDateTime()));
+//        } else if (StringUtils.isNotEmpty(param.getStartDateTime())) {
+//            criteria.and("createTime").gte(param.getStartDateTime());
+//        } else if (StringUtils.isNotEmpty(param.getEndDateTime())) {
+//            criteria.and("createTime").lte(param.getStartDateTime());
+//        }
+        if (StringUtils.isNotEmpty(param.getStartDateTime())) {
+            criteria.andOperator(Criteria.where("startTime").gte(param.getStartDateTime()), Criteria.where("startTime")
+                    .lte(param.getStartDateTime()));
+        }
+        if (StringUtils.isNotEmpty(param.getEndDateTime())) {
+            criteria.andOperator(Criteria.where("endTime").gte(param.getEndDateTime()), Criteria.where("endTime")
                     .lte(param.getEndDateTime()));
-        } else if (StringUtils.isNotEmpty(param.getStartDateTime())) {
-            criteria.and("createTime").gte(param.getStartDateTime());
-        } else if (StringUtils.isNotEmpty(param.getEndDateTime())) {
-            criteria.and("createTime").lte(param.getStartDateTime());
+        }
+        if (StringUtils.isNotEmpty(param.getCreateTime())) {
+            criteria.andOperator(Criteria.where("createTime").gte(param.getCreateTime()), Criteria.where("createTime")
+                    .lte(param.getCreateTime()));
         }
         List<String> stringList = StringUtils.splitStrToList(param.getIds(), StringConstant.COMMA, String.class);
         if (CollectionUtils.isNotEmpty(stringList)) {

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

@@ -22,7 +22,7 @@ public class AcceptCarriageOrderQuery extends PageRequest implements Serializabl
      */
     private String billingMode;
     /**
-     * 结束时间
+     * 计划结束时间
      */
     private String endDateTime;
     /**
@@ -42,9 +42,15 @@ public class AcceptCarriageOrderQuery extends PageRequest implements Serializabl
      */
     private Integer loadAddressLevel;
     /**
-     * 开始时间
+     * 计划开始时间
      */
     private String startDateTime;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
     /**
      * 单据状态
      */

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

@@ -26,6 +26,12 @@ public class ConsignOrderQuery extends PageRequest implements Serializable {
      * 结束时间
      */
     private String endDateTime;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
     /**
      * 关键字搜索
      */

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

@@ -1,9 +1,11 @@
 package com.sckw.report.service.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.page.PageRequest;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 /**
  * @author lfdc
@@ -113,7 +115,8 @@ public class AcceptCarriageOrderVo extends PageRequest {
     /**
      * 计划收货时间
      */
-    private String receiveGoodsDateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate receiveGoodsDateTime;
     /**
      * 收货电话
      */
@@ -129,7 +132,8 @@ public class AcceptCarriageOrderVo extends PageRequest {
     /**
      * 计划发货时间
      */
-    private String shipmentsDateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate shipmentsDateTime;
     /**
      * 发货电话
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddOrderDTO.java

@@ -71,7 +71,7 @@ public class AddOrderDTO {
     /**
      * 货物类型
      */
-    @NotNull(message = "货物类型不能为空")
+    @NotBlank(message = "货物类型不能为空")
     private String goodsType;
 
     /**
@@ -158,14 +158,14 @@ public class AddOrderDTO {
     /**
      * 计划卸货时间
      */
-    @NotBlank(message = "计划卸货时间不能为空")
+    @NotNull(message = "计划卸货时间不能为空")
     @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate endTime;
 
     /**
      * 计划发货时间
      */
-    @NotBlank(message = "计划发货时间不能为空")
+    @NotNull(message = "计划发货时间不能为空")
     @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate startTime;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/LogisticsOrderParam.java

@@ -21,7 +21,7 @@ public class LogisticsOrderParam implements Serializable {
     /**
      * 客户单位名称
      */
-    @NotBlank(message = "客户单位名称不能为空")
+//    @NotBlank(message = "客户单位名称不能为空")
     private String companyName;
     /**
      * 开始时间
@@ -41,7 +41,7 @@ public class LogisticsOrderParam implements Serializable {
     /**
      * 付款方式(预付款、线下支付、第三方支付）
      */
-    @NotNull(message = "付款方式类型不能为空")
+//    @NotNull(message = "付款方式类型不能为空")
     private String paymentType;
 
     /**

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

@@ -16,6 +16,20 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 public class CarWaybillVO {
+
+    /**
+     * 物流订单id
+     */
+    private String lOrderId;
+
+    /**
+     *物流订单编号
+     */
+    private String lOrderNo;
+
+    /**
+     * 车辆运单id
+     */
     private String wOrderId;
 
     /**

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

@@ -291,6 +291,7 @@ public class ConsignOrderService {
             return HttpResult.ok();
         }
         List<CarWaybillVO> returnList = new ArrayList<>();
+        list= list.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
         for (String id : list) {
             KwtLogisticsOrder order = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                             .eq(StringUtils.isNotBlank(id), KwtLogisticsOrder::getId, Long.parseLong(id))
@@ -327,8 +328,10 @@ public class ConsignOrderService {
                     BigDecimal defectiveWeigh = kwtWaybillOrder.getDeficitAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getDeficitAmount();
                     //扣亏量/吨
                     BigDecimal deduct = defectiveWeigh.compareTo(new BigDecimal("0.00")) == 0 ? new BigDecimal("0.00") : defectiveWeigh.subtract(multiply);
+                    carWaybillVo.setLOrderId(String.valueOf(kwtWaybillOrder.getLOrderId()));
+                    carWaybillVo.setLOrderNo(order.getLOrderNo());
                     carWaybillVo.setWOrderId(String.valueOf(kwtWaybillOrder.getId()));
-                    carWaybillVo.setWOrderNo(order.getLOrderNo());
+                    carWaybillVo.setWOrderNo(kwtWaybillOrder.getWOrderNo());
                     carWaybillVo.setTruckNo(kwtWaybillOrder.getTruckNo());
                     carWaybillVo.setStatus(String.valueOf(kwtWaybillOrder.getStatus()));
                     carWaybillVo.setStatusLabel(CarWaybillEnum.getName(kwtWaybillOrder.getStatus()));
@@ -382,14 +385,20 @@ public class ConsignOrderService {
      * @return
      */
     private HttpResult getCarWaybillOrderByConsign(OrderDTO orderDto) {
-        List<String> list = StringUtils.splitStrToList(orderDto.getIds(), String.class);
+        List<Long> list = StringUtils.splitStrToList(orderDto.getIds(), Long.class);
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.ok();
         }
         List<CarWaybillVO> returnList = new ArrayList<>();
-        for (String id : list) {
+        list = list.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
+//        kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
+//                .eq(KwtLogisticsOrder::getDelFlag,NumberConstant.ZERO)
+//                .in(KwtLogisticsOrder::getId,list)
+//                .orderByDesc(KwtLogisticsOrder::getId)
+//        );
+        for (Long id : list) {
             KwtLogisticsOrder order = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                            .eq(StringUtils.isNotBlank(id), KwtLogisticsOrder::getId, Long.parseLong(id))
+                            .eq(StringUtils.isNotBlank(id), KwtLogisticsOrder::getId, id)
                     /**      .eq(StringUtils.isNotBlank(orderDto.getOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDto.getOrderNo())*/
                     /**.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
             if (ObjectUtils.isEmpty(order)) {

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

@@ -294,6 +294,8 @@ public class LogisticsConsignmentService {
         logisticsOrder.setGoodsPriceUnit(bo.getGoodsPriceUnit());
         logisticsOrder.setContractName(bo.getContractName());
         logisticsOrder.setBillingMode(bo.getBillingMode());
+        logisticsOrder.setStartTime(bo.getShipmentsDateTime());
+        logisticsOrder.setEndTime(bo.getReceiveGoodsDateTime());
         //rabbitMq业务汇总数据发送/消费对象
         SckwBusSum busSum = new SckwBusSum();
         //业务汇总类型