From c3117a0c5c7b2b69c56cfc50fe5c199c2c2276c1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 13:50:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index dfe8dfd..c55d298 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -36,6 +36,7 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="orgid" column="orgid"/>
+ <result property="campusid" column="campusid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="taskGuid" column="task_guid"/>
@@ -92,6 +93,7 @@
<result property="continueContent" column="continue_content"/>
<result property="continueCount" column="continue_count"/>
<result property="continueTimeNext" column="continue_time_next"/>
+ <result property="operationItemId" column="operation_item_id"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -212,6 +214,7 @@
continue_content,
continue_count,
continue_time_next,
+ operation_item_id,
task_situation
from service_subtask
</sql>
@@ -264,6 +267,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where del_flag = 0
+ <if test="subId != null ">and id = #{subId}</if>
<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
<if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if>
<if test="continueCount != null ">and continue_count = #{continueCount}</if>
@@ -809,6 +813,7 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
+ <if test="campusid != null">campusid,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="textParam != null">text_param,</if>
@@ -871,6 +876,7 @@
<if test="continueCount != null ">continue_count,</if>
<if test="continueTimeNext != null ">continue_time_next,</if>
<if test="continueContent != null ">continue_content,</if>
+ <if test="operationItemId != null ">operation_item_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -900,6 +906,7 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="orgid != null">#{orgid},</if>
+ <if test="campusid != null">#{campusid},</if>
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="textParam != null">#{textParam},</if>
@@ -962,6 +969,7 @@
<if test="continueCount != null ">#{continueCount},</if>
<if test="continueTimeNext != null ">#{continueTimeNext,jdbcType=TIMESTAMP},</if>
<if test="continueContent != null ">#{continueContent},</if>
+ <if test="operationItemId != null ">#{operationItemId},</if>
</trim>
</insert>
@@ -996,6 +1004,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1058,6 +1067,7 @@
<if test="continueCount != null ">continue_count = #{continueCount},</if>
<if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if>
<if test="continueContent != null ">continue_content = #{continueContent},</if>
+ <if test="operationItemId != null ">operation_item_id = #{operationItemId},</if>
</trim>
where id = #{id}
</update>
@@ -1093,6 +1103,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1195,6 +1206,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="visitCount != null">visit_count = #{visitCount},</if>
@@ -1294,6 +1306,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1391,6 +1404,7 @@
deptname,
sendstate,
preachform,
+ current_preachform,
excep,
nurse_id,
nurse_name,
--
Gitblit v1.9.3