From 87b79ea739ec32bd7d0e493a6ea8525212f6c763 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 10 十月 2026 15:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261008

---
 smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
index 5bcb9dd..2f0e429 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -12,6 +12,7 @@
 import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
 import com.smartor.domain.entity.ServiceSubtaskSatisfactionEntity;
+import com.smartor.domain.entity.SatisfactionStatQuery;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -240,6 +241,28 @@
     List<Long> querySendCount(ServiceSubtaskSatisfactionEntity serviceSubtaskSatisfactionEntity);
 
     /**
+     * 婊℃剰搴︽煴鐘跺浘锛氫竴娆℃�х粺璁℃湰娆¤姹傚叏閮ㄦā鏉跨殑鍙戦�侀噺锛堟寜 libtemplateid 鍒嗙粍锛�
+     * <p>
+     * 鏇夸唬閫愪釜妯℃澘璋冪敤 querySendCount 鐨� N+1 鍐欐硶锛岃 PatSatisfactionServiceImpl#satisfactionGraph
+     *
+     * @param query 鑱氬悎鏌ヨ鏉′欢
+     * @return 姣忚鍚� libtemplateid銆乧nt
+     */
+    List<Map<String, Object>> selectSatisfactionSendCount(SatisfactionStatQuery query);
+
+    /**
+     * 婊℃剰搴︾粺璁★細鍙煡鏈鏉′欢涓嬪疄闄呭瓨鍦ㄥ摢浜� type锛�1 璇煶 / 2 闂嵎锛�
+     * <p>
+     * 鏇夸唬 selectSatisfactionSubtaskList 鈥斺�� 鍘熸柟娉曚細鎶婃帴杩戝叏琛ㄧ殑涓婄櫨涓瓧娈垫煡鍥炴潵锛�
+     * 璋冪敤鏂瑰嵈鍙敤瀹冨垽鏂�岃闊冲垎鏀�/闂嵎鍒嗘敮鏄惁涓虹┖銆嶏紝瑙�
+     * PatSatisfactionServiceImpl#statistics / #statisticsByDimension
+     *
+     * @param patSatisfactionReqVO 鏌ヨ鏉′欢锛堜笌鍘� selectSatisfactionSubtaskList 瀹屽叏涓�鑷达級
+     * @return 鍘婚噸鍚庣殑 type 鍒楄〃锛堝彲鑳藉惈 null锛�
+     */
+    List<String> selectSatisfactionSubtaskTypes(PatSatisfactionReqVO patSatisfactionReqVO);
+
+    /**
      * 鎸夌梾鍖哄垎缁勭粺璁″欢缁姢鐞嗘暟閲�
      *
      * @param vo 鏌ヨ鏉′欢

--
Gitblit v1.9.3