From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012
---
ruoyi-task/src/main/resources/mapper/task/ServiceTaskMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-task/src/main/resources/mapper/task/ServiceTaskMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceTaskMapper.xml
index ef4fb99..e2998b9 100644
--- a/ruoyi-task/src/main/resources/mapper/task/ServiceTaskMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceTaskMapper.xml
@@ -15,6 +15,7 @@
<result property="unexecuted" column="unexecuted"/>
<result property="fail" column="fail"/>
<result property="sendDay" column="send_day"/>
+ <result property="delayFinishDays" column="delay_finish_days"/>
<result property="checkuserid" column="checkuserid"/>
<result property="checkusername" column="checkusername"/>
<result property="checktime" column="checktime"/>
@@ -70,6 +71,7 @@
pat_cycle,
appltype,
send_day,
+ delay_finish_days,
long_task,
show_date,
compensate_date,
@@ -206,6 +208,7 @@
service_task.task_name,
service_task.appltype,
service_task.send_day,
+ service_task.delay_finish_days,
service_task.long_task,
service_task.show_date,
service_task.compensate_date,
@@ -488,6 +491,7 @@
<if test="leavehospitaldistrictcode != null ">leavehospitaldistrictcode,</if>
<if test="compensateDate != null and compensateDate != ''">compensate_date,</if>
<if test="sendDay != null ">send_day,</if>
+ <if test="delayFinishDays != null ">delay_finish_days,</if>
<if test="appltype != null ">appltype,</if>
<if test="patCycle != null ">pat_cycle,</if>
<if test="diagType != null and diagType != ''">diag_type,</if>
@@ -543,8 +547,9 @@
<if test="jsy != null and jsy != ''">#{jsy},</if>
<if test="leavehospitaldistrictname != null ">#{leavehospitaldistrictname},</if>
<if test="leavehospitaldistrictcode != null ">#{leavehospitaldistrictcode},</if>
- <if test="compensateDate != null and compensateDate != ''">#{compensateDate}</if>
+ <if test="compensateDate != null and compensateDate != ''">#{compensateDate},</if>
<if test="sendDay != null ">#{sendDay},</if>
+ <if test="delayFinishDays != null ">#{delayFinishDays},</if>
<if test="appltype != null ">#{appltype},</if>
<if test="patCycle != null ">#{patCycle},</if>
<if test="diagType != null and diagType != ''">#{diagType},</if>
@@ -608,6 +613,7 @@
</if>
<if test="compensateDate != null and compensateDate != ''">compensate_date = #{compensateDate},</if>
<if test="sendDay != null ">send_day = #{sendDay},</if>
+ <if test="delayFinishDays != null ">delay_finish_days = #{delayFinishDays},</if>
<if test="appltype != null ">appltype = #{appltype},</if>
<if test="patCycle != null ">pat_cycle = #{patCycle},</if>
<if test="diagType != null and diagType != ''">diag_type = #{diagType},</if>
--
Gitblit v1.9.3