sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtLogisticsOrderController.java

@@ -1,17 +1,19 @@
 package com.sckw.transport.controller;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.annotation.RepeatSubmit;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.core.web.response.result.PageDataResult;
+import com.sckw.transport.model.LogisticsOrderPara;
+import com.sckw.transport.model.OrderPara;
 import com.sckw.transport.model.dto.LogisticsConsignmentDto;
 import com.sckw.transport.model.dto.LogisticsOrderFinishDto;
 import com.sckw.transport.model.dto.LogisticsOrderSubcontractDto;
 import com.sckw.transport.model.param.AddLogisticsOrderParam;
 import com.sckw.transport.model.param.LogisticsOrderResp;
-import com.sckw.transport.model.param.LogisticsOrderUnitReq;
 import com.sckw.transport.model.param.QueryLogisticsOrderReq;
 import com.sckw.transport.model.vo.*;
 import com.sckw.transport.service.KwtLogisticsConsignmentService;
@@ -21,11 +23,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 /**
  * @author lfdc
  * @desc 物流订单Controller-v4.2
@@ -50,10 +54,10 @@ public class KwtLogisticsOrderController {
      * 采购订单/销售订单-物流托运-V4.2
      *
      * @param logisticsConsignmentDto 页面请求参数
-     * @return  响应结果
+     * @return 响应结果
      */
     @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
