From 0f22f66ae9d2156b983f533beb17a0062a949524 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 26 十月 2025 20:46:28 +0800
Subject: [PATCH] Merge branch 'master' into 1027-master
---
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 1c27746..5110723 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -33,6 +33,7 @@
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="preachform" column="preachform"/>
+ <result property="preachformDesc" column="preachform_desc"/>
<result property="sendType" column="send_type"/>
<result property="sendState" column="send_state"/>
<result property="hospType" column="hosp_type"/>
@@ -79,6 +80,7 @@
text_param,
templateid,
templatename,
+ preachform_desc,
labelinfo,
count,
executed,
@@ -235,6 +237,7 @@
service_task.pid,
service_task.guid,
service_task.preachform,
+ service_task.preachform_desc,
service_task.send_type,
service_task.send_state,
service_task.send_time_slot,
@@ -332,7 +335,7 @@
<select id="selectServiceTaskByTaskid" parameterType="Long" resultMap="ServiceTaskResult">
<include refid="selectServiceTaskVo"/>
- where taskid = #{taskid}
+ where taskid = #{taskid} and del_flag=0
</select>
<insert id="insertServiceTask" parameterType="com.smartor.domain.ServiceTask" useGeneratedKeys="true"
@@ -365,6 +368,7 @@
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="preachform != null">preachform,</if>
+ <if test="preachformDesc != null">preachform_desc,</if>
<if test="sendType != null">send_type,</if>
<if test="sendState != null">send_state,</if>
<if test="hospType != null and hospType != ''">hosp_type,</if>
@@ -419,6 +423,7 @@
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="preachform != null">#{preachform},</if>
+ <if test="preachformDesc != null">#{preachformDesc},</if>
<if test="sendType != null">#{sendType},</if>
<if test="sendState != null">#{sendState},</if>
<if test="hospType != null and hospType != ''">#{hospType},</if>
@@ -477,6 +482,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="preachform != null">preachform = #{preachform},</if>
+ <if test="preachformDesc != null">preachform_desc = #{preachformDesc},</if>
<if test="sendType != null">send_type = #{sendType},</if>
<if test="sendState != null">send_state = #{sendState},</if>
<if test="hospType != null and hospType != ''">hosp_type = #{hospType},</if>
@@ -498,10 +504,10 @@
</if>
<if test="leavehospitaldistrictcode != null ">leavehospitaldistrictcode = #{leavehospitaldistrictcode},
</if>
- <if test="compensateDate != null and compensateDate != ''">compensate_date = #{compensateDate}</if>
- <if test="sendDay != null ">send_day = #{sendDay}</if>
- <if test="appltype != null ">appltype = #{appltype}</if>
- <if test="patCycle != null ">pat_cycle = #{patCycle}</if>
+ <if test="compensateDate != null and compensateDate != ''">compensate_date = #{compensateDate},</if>
+ <if test="sendDay != null ">send_day = #{sendDay},</if>
+ <if test="appltype != null ">appltype = #{appltype},</if>
+ <if test="patCycle != null ">pat_cycle = #{patCycle},</if>
</trim>
where taskid = #{taskid}
</update>
--
Gitblit v1.9.3