From 386a8176479baa207c9abe1327c49609ce23af65 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:47:09 +0800
Subject: [PATCH] 合并修改
---
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index 2ec5625..54d5f9e 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -23,6 +23,12 @@
*/
public interface IServiceSubtaskService {
/**
+ * 涓芥按涓尰闄� orgid銆�
+ * 寰俊鍏紬鍙峰凡棰嗗彇鏈～鍐欐寜榛樿閫夐」瀹屾垚锛屾殏鏃跺彧瀵硅鏈烘瀯鐢熸晥锛屽叾浠栧尰闄粛璧板師琛ュ伩閫昏緫銆�
+ */
+ String WECHAT_DEFAULT_COMPLETE_ORGID = "47231022633110211A2101";
+
+ /**
* 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級
*
* @param id 鍗曚竴浠诲姟锛堥殢璁匡級涓婚敭
@@ -200,7 +206,15 @@
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq);
- public Map<String, ServiceSubtaskScriptCount> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+ public Map<String, Object> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
+ /**
+ * 闂閫夐」鏁板瓧涓嬮捇锛氭煡璇㈤�夋嫨浜嗘寚瀹氶�夐」鐨� service_subtask 鍒楄〃
+ *
+ * @param serviceSubtaskCountReq 缁熻缁村害銆佺瀹�/鐥呭尯銆佷换鍔°�侀鐩強閫夐」鏉′欢
+ * @return service_subtask 鍒楄〃
+ */
+ public List<ServiceSubtask> getSfStatisticsScriptDetailsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq);
public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS);
@@ -233,6 +247,19 @@
*/
public void setFailSubTaskDefalutVal(Long failDay);
+ /**
+ * 寰俊鍏紬鍙峰凡棰嗗彇鏈～鍐欙細鎸夐鐩粯璁ら�夐」琛ラ綈褰撳墠瀛愪换鍔★紝骞跺皢褰撳墠瀛愪换鍔″畬鎴愩��
+ * <p>
+ * 浠呭鐞嗕紶鍏ョ殑褰撳墠瀛愪换鍔★紙subid锛夛紝鍙厑璁革細
+ * 闂嵎绫诲瀷(type=2)銆佸綋鍓嶅彂閫佹柟寮忎负鍏紬鍙�(5)銆佸瓙浠诲姟宸查鍙�(1)銆佹湭鎻愪氦(submit!=1)銆�
+ * 褰撳墠鍏紬鍙峰彂閫佹柟寮忎负宸插彂閫�(2)/宸查鍙�(3) 鐨勬暟鎹��
+ * 鍏朵粬浠诲姟銆佸叾浠栧彂閫佹柟寮忋�佸叾浠栧瓙浠诲姟鍧囦笉鍙楀奖鍝嶃��
+ *
+ * @param serviceSubtask 褰撳墠瀛愪换鍔�
+ * @return true=宸叉寜榛樿閫夐」瀹屾垚锛沠alse=涓嶆弧瓒虫潯浠舵垨娌℃湁鍙～鍏呯殑榛樿閫夐」
+ */
+ public Boolean completeWechatClaimedByDefault(ServiceSubtask serviceSubtask);
+
public Map<String, Object> getHeLibraryCount(@RequestBody HeLibraryCountVO heLibraryCountVO);
public List<ServiceSubtask> gethelibraryCountHyperlink(@RequestBody HeLibraryCountVO heLibraryCountVO);
--
Gitblit v1.9.3