From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
index da3b3a7..dc7c0b4 100644
--- a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
@@ -3278,6 +3278,46 @@
</if>
</select>
+ <!--
+ 褰撳墠鐧诲綍浜恒�屽緟澶勭悊銆嶉殢璁夸换鍔★紝鎸夊嚭闄㈠勾鏈堬紙endtime锛夊垎缁勭粺璁★紝鍑洪櫌闅忚 / 闂ㄨ瘖闅忚鍒嗗紑璁℃暟銆�
+ 鍙ｅ緞锛堜笌闅忚鍒楄〃銆屽緟闅忚銆嶉〉绛句竴鑷达級锛�
+ 1) 鍑洪櫌闅忚 service_type = '2'锛岄棬璇婇殢璁� service_type = '3'
+ 2) 寰呴殢璁匡紙鏈畬鎴愶級鈫� sendstate IN (1,2,3,5,7)锛屾帓闄� 4 涓嶆墽琛� / 6 瀹屾垚
+ 3) 鍑洪櫌婊� 7 澶� 鈫� endtime < (浠婂ぉ - 7 澶�) + 1 澶╋紝
+ 鍗炽��7 澶╁墠閭ｄ竴澶┿�嶅嚭闄㈢殑涔熻鍏ワ紙鐢� <= DATE_SUB(...) 鍙細鎴埌褰撳ぉ 0 鐐癸紝浼氭紡鎺� 9 鏉★級
+ 4) 鍙湅鏈�杩� 4 涓嚭闄㈡湀浠斤紙鍚綋鏈堬級鈫� endtime >= 褰撴湀寰�鍓嶆帹 3 涓湀鐨� 1 鍙�
+ 5) 绉戝/鐥呭尯鏉冮檺鐢� OR锛堜笌鍒楄〃 deptOrDistrict=2 涓�鑷达級锛�
+ 鍙湁鐥呭尯鏉冮檺鐨勭敤鎴凤紝浠诲姟 leaveldeptcode 涓庢湰浜虹瀹ゅ涓嶄笂鏃朵篃鑳介噺鍒帮紝
+ 鍚﹀垯浼氭妸鏁存湀鏁版嵁杩囨护鎴� 0銆�
+ 璇存槑锛欸ROUP BY 鍙骇鍑烘湁鏁版嵁鐨勬湀浠斤紝鍓嶇鎸夈�屽綋鏈� + 鍓� 3 涓湀銆嶈ˉ榻愶紝娌℃暟鎹氨鏄剧ず 0 涓��
+ 涓嶅啀闄愬埗 current_preachform锛堜汉宸ワ級锛氳瀛楁鍙槸鎵ц鏂瑰紡锛�
+ 寰呴殢璁夸换鍔￠噷杩樻湁鐭俊绛夋柟寮忥紝闄愬畾 '1' 浼氭紡鏁般��
+ -->
+ <select id="countPendingManualTaskByMonth"
+ parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
+ resultType="java.util.Map">
+ SELECT DATE_FORMAT(endtime, '%Y-%m') AS month,
+ SUM(CASE WHEN service_type = '2' THEN 1 ELSE 0 END) AS dischargeCnt,
+ SUM(CASE WHEN service_type = '3' THEN 1 ELSE 0 END) AS outpatientCnt
+ FROM service_subtask
+ WHERE del_flag = '0'
+ AND service_type IN ('2', '3')
+ AND sendstate IN (1, 2, 3, 5, 7)
+ AND endtime IS NOT NULL
+ AND endtime < DATE_ADD(DATE_SUB(CURDATE(), INTERVAL 7 DAY), INTERVAL 1 DAY)
+ AND endtime >= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 3 MONTH), '%Y-%m-01')
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
+ <if test="campusid != null and campusid != ''">
+ AND campusid = #{campusid}
+ </if>
+ <!-- 绂婚櫌绉戝/鐥呭尯锛氭湁绉戝鎸夌瀹ゃ�佹湁鐥呭尯鎸夌梾鍖猴紝涓よ�呴兘鏈夋椂鍙� OR -->
+ <include refid="filterLeaveDimOr"/>
+ GROUP BY DATE_FORMAT(endtime, '%Y-%m')
+ ORDER BY month
+ </select>
+
<select id="getCurrentUserServiceSubtaskCount" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultType="map">
SELECT
--
Gitblit v1.9.3