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/java/com/ruoyi/task/service/IServiceSubtaskService.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/service/IServiceSubtaskService.java b/ruoyi-task/src/main/java/com/ruoyi/task/service/IServiceSubtaskService.java
index 6150ab1..046def5 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/service/IServiceSubtaskService.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/service/IServiceSubtaskService.java
@@ -99,6 +99,16 @@
public String addSubTaskAgain(ServiceSubtask ServiceSubtask);
/**
+ * 棣栨闅忚浠诲姟瓒呮椂鍚庯紝鎸変笅涓�浠诲姟鑷姩鐢熸垚鍐嶆闅忚浠诲姟锛堥殢璁夸腑蹇冿級銆�
+ * <p>
+ * 涓庢墜鍔ㄥ叆鍙ｇ殑宸紓锛氶殢璁夸腑蹇冪瀹ゆ湭閰嶇疆鏃跺洖閫�鍘熶换鍔＄瀹わ紱鍚屼竴鍘熶换鍔″彧鐢熸垚涓�鏉★紙閿� + 鏉′欢鏇存柊骞傜瓑锛夈��
+ *
+ * @param serviceSubtask 宸茶秴鏃剁殑棣栨闅忚瀛愪换鍔�
+ * @return 缁撴灉鎻忚堪
+ */
+ public String addSubTaskAgainByDeadline(ServiceSubtask serviceSubtask);
+
+ /**
* 淇敼鍗曚竴浠诲姟锛堥殢璁匡級
*
* @param ServiceSubtask 鍗曚竴浠诲姟锛堥殢璁匡級
@@ -171,12 +181,19 @@
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq);
- public Map<String, ServiceSubtaskScriptCount> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+ public Map<String, Object> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS);
public List<ServiceSubtaskDiagname> convertToDiagnameList(List<ServiceSubtask> subtaskList);
+ /**
+ * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺 -銆愰殢璁垮伐浣滃彴銆�
+ *
+ * @param entity 鏌ヨ鏉′欢锛堢瀹�/鐥呭尯鏉冮檺銆乻oonTimeoutHours 鍗冲皢瓒呮椂灏忔椂鏁扮瓑锛�
+ * @return 鍚� pendingVisitCount銆乫ailedVisitCount銆乤bnormalVisitCount銆亀arnningVisitCount銆�
+ * allVisitCount銆乻oonTimeoutCount 鐨勭粺璁＄粨鏋�
+ */
public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity entity);
/**
@@ -216,7 +233,13 @@
Map<String, Object> smsSubTask(Long subid);
-
+ /**
+ * 涓芥按涓尰闄㈠井淇″叕浼楀彿鍙戦�侊細master 鏂板鐨勫澶栧叆鍙ｏ紙瀹炵幇绫诲悓鍚嶆柟娉曪級銆�
+ * <p>
+ * 涓� {@link #smsSubTask(Long)} 鐨勫尯鍒細鐭俊璇疯蛋 ruoyi-message 鐨� SmsSenderFactory锛�
+ * 璇ュ叆鍙ｅ彧鍋氫附姘村井淇＄壒鏈夌殑閾捐矾锛屼緵闇�瑕佺洿鍙戝叕浼楀彿鐨勮皟鐢ㄦ柟浣跨敤銆�
+ */
+ Map<String, Object> weChatSubTask(Long subid);
--
Gitblit v1.9.3