From ef04ce57881e6a338b10d596c5eb76b2220598bf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 八月 2023 11:16:49 +0800
Subject: [PATCH] 更新版本
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
index 07a3a5a..83ec41a 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
@@ -51,9 +51,29 @@
<if test="driverName != null and driverName != ''">
AND d.name LIKE concat('%',#{driverName},'%')
</if>
+ <if test="roleType != null and roleType == 2">
+ AND o.branchOfficeId = #{objectId}
+ </if>
+ <if test="roleType != null and roleType == 3">
+ AND o.agentId = #{objectId}
+ </if>
+ </where>
+ ORDER BY co.createTime desc
+ </select>
+ <select id="userCancelOrderList" resultType="com.stylefeng.guns.modular.system.controller.resp.TOrderResp">
+ select co.createTime,o.code,o.startAddress,o.endAddress
+ from t_cancel_order co
+ left join t_order o on co.orderId = o.id
+ <where>
+ <if test="userId != null">
+ AND co.userId = #{userId}
+ </if>
+ <if test="orderId != null">
+ AND co.orderId = #{orderId}
+ </if>
AND co.userType = 1
</where>
- ORDER BY co.createTime
+ ORDER BY co.createTime DESC
</select>
</mapper>
--
Gitblit v1.7.1