From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/PlanMapper.xml |   57 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index 20b1160..5d8bf24 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -34,6 +34,13 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="memo" property="memo" />
+        <result column="user_xml_sel_phone" property="userXmlSelPhone" />
+        <result column="director" property="director" />
+        <result column="status2" property="status2" />
+        <result column="assistant_plan_id" property="assistantPlanId" />
+        <result column="host_plan_id" property="hostPlanId" />
+        <result column="assistant_host_sign" property="assistantHostSign" />
+        <result column="settle_size" property="settleSize" />
 
     </resultMap>
 
@@ -63,20 +70,37 @@
         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
+                (
+                    mp.user_id = #{userId}
+                    or
+                    mp.id in
+                    (
+                        select
+                        plan_id
+                        from man_plan_foll
+                        where 1=1
+                        and user_id = #{userId}
+                    )
+                ))
             </when>
             <otherwise>
                 and
                 (
-                user_id = #{userId}
-                or
-                mp.id in
-                (
-                    select
-                    order_id
-                    from man_order_foll
-                    where 1=1
-                    and user_id = #{userId}
+                    <if test="userId != null and userId != ''">
+                        mp.user_id = #{userId}
+                        or
+                        mp.director = #{userId}
+                        or
+                    </if>
+                    mp.id in
+                    (
+                        select
+                        plan_id
+                        from man_plan_foll
+                        where 1=1
+                        and user_id = #{userId}
                     )
                 )
             </otherwise>
@@ -89,10 +113,19 @@
             mp.uuid like concat('%',#{condition},'%')
             or mp.name like concat('%',#{condition},'%')
             or mp.planner like concat('%',#{condition},'%')
-            or mp.remarks like concat('%',#{condition},'%')
             )
         </if>
-        ORDER BY mp.create_time DESC
+        <if test="director != null and director != ''">
+            or mp.director = #{director}
+        </if>
+        ORDER BY mp.update_time DESC,mp.create_time DESC
+    </select>
+
+    <select id="selectPendingTaskCount" resultType="java.lang.Integer">
+        select count(1) from man_plan
+        where 1=1
+        and director = #{director}
+        and settle &lt; settle_size
     </select>
 
 </mapper>

--
Gitblit v1.9.1