From 5bdba4f712b203db5acdd981922a5bc1706b29ff Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 19:15:43 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/OrderMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 0349cbd..6cf3b53 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -28,6 +28,7 @@
         <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" />
 
     </resultMap>
 
@@ -57,7 +58,7 @@
         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}
@@ -70,7 +71,7 @@
                         where 1=1
                         and user_id = #{userId}
                     )
-                )
+                ))
             </when>
             <otherwise>
                 and
@@ -91,6 +92,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},'%')
@@ -115,6 +119,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