lzq
/
njzscloud-dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单列表

master
lzq 2026-02-10 16:01:01 +08:00
parent ff88dc70b8
commit 747bd4e56f
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/SearchOrderResult.java
View File

@ -130,6 +130,7 @@ public class SearchOrderResult {
* 产品名称
*/
private String goodsName;
private String goodsPicture;
/**
* 计量单位；字典代码：unit

6
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java
View File

@ -181,7 +181,7 @@ public class OrderService extends ServiceImpl<OrderMapper, OrderEntity> {
Long projectId = detail.getProjectId();
List<SearchOrderResult.TransRecode> transRecodeList = orderTransMapper.selectList(Wrappers.lambdaQuery(OrderTransEntity.class)
.eq(OrderTransEntity::getOrderId, orderId)
.eq("YuYue".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.DaiPaiDan)
.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)
@ -230,7 +230,7 @@ public class OrderService extends ServiceImpl<OrderMapper, OrderEntity> {
LocalDateTime orderTimeEnd = searchOrderParam.getOrderTimeEnd();
QueryWrapper<Object> ew = Wrappers.query()
.exists("YuYue".equals(orderType), "SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status = 'DaiPaiDan'")
.exists("YuYue".equals(orderType), "SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status IN ('DaiPaiDan','DaiJieDan')")
.exists("ShiShi".equals(orderType), "SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status IN ('YiJieDan','YunShuZhong','YiJinChang','YiChuChang')")
.exists("LiShi".equals(orderType), "SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status = 'YiWanCheng'")
.exists("QuXiao".equals(orderType), "SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status = 'YiQuXiao'")
@ -263,7 +263,7 @@ public class OrderService extends ServiceImpl<OrderMapper, OrderEntity> {
List<Long> projectIdList = results.stream().map(SearchOrderResult::getProjectId).filter(Objects::nonNull).toList();
List<SearchOrderResult.TransRecode> transRecodes = orderTransMapper.selectList(Wrappers.lambdaQuery(OrderTransEntity.class)
.in(OrderTransEntity::getOrderId, orderIdList)
.eq("YuYue".equals(orderType), OrderTransEntity::getTransStatus, TransStatus.DaiPaiDan)
.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)

42
njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml
View File

@ -1,7 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njzscloud.dispose.cst.order.mapper.OrderMapper">
<!--
SELECT a.id
FROM (SELECT a.id
FROM cst_order a
LEFT JOIN cst_project f ON f.id = a.project_id
INNER JOIN cst_org j ON j.id = a.trans_org_id
WHERE 1 = 1
AND EXISTS (SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status = 'DaiPaiDan')
AND EXISTS (SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status IN ('YiJieDan', 'YunShuZhong', 'YiJinChang', 'YiChuChang'))
AND EXISTS (SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status = 'YiWanCheng')
AND EXISTS (SELECT 1 FROM cst_order_trans b WHERE b.order_id = a.id AND b.trans_status = 'YiQuXiao')
AND a.order_category IN (?)
AND a.sn = ?
AND a.station_name = ?
AND a.contacts = ?
AND a.phone = ?
AND j.org_name = ?
AND f.project_name = ?
AND a.order_time = ?
ORDER BY a.create_time DESC, a.id DESC
LIMIT 5, 10) temp
INNER JOIN cst_order a ON a.id = temp.id
INNER JOIN cst_order_trans b ON b.order_id = a.id
LEFT JOIN cst_order_cargo_place c ON c.order_id = a.id
LEFT JOIN cst_order_expense_items d ON d.order_id = a.id
LEFT JOIN cst_order_payment_record e ON e.order_id = a.id
LEFT JOIN cst_project f ON f.id = a.project_id
LEFT JOIN (SELECT a.*
FROM cst_driver a
INNER JOIN cst_customer b ON b.id = a.customer_id
INNER JOIN cst_org c ON c.id = a.org_id) g ON g.id = b.driver_id
LEFT JOIN (SELECT a.*
FROM cst_truck a
INNER JOIN cst_customer b ON b.id = a.customer_id
INNER JOIN cst_org c ON c.id = a.org_id) h ON h.id = b.truck_id
INNER JOIN cst_station i ON i.id = a.station_id
-->
<select id="paging" resultType="com.njzscloud.dispose.cst.order.pojo.result.SearchOrderResult">
SELECT a.id,
a.sn,
@ -24,6 +64,7 @@
a.estimated_train_num,
a.goods_id,
a.goods_name,
j.picture goods_picture,
a.unit,
a.customer_memo,
a.create_time
@ -34,6 +75,7 @@
</if>
) temp
INNER JOIN cst_order a ON a.id = temp.id
INNER JOIN gds_goods j ON j.id = a.goods_id
</select>
<select id="detail" resultType="com.njzscloud.dispose.cst.order.pojo.result.SearchOrderResult">
SELECT id,