update 增加运单导出接口

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -155,7 +155,7 @@ public class KwTransportController {
      * @return
      */
     @RequestMapping(value = "/getWaybillOrders", method = RequestMethod.POST)
-    public HttpResult getWayBillOrders(@Validated @RequestBody WaybillOrderQuery query){
+    public HttpResult getWayBillOrders(@Validated @RequestBody WaybillOrderListSelect query){
         try {
             return transportService.getWaybillOrders(query);
         } catch (Exception e) {
@@ -173,7 +173,7 @@ public class KwTransportController {
      * @date 2023/07/21
      */
     @RequestMapping(value = "/getWayBillStatistics", method = RequestMethod.POST)
-    public HttpResult wayBillStatistics(@Validated @RequestBody WaybillOrderQuery query) {
+    public HttpResult wayBillStatistics(@Validated @RequestBody WaybillOrderListSelect query) {
         try {
             return transportService.getWayBillStatistics(query);
         } catch (Exception e) {
@@ -191,7 +191,7 @@ public class KwTransportController {
      * @date 2023/07/21
      */
     @RequestMapping(value = "/wayBillTotalCount", method = RequestMethod.POST)
-    public HttpResult wayBillTotalCount(@Validated @RequestBody WaybillOrderQuery query) {
+    public HttpResult wayBillTotalCount(@Validated @RequestBody WaybillOrderListSelect query) {
         try {
             return transportService.wayBillTotalCount(query);
         } catch (Exception e) {
@@ -257,9 +257,9 @@ public class KwTransportController {
      * @Param params:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @PostMapping(value = "/wBillOrderExport", produces = MediaType.APPLICATION_JSON_VALUE)
-    public void wBillOrderExport(@RequestBody @Validated WaybillOrderQuery query, HttpServletResponse response) {
-        List<WaybillOrderListExport> list = transportService.wBillOrderExport(query);
+    @PostMapping(value = "/wayBillOrderExport", produces = MediaType.APPLICATION_JSON_VALUE)
+    public void wayBillOrderExport(@RequestBody @Validated WaybillOrderQuery query, HttpServletResponse response) {
+        List<WaybillOrderListExport> list = transportService.wayBillOrderExport(query);
         if (CollectionUtils.isEmpty(list)) {
             throw new BusinessException("导出数据为空！");
         }

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

@@ -17,10 +17,7 @@ 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.ContractParam;
-import com.sckw.report.service.param.TradeOrderListExport;
-import com.sckw.report.service.param.WaybillOrderListExport;
-import com.sckw.report.service.param.WaybillOrderQuery;
+import com.sckw.report.service.param.*;
 import com.sckw.report.service.vo.CarWaybillVo;
 import com.sckw.report.service.vo.WaybillsCountVo;
 import com.sckw.system.api.RemoteSystemService;
@@ -158,7 +155,7 @@ public class KwTransportService {
      * @author jc
      * @date 2023/07/21
      */
-    public HttpResult getWaybillOrders(WaybillOrderQuery query) throws ParseException {
+    public HttpResult getWaybillOrders(WaybillOrderListSelect query) throws ParseException {
         Criteria criteria = buildWaybillOrdersQuery(query);
         Query queryFormat = new Query(criteria);
         // in查询
@@ -576,23 +573,38 @@ public class KwTransportService {
      * @param query
      * @return
      */
-    public List<WaybillOrderListExport> wBillOrderExport(WaybillOrderQuery query) {
+    public List<WaybillOrderListExport> wayBillOrderExport(WaybillOrderQuery query) {
         Criteria criteria = buildWaybillOrdersQuery(query);
         Query queryFormat = new Query(criteria);
-        // in查询
         List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
         if (CollectionUtils.isNotEmpty(wOrderIds)) {
             queryFormat.addCriteria(Criteria.where("wOrderId").in(wOrderIds));
         }
-        List<SckwWaybillOrder> worders = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
+        List<SckwWaybillOrder> wOrders = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
         List<WaybillOrderListExport> list = new ArrayList<>();
         AtomicInteger i = new AtomicInteger(1);
-        worders.forEach(e -> {
+        wOrders.forEach(e -> {
             WaybillOrderListExport export = BeanUtils.copyProperties(e, WaybillOrderListExport.class);
             export.setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setStatus(DictEnum.getLabel(DictTypeEnum.TORDER_STATUS.getType(), String.valueOf(e.getStatus())))
-                    .setWOrderNo(DictEnum.getLabel(DictTypeEnum.TRADE_TYPE.getType(), e.getWOrderNo()));
-
+                    .setStatus(CarWaybillEnum.getName(e.getStatus()))
+                    .setWOrderNo(e.getWOrderNo())
+                    .setTruckNo(e.getTruckNo())
+                    .setDriverName(e.getDriverName())
+                    .setType(e.getType().equals(NumberConstant.ONE) ? "趟次" : "循环")
+                    .setSendCarTime(e.getCreateTime() == null ? null : DateUtil.getDateTime(e.getCreateTime()))
+                    .setStartTime(e.getStartTime() == null ? null : DateUtil.getDateTime(e.getStartTime()))
+                    .setEndTime(e.getEndTime() == null ? null : DateUtil.getDateTime(e.getEndTime()))
+                    .setEntrustAmount(String.valueOf(e.getEntrustAmount()))
+                    .setLoadName(e.getLoadName())
+                    .setLoadAddress(e.getLoadCityName().concat(e.getLoadDetailAddress()))
+                    .setUnloadName(e.getUnloadName())
+                    .setUnloadAddress(e.getLoadCityName().concat(e.getLoadDetailAddress()))
+                    .setLoadAmount(String.valueOf(e.getLoadAmount()))
+                    .setUnloadAmount(String.valueOf(e.getUnloadAmount()))
+                    .setDeficitAmount(String.valueOf(e.getDeficitAmount()))
+                    .setLoadDateTime(e.getLoadTime() == null ? null : DateUtil.getDateTime(e.getLoadTime()))
+                    .setUnloadDateTime(e.getUnloadTime() == null ? null : DateUtil.getDateTime(e.getUnloadTime()))
+                    .setUpdateTime(e.getUpdateTime() == null ? null : DateUtil.getDateTime(e.getUpdateTime()));
             list.add(export);
         });
         return list;

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

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @Accessors(chain = true)
 @ExcelContext(fileName = "运单列表信息", sheetName = "运单列表信息")
-public class WaybillOrderListExport extends PageRequest implements Serializable {
+public class WaybillOrderListExport implements Serializable {
     @Serial
     private static final long serialVersionUID = -2111424783071112237L;
 
@@ -43,4 +43,43 @@ public class WaybillOrderListExport extends PageRequest implements Serializable
     @ExcelProperty(value = "派车时间")
     private String sendCarTime;
 
+    @ExcelProperty(value = "计划开始时间")
+    private String startTime;
+
+    @ExcelProperty(value = "计划结束时间")
+    private String endTime;
+
+    @ExcelProperty(value = "派车量/吨")
+    private String entrustAmount;
+
+    @ExcelProperty(value = "装货地址名称")
+    private String loadName;
+
+    @ExcelProperty(value = "装货地址明细")
+    private String loadAddress;
+
+    @ExcelProperty(value = "卸货地址名称")
+    private String unloadName;
+
+    @ExcelProperty(value = "卸货地址明细")
+    private String unloadAddress;
+
+    @ExcelProperty(value = "实装量/吨")
+    private String loadAmount;
+
+    @ExcelProperty(value = "实卸量/吨")
+    private String unloadAmount;
+
+    @ExcelProperty(value = "亏吨量/吨")
+    private String deficitAmount;
+
+    @ExcelProperty(value = "装货时间")
+    private String loadDateTime;
+
+    @ExcelProperty(value = "卸货时间")
+    private String unloadDateTime;
+
+    @ExcelProperty(value = "更新时间")
+    private String updateTime;
+
 }

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

@@ -0,0 +1,22 @@
+package com.sckw.report.service.param;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author JC
+ * @version 1.0
+ * @desc TODO
+ * @date 2023/{07}/19 10:20:44
+ **/
+@Data
+@Accessors(chain = true)
+public class WaybillOrderListSelect extends WaybillOrderQuery {
+    /**
+     * 当前页码
+     */
+    private int page = 1;
+    /**
+     * 每页数量
+     */
+    private int pageSize = 10;
+}

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

@@ -19,7 +19,7 @@ import java.util.List;
  **/
 @Data
 @Accessors(chain = true)
-public class WaybillOrderQuery extends PageRequest implements Serializable {
+public class WaybillOrderQuery implements Serializable {
     private String ids;
     /**
      * 派车开始时间

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

@@ -37,6 +37,11 @@ public class WaybillStatusVO {
      */
     private String createByName;
 
+    /**
+     * 操作时间
+     */
+    private String operateTime;
+
     /**
      * 记录ID
      */

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

@@ -164,6 +164,8 @@ public class WaybillManagementService {
                         statusVO.setStatus(true);
                         statusVO.setId(kwtWaybillOrderTrack.getId());
                         statusVO.setCreateTime(DateUtil.getDateTime(kwtWaybillOrderTrack.getCreateTime()));
+                        statusVO.setOperateTime(kwtWaybillOrderTrack.getOperateTime() == null
+                                ? null : DateUtil.getDateTime(kwtWaybillOrderTrack.getOperateTime()));
                         statusVO.setCreateByName(usersMap.get(kwtWaybillOrderTrack.getCreateBy()) == null
                                 ? null : usersMap.get(kwtWaybillOrderTrack.getCreateBy()));
                         break;