From 87b79ea739ec32bd7d0e493a6ea8525212f6c763 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 10 十月 2026 15:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261008
---
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index a381b3d..09054bc 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -315,7 +315,6 @@
</if>
<if test="templateid != null and templateid != ''">and service_task.templateid = #{templateid}</if>
<if test="longTask != null and longTask != ''">and service_task.long_task = #{longTask}</if>
- <if test="serviceType != null and serviceType != ''">and service_task.service_type = #{serviceType}</if>
<if test="templatename != null and templatename != ''">and service_task.templatename like concat('%',
#{templatename},
'%')
@@ -331,7 +330,6 @@
</if>
<if test="checktime != null ">and service_task.checktime = #{checktime}</if>
<if test="sendDay != null ">and service_task.send_day = #{sendDay}</if>
- <if test="type != null and type != ''">and service_task.type = #{type}</if>
<if test="typename != null and typename != ''">and service_task.typename like concat('%', #{typename},
'%')
</if>
@@ -346,8 +344,8 @@
<if test="deptname != null and deptname != ''">and service_task.deptname = #{deptname}</if>
<if test="isupload != null ">and service_task.isupload = #{isupload}</if>
<if test="uploadTime != null ">and service_task.upload_time = #{uploadTime}</if>
- <if test="orgid != null and orgid != ''">and service_task.orgid = #{orgid}</if>
- <if test="campusid != null and campusid != ''">and service_task.campusid = #{campusid}</if>
+ <if test="orgid != null and orgid != ''">and service_task.orgid = #{orgid}</if>
+ <if test="campusid != null and campusid != ''">and service_task.campusid = #{campusid}</if>
<if test="compensateDate != null and compensateDate != ''">and service_task.compensate_date =
#{compensateDate}
</if>
@@ -462,6 +460,9 @@
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
<if test="campusid != null and campusid != ''">campusid,</if>
+ <if test="nexttaskflag != null">nexttaskflag,</if>
+ <if test="nexttaskid != null">nexttaskid,</if>
+ <if test="nexttaskname != null">nexttaskname,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="preachform != null">preachform,</if>
--
Gitblit v1.9.3