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 |   54 +++++++++++++++++++-----------------------------------
 1 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index baf9f84..5d8bf24 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -36,6 +36,11 @@
         <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>
 
@@ -68,7 +73,7 @@
                 AND ( (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
                 or
                 (
-                    user_id = #{userId}
+                    mp.user_id = #{userId}
                     or
                     mp.id in
                     (
@@ -83,13 +88,12 @@
             <otherwise>
                 and
                 (
-                    <if test="condition != null and condition != ''">
-                        user_id = #{userId}
+                    <if test="userId != null and userId != ''">
+                        mp.user_id = #{userId}
+                        or
+                        mp.director = #{userId}
+                        or
                     </if>
-                    <if test="condition == null or condition == ''">
-                        user_id is not null
-                    </if>
-                    or
                     mp.id in
                     (
                         select
@@ -111,37 +115,17 @@
             or mp.planner 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="selectPlanUrlPlanIdUrl" resultType="java.lang.String">
-        select url from man_plan_url
+    <select id="selectPendingTaskCount" resultType="java.lang.Integer">
+        select count(1) from man_plan
         where 1=1
-        and id=#{id}
+        and director = #{director}
+        and settle &lt; settle_size
     </select>
-
-    <select id="selectPlanUrlPlanIdName" resultType="java.lang.String">
-        select name from man_plan_url
-        where 1=1
-        and id=#{id}
-    </select>
-
-    <select id="selectPlanUrlPlanIdSize" resultType="java.lang.Long">
-        select file_size from man_plan_url
-        where 1=1
-        and id=#{id}
-    </select>
-
-    <select id="selectPlanUrlId" resultType="java.lang.Integer">
-        select id from man_plan_url
-        where 1=1
-        and plan_id=#{planId}
-    </select>
-
-    <insert id="increasePlanUrl">
-        insert into man_plan_url(plan_id,url,name,file_size)
-        values(#{planId},#{url},#{name},#{size})
-    </insert>
-
 
 </mapper>

--
Gitblit v1.9.1