From 34c7d903efa4dc06a0f7b38bc5d2d721f80b220d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 09 七月 2025 09:04:52 +0800
Subject: [PATCH] 7.8冒烟修改问题
---
ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml
index 6201958..6f3cc68 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml
@@ -15,9 +15,22 @@
</resultMap>
<select id="getMyOrderList" resultType="com.ruoyi.system.vo.MyPushCompanyListVo">
- select t1.id orderId,t2.id,t2.compamy_name companyName,t2.create_time createTime,t2.sale_money saleMoney,t2.status
+ select t1.id orderId,t2.id,t2.company_name companyName,t2.create_time createTime,t2.sale_money saleMoney,t1.status
from tb_order t1 left join tb_company t2 on t1.company_id = t2.id
- where t2.user_id =#{userId}
+ where t1.user_id =#{userId} and t2.id is not null
+ <if test="query.status != null and query.status !=6 ">
+ and t1.status = #{query.status}
+ </if>
+ <if test="query.status != null and query.status ==6 ">
+ and t1.status in (5,6)
+ </if>
+ order by t1.create_time desc
+ </select>
+ <select id="getMyOrderListNum" resultType="com.ruoyi.system.vo.MyPushCompanyListVo"
+ parameterType="java.lang.Long">
+ select t1.id orderId,t2.id,t2.company_name companyName,t2.create_time createTime,t2.sale_money saleMoney,t1.status
+ from tb_order t1 left join tb_company t2 on t1.company_id = t2.id
+ where t1.user_id =#{userId} and t2.id is not null
order by t1.create_time desc
</select>
--
Gitblit v1.7.1