From dde0c2c0670e418fb3853ed53cf74db620d9768d Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Tue, 10 Feb 2026 18:19:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=BE=93=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cst/order/mapper/OrderTransMapper.java | 2 + .../order/pojo/result/SearchOrderResult.java | 3 +- .../pojo/result/SearchOrderTransResult.java | 188 ++++++++++++++++++ .../cst/order/service/OrderService.java | 24 +-- .../mapper/cst/order/OrderTransMapper.xml | 43 ++++ 5 files changed, 247 insertions(+), 13 deletions(-) create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderTransResult.java diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderTransMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderTransMapper.java index 219bf55..3a19a4d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderTransMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderTransMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njzscloud.dispose.cst.order.pojo.entity.OrderTransEntity; import com.njzscloud.dispose.cst.order.pojo.result.OrderTransResult; +import com.njzscloud.dispose.cst.order.pojo.result.SearchOrderTransResult; import com.njzscloud.dispose.cst.order.pojo.result.TransResult; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -33,4 +34,5 @@ public interface OrderTransMapper extends BaseMapper { List getTransResultByOrderId(@Param("orderId") Long orderId); + List listTransRecode(@Param("ew") QueryWrapper ew); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderResult.java index 749d865..13eb031 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderResult.java @@ -269,7 +269,8 @@ public class SearchOrderResult { * 司机所属用户 Id */ private Long driverUserId; - + private String driverName; + private String driverPhone; /** * 归属客户 Id；cst_customer.id */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderTransResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderTransResult.java new file mode 100644 index 0000000..6803438 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderTransResult.java @@ -0,0 +1,188 @@ +package com.njzscloud.dispose.cst.order.pojo.result; + +import com.njzscloud.dispose.cst.order.constant.CheckStatus; +import com.njzscloud.dispose.cst.order.constant.TransStatus; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * 运输信息 + * + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchOrderTransResult { + + /** + * 主键 + */ + private Long id; + + /** + * 车次 + */ + private Integer trainNum; + + /** + * 订单 Id + */ + private Long orderId; + + /** + * 运输状态；字典代码：trans_status，DaiPaiDan-->待派单、DaiJieDan-->待接单、YiJieDan-->已接单、YunShuZhong-->运输中、YiJinChang-->已进场、YiChuChang-->已出场、YiWanCheng-->已完成、YiQuXiao-->已取消 + */ + private TransStatus transStatus; + + /** + * 车道名称 + */ + private String lane; + + /** + * 指派司机时间 + */ + private LocalDateTime assignmentDriverTime; + + /** + * 司机确认接单时间 + */ + private LocalDateTime driverConfirmTime; + + /** + * 开始运输时间 + */ + private LocalDateTime transTime; + + /** + * 完结时间 + */ + private LocalDateTime finishTime; + + /** + * 看料员 Id；sys_user.id + */ + private Long checkerId; + + /** + * 勘料状态；字典代码：check_status，Wu-->无需勘料、YiKanLiao-->已勘料、WeiKanLiao-->未勘料 + */ + private CheckStatus checkStatus; + + /** + * 勘料时间 + */ + private LocalDateTime checkTime; + + /** + * 勘料照片 + */ + private List checkPhoto; + + /** + * 勘料员备注 + */ + private String checkerMemo; + + /** + * 司机 Id + */ + private Long driverId; + + /** + * 司机所属客户 Id；cst_customer.id + */ + private Long driverCustomerId; + + /** + * 司机所属用户 Id + */ + private Long driverUserId; + private String driverName; + private String driverPhone; + + /** + * 归属客户 Id；cst_customer.id + */ + private Long truckCustomerId; + + /** + * 归属组织 + */ + private Long truckOrgId; + + /** + * 车辆 Id + */ + private Long truckId; + + /** + * 车牌号 + */ + private String truckLicensePlate; + + /** + * 历史皮重 + */ + private Integer historyTareWeight; + + /** + * 毛重；单位：千克 + */ + private Integer roughWeight; + + /** + * 皮重；单位：千克 + */ + private Integer tareWeight; + + /** + * 净重；单位：千克 + */ + private Integer settleWeight; + + /** + * 运距；单位：米 + */ + private Integer transDistance; + + /** + * 进场车头照片 + */ + private String inFrontPhoto; + + /** + * 进场车斗照片 + */ + private String inBodyPhoto; + + /** + * 出场车头照片 + */ + private String outFrontPhoto; + + /** + * 出场车斗照片 + */ + private String outBodyPhoto; + + /** + * 进场时间 + */ + private LocalDateTime inTime; + + /** + * 出场时间 + */ + private LocalDateTime outTime; + +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java index 73c0ca5..b23dc32 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java @@ -179,12 +179,12 @@ public class OrderService extends ServiceImpl { if (detail == null) return null; Long orderId = detail.getId(); Long projectId = detail.getProjectId(); - List transRecodeList = orderTransMapper.selectList(Wrappers.lambdaQuery(OrderTransEntity.class) - .eq(OrderTransEntity::getOrderId, orderId) - .in("YuYue".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.DaiPaiDan, TransStatus.DaiJieDan) - .in("ShiShi".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.YiJieDan, TransStatus.YunShuZhong, TransStatus.YiJinChang, TransStatus.YiChuChang) - .eq("LiShi".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.YiWanCheng) - .eq("QuXiao".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.YiQuXiao) + List transRecodeList = orderTransMapper.listTransRecode(Wrappers.query() + .eq("a.order_id", orderId) + .in("YuYue".equals(orderType), "a.trans_status", TransStatus.DaiPaiDan, TransStatus.DaiJieDan) + .in("ShiShi".equals(orderType), "a.trans_status", TransStatus.YiJieDan, TransStatus.YunShuZhong, TransStatus.YiJinChang, TransStatus.YiChuChang) + .eq("LiShi".equals(orderType), "a.trans_status", TransStatus.YiWanCheng) + .eq("QuXiao".equals(orderType), "a.trans_status", TransStatus.YiQuXiao) ) .stream() .map(it -> BeanUtil.copyProperties(it, SearchOrderResult.TransRecode.class)) @@ -261,12 +261,12 @@ public class OrderService extends ServiceImpl { if (results.isEmpty()) return PageResult.of(resultPage); List orderIdList = results.stream().map(SearchOrderResult::getId).toList(); List projectIdList = results.stream().map(SearchOrderResult::getProjectId).filter(Objects::nonNull).toList(); - List transRecodes = orderTransMapper.selectList(Wrappers.lambdaQuery(OrderTransEntity.class) - .in(OrderTransEntity::getOrderId, orderIdList) - .in("YuYue".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.DaiPaiDan, TransStatus.DaiJieDan) - .in("ShiShi".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.YiJieDan, TransStatus.YunShuZhong, TransStatus.YiJinChang, TransStatus.YiChuChang) - .eq("LiShi".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.YiWanCheng) - .eq("QuXiao".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.YiQuXiao) + List transRecodes = orderTransMapper.listTransRecode(Wrappers.query() + .in("a.order_id", orderIdList) + .in("YuYue".equals(orderType), "a.trans_status", TransStatus.DaiPaiDan, TransStatus.DaiJieDan) + .in("ShiShi".equals(orderType), "a.trans_status", TransStatus.YiJieDan, TransStatus.YunShuZhong, TransStatus.YiJinChang, TransStatus.YiChuChang) + .eq("LiShi".equals(orderType), "a.trans_status", TransStatus.YiWanCheng) + .eq("QuXiao".equals(orderType), "a.trans_status", TransStatus.YiQuXiao) ) .stream() .map(it -> BeanUtil.copyProperties(it, SearchOrderResult.TransRecode.class)) diff --git a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml index 162437e..496761e 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml @@ -153,5 +153,48 @@ LEFT JOIN cst_driver cd ON cd.id = cot.driver_id WHERE cot.order_id = #{orderId} +