From 8107dedd85ceec29491293d8ebf69f7d7213aa6b Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 21 九月 2026 15:24:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index e7f59c0..36e7245 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -2,9 +2,11 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.smartor.domain.*;
+import com.smartor.domain.DTO.MydTrendReqDTO;
+import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
+import com.smartor.domain.DTO.QuestionResultDTO;
import com.smartor.domain.ServiceSubtask;
-import com.smartor.domain.VO.HeLibraryCountVO;
-import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
+import com.smartor.domain.VO.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import org.springframework.web.bind.annotation.RequestBody;
@@ -51,6 +53,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);
@@ -120,6 +132,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(SltdMydTotalVO sltdMydTotalVO, List<ServiceSubtaskRes> serviceSubtaskRes);
+
/**
* 闆ㄧ划浠诲姟鎷夊彇
@@ -194,12 +220,33 @@
Map<String, Object> smsSubTask(Long subid);
/**
- * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮
+ * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮 (鐢ㄤ簬鏈嶅姟绫诲瀷 2)
*
* @param taskIds
* @return
*/
- public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime);
+ public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, 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, Date startFinishTime, Date endFinishTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType);
+
+ public Map<String, Map<String, List<QuestionCountKsOrBqDTO>>> statQuestionOptionByKsOrBq(QuestionCountKsOrBqVO questionCountKsOrBqVO);
public String scanGenerateSubtask(ServiceTask serviceTaskVo);
+
+ public List<MydTrendReqDTO> mydTrend(MydTrendReqVO mydTrendReqVO);
+
+ /**
+ * 鏍规嵁鏃堕棿缁欏害杩涜瀵规瘮婊℃剰搴﹀垎鏁�
+ * @param mydTrendReqVO
+ * @return
+ */
+ public List<MydTrendReqDTO> sltdMydTotalByDimension(MydTrendReqVO mydTrendReqVO);
+
+ public Integer matchOptionIndex(String url, String questionText, String voiceText, List<IvrTaskTemplateTargetoption> options, String uuid);
}
--
Gitblit v1.9.3