From f0aae4b39afbcbb18fb5a0b32e3ca689662c5ca7 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 10 三月 2025 08:21:31 +0800
Subject: [PATCH] jar

---
 src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml |   76 +++++++++++++++++++++++++++-----------
 1 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml b/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
index ff2aa69..dad57e4 100644
--- a/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
+++ b/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
@@ -33,28 +33,28 @@
         LEFT JOIN dj_jdgz_network_level1_list b on b.NETWORK_ID = c.ID
         LEFT JOIN dj_jdgz_network_level2_list d on d.ID = a.LEVEL2_NODE_ID
         where
-            a.is_delete = 0
-            and b.is_delete = 0
-            and c.is_delete = 0
-            and d.is_delete = 0
-            <if test="shipId!=null">
-                and c.ship_id = ${shipId}
-            </if>
-            <if test="deptId!=null">
-                and a.dept_id = ${deptId}
-            </if>
-            <if test="teamId!=null">
-                and a.TEAMGROUP_ID = ${teamId}
-            </if>
-            <if test="cabinId!=null">
-                and a.cabin_id  LIKE '%${cabinId}%'
-            </if>
-            <if test="type!=null and type!=''">
-                and a.type  = #{type}
-            </if>
-            <if test="name!=null and name!=''">
-                and a.name  LIKE '%${name}%'
-            </if>
+        a.is_delete = 0
+        and b.is_delete = 0
+        and c.is_delete = 0
+        and d.is_delete = 0
+        <if test="shipId!=null">
+            and c.ship_id = ${shipId}
+        </if>
+        <if test="deptId!=null">
+            and a.dept_id = ${deptId}
+        </if>
+        <if test="teamId!=null">
+            and a.TEAMGROUP_ID = ${teamId}
+        </if>
+        <if test="cabinId!=null">
+            and a.cabin_id LIKE '%${cabinId}%'
+        </if>
+        <if test="type!=null and type!=''">
+            and a.type = #{type}
+        </if>
+        <if test="name!=null and name!=''">
+            and a.name LIKE '%${name}%'
+        </if>
         group by a.id
     </select>
 
@@ -93,6 +93,38 @@
             and a.TEAMGROUP_ID = ${teamId}
         </if>
     </select>
+    <select id="getNodeList" resultType="com.example.server.progressTrack.Dto.TableNodeDto">
+        SELECT
+        b.name,
+        a.NETWORK_ID,
+        a.process_name,
+        a.ID, a.REQUIRED_COMPLETION_TIME, a.ACTUAL_COMPLETION, a.CURRENT_STATUS
+        FROM `dj_jdgz_network_level3_list` a
+        LEFT JOIN dj_jdgz_network_level3 b on b.ID = a.NETWORK_ID
+        LEFT JOIN dj_jdgz_network_level1 c on c.ID = b.LEVEL1_NETWORK_ID
+        where
+        a.is_delete = 0
+        and b.is_delete = 0
+        and c.is_delete = 0
+        <if test="shipId!=null">
+            and c.ship_id = ${shipId}
+        </if>
+        <if test="deptId!=null">
+            and b.dept_id = ${deptId}
+        </if>
+        <if test="teamId!=null">
+            and b.TEAMGROUP_ID = ${teamId}
+        </if>
+        <if test="cabinId!=null">
+            and b.cabin_id LIKE '%${cabinId}%'
+        </if>
+        <if test="type!=null and type!=''">
+            and b.type = #{type}
+        </if>
+        <if test="name!=null and name!=''">
+            and b.name LIKE '%${name}%'
+        </if>
+    </select>
 
 
 </mapper>

--
Gitblit v1.9.1