From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 0349cbd..1f8c3b4 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -28,6 +28,8 @@
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
<result column="transaction_rate" property="transactionRate" />
+ <result column="order_product_type_id" property="orderProductTypeId" />
+ <result column="memo_experience" property="memoExperience" />
</resultMap>
@@ -57,10 +59,10 @@
WHERE 1=1
<choose>
<when test="deptId != null and deptId != ''">
- AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ AND ( (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
or
(
- user_id = #{userId}
+ mo.user_id = #{userId}
or
mo.id in
(
@@ -70,13 +72,17 @@
where 1=1
and user_id = #{userId}
)
- )
+ ))
</when>
<otherwise>
and
(
- user_id = #{userId}
- or
+ <if test="userId != null and userId != ''">
+ mo.user_id = #{userId}
+ or
+ mo.director = #{userId}
+ or
+ </if>
mo.id in
(
select
@@ -91,6 +97,9 @@
<if test="hostId != null">
and mo.host_id = #{hostId}
</if>
+ <if test="status != null">
+ and mo.status = #{status}
+ </if>
<if test="condition != null and condition != ''">
and (
mo.uuid like concat('%',#{condition},'%')
@@ -98,6 +107,9 @@
or mo.remarks like concat('%',#{condition},'%')
or mo.addr like concat('%',#{condition},'%')
)
+ </if>
+ <if test="director != null and director != ''">
+ or mo.director = #{director}
</if>
ORDER BY mo.create_time DESC
</select>
@@ -115,6 +127,13 @@
and user_id = #{userId}
</select>
+ <select id="selectCountByUserYearAndStatus" resultType="java.lang.Integer">
+ select count(*) num from man_order
+ where year(create_time) = #{year}
+ and status = #{status}
+ and user_id = #{userId}
+ </select>
+
<select id="selectTopMoney" resultMap="BaseResultMap">
select top 7 user_id,sum(money) money from man_order
where status = 1
--
Gitblit v1.9.1