From 9dd748e0352f31b6255be2860c177db0d20ac40e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:41:35 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index cd63052..6e2c64e 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -85,6 +85,7 @@
<result property="managementDoctor" column="management_doctor"/>
<result property="managementDoctorCode" column="management_doctor_code"/>
<result property="currentPreachform" column="current_preachform"/>
+ <result property="taskSituation" column="task_situation"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -183,7 +184,8 @@
orgid,
visit_type,
management_doctor,
- management_doctor_code
+ management_doctor_code,
+ task_situation
from service_subtask
</sql>
@@ -624,6 +626,7 @@
<if test="managementDoctorCode != null">management_doctor_code,</if>
<if test="managementDoctor != null">management_doctor,</if>
<if test="currentPreachform != null">current_preachform,</if>
+ <if test="taskSituation != null">task_situation,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -708,6 +711,7 @@
<if test="managementDoctorCode != null">#{managementDoctorCode},</if>
<if test="managementDoctor != null">#{managementDoctor},</if>
<if test="currentPreachform != null">#{currentPreachform},</if>
+ <if test="taskSituation != null">#{taskSituation},</if>
</trim>
</insert>
@@ -797,6 +801,7 @@
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
</trim>
where id = #{id}
</update>
@@ -887,6 +892,7 @@
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
</trim>
<where>
<if test="patid != null ">and patid = #{patid}</if>
@@ -979,6 +985,7 @@
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -1068,6 +1075,7 @@
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
</trim>
where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
--
Gitblit v1.9.3