From a857feef16fdd2ea9295f0be82a8fdaa34f13595 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 24 四月 2025 18:10:30 +0800
Subject: [PATCH] 修改

---
 src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml b/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
index 34d8dcf..7206048 100644
--- a/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
+++ b/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
@@ -96,10 +96,10 @@
             and c.TEAMGROUP_ID = ${teamId}
         </if>
         <if test="cabinId!=null">
-            and c.cabin_id = ${cabinId}
+            and ',' || c.cabin_id || ',' LIKE '%,${cabinId},%'
         </if>
         <if test="type!=null and type!=''">
-            and c.type = #{type}
+            and c.type = '${type}'
         </if>
         <if test="name!=null and name!=''">
             and c.name LIKE '%${name}%'
@@ -205,6 +205,15 @@
         and a.is_delete = 0
         <if test="userId!=null">
             AND a.TEAMGROUP_ID in (select teamgroup from sys_user where is_delete=0 and id=#{userId})
+        </if>
+        <if test="deptId!=null">
+            AND b.DEPT_ID  = ${deptId}
+        </if>
+        <if test="teamId!=null">
+            AND b.TEAMGROUP_ID  = ${teamId}
+        </if>
+        <if test="name!=null">
+            AND b.name LIKE '%${name}%'
         </if>
         AND b.IS_DELETE = 0
         AND c.IS_DELETE = 0
@@ -492,5 +501,19 @@
             AND b.REQUIRED_COMPLETION_TIME &gt; b.ACTUAL_COMPLETION
         </if>
     </select>
+    <select id="getIsExit" resultType="java.lang.Long">
+        SELECT id
+        FROM dj_jdgz_track_record
+        WHERE LEVEL3_NETWORK_ID = ${level3NetworkId}
+          AND process_name = #{processName}
+          AND is_delete = 0
+          AND update_date = (
+            SELECT MAX(update_date)
+            FROM dj_jdgz_track_record
+            WHERE LEVEL3_NETWORK_ID = ${level3NetworkId}
+              AND process_name = #{processName}
+              AND is_delete = 0
+        )
+    </select>
 
 </mapper>

--
Gitblit v1.9.1