From 41ac1512f52f7670fff3200168b8bdd23c0b6489 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 20 十一月 2026 09:12:22 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
index 656298d..3e67ff4 100644
--- a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
@@ -1955,7 +1955,10 @@
continue_time_next,
task_situation,
finish_state,
- is_manually_called
+ is_manually_called,
+ <!-- 2026-11锛�/getSfStatistics 鐨勩�屾櫘閫� / 鏃ラ棿銆嶇粏鍒嗚闈犺繖涓�鍒楀垽鏂紝
+ 瑙� com.ruoyi.common.enums.ImportFlagEnum#isDaytime -->
+ importance_flag_code
from service_subtask
where 1=1
and del_flag = 0
@@ -2721,7 +2724,9 @@
remark,
doctor_opinion,
finish_state,
- is_manually_called
+ is_manually_called,
+ <!-- 2026-11锛氫笅閽绘槑缁嗗垪琛ㄨ鑳芥樉绀恒�屾棩闂�/鏅�氥�嶏紝涓� getSfStatistics 鐨勭粏鍒嗗悓婧� -->
+ importance_flag_code
from service_subtask
where 1=1
and del_flag = 0
@@ -2761,6 +2766,29 @@
#{serviceType}
</foreach>
</if>
+ <!--
+ 2026-11锛氥�屾櫘閫� / 鏃ラ棿銆嶄笅閽昏繃婊わ紙瀵瑰簲 /getSfStatistics 鏂板鐨� *Normal / *Daytime 瀛楁锛夈��
+ 鍒ゅ畾鍙e緞涓� Java 渚� ImportFlagEnum#isDaytime 瀹屽叏涓�鑷达細
+ 鏃ラ棿 = importance_flag_code 鍚�屾棩闂淬�嶏紙涓枃鎻忚堪鍙e緞锛氭棩闂存墜鏈�/鏃ラ棿璇婄枟锛�
+ 鎴栧惈 FH0165.01 / FH0165.02锛堟灇涓剧紪鐮佸彛寰勶級锛涘鍊艰銆屽寘鍚嵆鏃ラ棿銆嶃��
+ 鏅�� = 鍏朵綑鍏ㄩ儴锛屽惈 NULL / 绌轰覆 / 銆屾棤銆�/銆岀壒绾︿汉鍛樸��/銆岀浼戜汉鍛樸�嶃��
+ 鍏ュ弬 daytimeOnly锛�1-鍙湅鏃ラ棿锛�0-鍙湅鏅�氾紱涓嶄紶-涓嶉檺銆�
+ 鍓嶇涓嶇洿鎺ヤ紶瀹冿紝鑰屾槸浼� hyperLinkInfoType锛堝 dischargeCountDaytimeInfo /
+ nonFollowUpNormalInfo锛夛紝鐢� ServiceSubtaskServiceImpl#applyDaytimeHyperLinkInfoType
+ 瑙f瀽鍚庤惤鍒拌繖閲岋紱鐩存帴浼� daytimeOnly 涔熸敮鎸併��
+ 娉ㄦ剰 MySQL 鐨� NOT LIKE 瀵� NULL 杩斿洖 NULL锛屾墍浠ャ�屾櫘閫氥�嶅垎鏀鍏堟樉寮忔斁琛� IS NULL銆�
+ -->
+ <if test="daytimeOnly != null and daytimeOnly == 1">
+ AND (importance_flag_code LIKE '%鏃ラ棿%'
+ OR importance_flag_code LIKE '%FH0165.01%'
+ OR importance_flag_code LIKE '%FH0165.02%')
+ </if>
+ <if test="daytimeOnly != null and daytimeOnly == 0">
+ AND (importance_flag_code IS NULL
+ OR (importance_flag_code NOT LIKE '%鏃ラ棿%'
+ AND importance_flag_code NOT LIKE '%FH0165.01%'
+ AND importance_flag_code NOT LIKE '%FH0165.02%'))
+ </if>
<!-- 2026-10-21锛歷isit_time 涓虹┖鏃舵寜瀹屾垚/鍒涘缓鏃堕棿鍏滃簳 -->
<if test="startTime != null and endTime!=null">
AND IFNULL(visit_time, IFNULL(finishtime, create_time)) >= DATE(#{startTime})
--
Gitblit v1.9.3