+    @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
     @RequestMapping(value = "/consignment", method = RequestMethod.POST)
     public HttpResult logisticsOrderConsignment(@Valid @RequestBody LogisticsConsignmentDto logisticsConsignmentDto) {
         log.info("采购订单/销售订单-物流托运传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentDto));
@@ -70,10 +74,10 @@ public class KwtLogisticsOrderController {
      * 承运订单/托运订单-自建物流订单 V4.2
      *
      * @param addLogisticsOrderParam 页面请求参数
-     * @return  响应结果
+     * @return 响应结果
      */
     @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
+    @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
     @RequestMapping(value = "/createOrder", method = RequestMethod.POST)
     public HttpResult addLogisticsOrder(@Valid @RequestBody AddLogisticsOrderParam addLogisticsOrderParam) {
         log.info("承运订单/托运订单-自建物流订单传递参数信息:{}", JSONObject.toJSONString(addLogisticsOrderParam));
@@ -90,10 +94,10 @@ public class KwtLogisticsOrderController {
      * 物流订单-分包托运-V4.2
      *
      * @param logisticsOrderSubcontractDto 页面请求参数
-     * @return  响应结果
+     * @return 响应结果
      */
     @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
+    @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
     @RequestMapping(value = "/subcontract", method = RequestMethod.POST)
     public HttpResult logisticsOrderSubcontract(@Valid @RequestBody LogisticsOrderSubcontractDto logisticsOrderSubcontractDto) {
         log.info("物流订单-分包托运传递参数信息:{}", JSONObject.toJSONString(logisticsOrderSubcontractDto));
@@ -109,10 +113,10 @@ public class KwtLogisticsOrderController {
      * 物流订单-完结订单-V4.2
      *
      * @param logisticsOrderSubcontractDto 页面请求参数
-     * @return  响应结果
+     * @return 响应结果
      */
     @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
+    @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
     @RequestMapping(value = "/logisticsOrderFinish", method = RequestMethod.POST)
     public HttpResult logisticsOrderFinish(@Valid @RequestBody LogisticsOrderFinishDto logisticsOrderSubcontractDto) {
         log.info("物流订单-完结订单传递参数信息:{}", JSONObject.toJSONString(logisticsOrderSubcontractDto));
@@ -130,17 +134,18 @@ public class KwtLogisticsOrderController {
     @PostMapping(value = "/queryLogisticsOrderByPage")
     @Operation(summary = "分页查询物流订单", description = "分页查询物流订单")
     public BaseResult<PageDataResult<LogisticsOrderResp>> queryLogisticsOrderByPage(@RequestBody QueryLogisticsOrderReq req) {
-        return BaseResult.success(logisticsConsignmentService.queryLogisticsOrderByPage( req));
+        return BaseResult.success(logisticsConsignmentService.queryLogisticsOrderByPage(req));
     }
 
     /**
-    * 获取物流订单详情
-    */
+     * 获取物流订单详情
+     */
     @PostMapping(value = "/getLogisticsOrderDetail")
     @Operation(summary = "获取物流订单详情", description = "获取物流订单详情")
     public BaseResult<LogisticsOrderDetailResp> getLogisticsOrderDetail(@RequestBody @Valid LogisticsOrderReq req) {
         return BaseResult.success(logisticsConsignmentService.getLogisticsOrderDetail(req));
     }
+
     /**
      * 根据物流订单查询已派运力
      */
@@ -184,7 +189,7 @@ public class KwtLogisticsOrderController {
      */
     @PostMapping("/logisticOrderFinish")
     @Operation(summary = "完结订单", description = "完结订单")
-    public BaseResult<Boolean> logisticOrderFinish(@RequestBody @Valid OrderFinishReq req ) {
+    public BaseResult<Boolean> logisticOrderFinish(@RequestBody @Valid OrderFinishReq req) {
         return BaseResult.success(logisticsConsignmentService.logisticOrderFinish(req));
     }
 
@@ -205,4 +210,14 @@ public class KwtLogisticsOrderController {
     public BaseResult<List<LogisticsOrderUnitResp>> orderUnits() {
         return BaseResult.success(transportCommonService.queryOrderUnits());
     }
+
+    @GetMapping(value = "/list")
+    @Operation(summary = "分页查询物流订单", description = "分页查询物流订单")
+    public HttpResult list(@ParameterObject OrderPara orderPara) {
+        LogisticsOrderPara tradeOrderPara = new LogisticsOrderPara();
+        tradeOrderPara.setStartTime(LocalDateTimeUtil.parse(orderPara.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+        tradeOrderPara.setEndTime(LocalDateTimeUtil.parse(orderPara.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
+        orderPara.setUserId(orderPara.getUserId());
+        return HttpResult.ok(logisticsConsignmentService.queryList(tradeOrderPara));
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -5,6 +5,7 @@ import com.sckw.mongo.model.TableTops;
 import com.sckw.transport.api.model.dto.AcceptCarriageLogisticsOrderDto;
 import com.sckw.transport.api.model.vo.LogisticsOrderVO;
 import com.sckw.transport.model.KwtLogisticsOrder;
+import com.sckw.transport.model.LogisticsOrderPara;
 import com.sckw.transport.model.dto.LogisticsOrderDto;
 import com.sckw.transport.model.param.*;
 import com.sckw.transport.model.vo.*;
@@ -472,4 +473,6 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
      * @date 2023/9/18
      **/
     LogisticsCountVo findLogisticsOrderCount(Map<String, Object> params);
-}
+
+    List<LogisticsOrderVo> selectData(@Param("para")LogisticsOrderPara orderPara);
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/LogisticsOrderPara.java

@@ -0,0 +1,27 @@
+package com.sckw.transport.model;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+public class LogisticsOrderPara implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 6909518527687999256L;
+    @NotNull(message = "开始时间不能为空")
+    private LocalDateTime startTime;
+    @NotNull(message = "开始时间不能为空")
+    private LocalDateTime endTime;
+
+    private List<Long> entId;
+    private Long userId;
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/OrderPara.java

@@ -0,0 +1,21 @@
+package com.sckw.transport.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author xucaiqin
+ * @date 2025-12-02 19:41:55
+ */
+@Getter
+@Setter
+@Schema(description = "物流订单查询参数")
+public class OrderPara {
+    @Schema(description = "开始时间")
+    private String startTime;
+    @Schema(description = "结束时间")
+    private String endTime;
+    @Schema(description = "用户id")
+    private Long userId;
+}

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

@@ -0,0 +1,35 @@
+package com.sckw.transport.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+
+@Data
+public class LogisticsOrderVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 4964311980474791569L;
+    private Long id;
+
+    @JsonProperty("tOrderId")
+    private Long tOrderId;
+
+    @JsonProperty("lOrderNo")
+    private String lOrderNo;
+
+    @JsonProperty("tOrderNo")
+    private String tOrderNo;
+
+    private BigDecimal amount;
+    private Integer status;
+    private String statusLabel;
+    private String tyFirmName;
+    private String cyFirmName;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+}

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -2934,4 +2934,22 @@
             and FIND_IN_SET(id, #{belowlOrderId, jdbcType=VARCHAR})
         </if>
     </select>
-</mapper>
+
+    <select id="selectData" resultType="com.sckw.transport.model.vo.LogisticsOrderVo">
+        select a.id,
+               a.l_order_no       AS lOrderNo,
+               a.t_order_no       AS tOrderNo,
+               a.amount,
+               a.`status`         AS status,
+               d.firm_name        as tyFirmName,
+               e.firm_name        as cyFirmName,
+               e.create_time
+        FROM kwt_logistics_order a
+             LEFT JOIN kwt_logistics_order_unit d ON a.id = d.l_order_id
+            AND d.unit_type = 1 AND d.del_flag = 0
+                 LEFT JOIN kwt_logistics_order_unit e ON a.id = e.l_order_id
+            AND e.unit_type = 2
+    </select>
+
+
+</mapper>