From 83c49918bb3709fce818fcdeb8c1db147eadcede Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 16 七月 2026 16:44:15 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 6982d8f..32ead8b 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -2898,7 +2898,7 @@
<if test="sendstate != null">
AND sendstate = #{sendstate}
</if>
- <if test="isFinished != null and isFinished != '0'">
+ <if test="isFinished != null and isFinished == '1'">
AND finishtime is not null
</if>
<if test="starttime != null">AND starttime >= #{starttime}</if>
@@ -2994,10 +2994,10 @@
<if test="orgid != null and orgid != ''">
and orgid = #{orgid}
</if>
- <if test="sendstate != null and isFinished != '0'">
+ <if test="sendstate != null">
AND sendstate = #{sendstate}
</if>
- <if test="isFinished != null">
+ <if test="isFinished != null and isFinished == '1'">
AND finishtime is not null
</if>
<if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">
--
Gitblit v1.9.3