From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml |   95 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
index 19c62c2..afedfde 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
@@ -17,6 +17,14 @@
         <result property="radix" column="radix"/>
         <result property="guid" column="guid"/>
         <result property="orgid" column="orgid"/>
+        <result property="url" column="url"/>
+        <result property="wardCode" column="ward_code"/>
+        <result property="wardName" column="ward_name"/>
+        <result property="deptCode" column="dept_code"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="taskId" column="task_id"/>
+        <result property="subId" column="sub_id"/>
+
     </resultMap>
 
     <sql id="selectServiceOutPathVo">
@@ -26,11 +34,18 @@
                param3,
                param5,
                param6,
+               task_id,
+               sub_id,
                create_time,
                update_time,
                radix,
                guid,
                orgid,
+               url,
+               ward_code,
+               ward_name,
+               dept_code,
+               dept_name,
                del_flag
         from service_out_path
     </sql>
@@ -61,7 +76,28 @@
         <if test="radix != null  and radix != ''">
             and radix=#{radix}
         </if>
+        <if test="url != null  and url != ''">
+            and url=#{url}
+        </if>
+        <if test="wardCode != null  and wardCode != ''">
+            and ward_code=#{wardCode}
+        </if>
 
+        <if test="wardName != null  and wardName != ''">
+            and ward_name=#{wardName}
+        </if>
+        <if test="deptCode != null  and deptCode != ''">
+            and dept_code=#{deptCode}
+        </if>
+        <if test="deptName != null  and deptName != ''">
+            and dept_name=#{deptName}
+        </if>
+        <if test="subId != null">
+            and sub_id=#{subId}
+        </if>
+        <if test="taskId != null">
+            and task_id=#{taskId}
+        </if>
     </select>
 
     <select id="selectServiceOutPathById" parameterType="Long"
@@ -90,7 +126,22 @@
             </if>
             <if test="createTime != null">create_time,
             </if>
-
+            <if test="url != null">url,
+            </if>
+            <if test="wardCode != null">ward_code,
+            </if>
+            <if test="wardName != null">ward_name,
+            </if>
+            <if test="deptCode != null">dept_code,
+            </if>
+            <if test="deptName != null">dept_name,
+            </if>
+            <if test="subId != null">
+                sub_id,
+            </if>
+            <if test="taskId != null ">
+                task_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="param1 != null">#{param1},
@@ -108,6 +159,22 @@
             <if test="orgid != null">#{orgid},
             </if>
             <if test="createTime != null">#{createTime},
+            </if>
+            <if test="url != null">#{url},
+            </if>
+            <if test="wardCode != null">#{wardCode},
+            </if>
+            <if test="wardName != null">#{wardName},
+            </if>
+            <if test="deptCode != null">#{deptCode},
+            </if>
+            <if test="deptName != null">#{deptName},
+            </if>
+            <if test="subId != null ">
+                #{subId},
+            </if>
+            <if test="taskId != null ">
+                #{taskId},
             </if>
         </trim>
     </insert>
@@ -139,6 +206,30 @@
             <if test="orgid != null">orgid =
                 #{orgid},
             </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="url != null">url =
+                #{url},
+            </if>
+            <if test="wardCode != null">ward_code =
+                #{wardCode},
+            </if>
+            <if test="wardName != null">ward_name =
+                #{wardName},
+            </if>
+            <if test="deptCode != null">dept_code =
+                #{deptCode},
+            </if>
+            <if test="deptName != null">dept_name =
+                #{deptName},
+            </if>
+            <if test="subId != null">
+                sub_id=#{subId},
+            </if>
+            <if test="taskId != null">
+                task_id=#{taskId},
+            </if>
         </trim>
         where id = #{id}
     </update>
@@ -166,7 +257,7 @@
         FROM INFORMATION_SCHEMA.TABLES
         WHERE TABLE_NAME = 'service_out_path'
           AND table_schema = DATABASE()
-          and onorgid
+--           and onorgid
     </select>
 
 </mapper>

--
Gitblit v1.9.3