From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index 93ae55b..d1d22e1 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -2,12 +2,16 @@
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.smartor.domain.*;
+import com.smartor.domain.DTO.QuestionResultDTO;
 import com.smartor.domain.ServiceSubtask;
 import com.smartor.domain.VO.HeLibraryCountVO;
+import com.smartor.domain.VO.QuestionResultVO;
 import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
+import com.smartor.domain.VO.TransferDeptVO;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -51,6 +55,16 @@
      */
     public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity);
 
+    public List<ServiceSubtask> getServiceSubtasks(ServiceSubtaskEntity serviceSubtaskEntity);
+
+    /**
+     * 杞Щ绉戝鐥呭尯
+     *
+     * @param transferDeptVO
+     * @return
+     */
+    public Integer transferDept(TransferDeptVO transferDeptVO);
+
     public List<ServiceSubtask> patItem2(ServiceSubtaskEntity serviceSubtaskEntity);
 
     public Map<String, Object> patItemCount(ServiceSubtaskEntity serviceSubtaskEntity);
@@ -61,7 +75,7 @@
      * @param ServiceSubtask 鍗曚竴浠诲姟锛堥殢璁匡級
      * @return 缁撴灉
      */
-    public int insertServiceSubtask(ServiceSubtask ServiceSubtask);
+    public Map<String, Object> insertServiceSubtask(ServiceSubtask ServiceSubtask);
 
     /**
      * 鍐嶆鏂板鍗曚竴浠诲姟锛堥殢璁匡級
@@ -81,6 +95,7 @@
 
     /**
      * 瀛愪换鍔℃ā鏉夸慨鏀�
+     *
      * @param serviceSubtaskTemplateVO
      * @return
      */
@@ -118,6 +133,20 @@
      * @return 缁撴灉
      */
     public PhoneCallBackYQVO phoneCallBackYQ(PhoneCallReqYQVO phoneCallReqYQVO);
+
+    public PhoneCallBackSHVO getFirstQues(PhoneCallReqYQVO phoneCallReqYQVO);
+
+    public PhoneCallBackSHVO processResust(PhoneCallResultYQVO phoneCallReqYQVO);
+
+    /**
+     * 闂缁撴灉鍗犳瘮
+     *
+     * @param QuestionResultVO
+     * @param serviceSubtaskRes
+     * @return
+     */
+    public List<ServiceSubtaskDetailRatioExport> getDetailRatio(QuestionResultVO questionResultVO, List<ServiceSubtaskRes> serviceSubtaskRes);
+
 
     /**
      * 闆ㄧ划浠诲姟鎷夊彇
@@ -187,12 +216,27 @@
 
     public Map<String, Object> getHeLibraryCount(@RequestBody HeLibraryCountVO heLibraryCountVO);
 
+    public List<ServiceSubtask> gethelibraryCountHyperlink(@RequestBody HeLibraryCountVO heLibraryCountVO);
+
     Map<String, Object> smsSubTask(Long subid);
 
     /**
-     * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮
+     * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮 (鐢ㄤ簬鏈嶅姟绫诲瀷 2)
+     *
      * @param taskIds
      * @return
      */
-    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds);
+    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType);
+
+    /**
+     * 鏍规嵁瀛愪换鍔� ID 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮锛堢敤浜庢弧鎰忓害缁熻 serviceType=6锛�
+     *
+     * @param subtaskIds 瀛愪换鍔� ID 鍒楄〃
+     * @return
+     */
+    public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType);
+
+    public String scanGenerateSubtask(ServiceTask serviceTaskVo);
+
+    public Integer matchOptionIndex(String url, String questionText, String voiceText, List<IvrTaskTemplateTargetoption> options, String uuid);
 }

--
Gitblit v1.9.3