From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java
index b98a0c7..2c3a1de 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java
@@ -2,6 +2,7 @@
 
 
 import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
+import cn.gistack.sm.intelligentCall.excel.CallExcel;
 import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
 import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -72,6 +73,20 @@
 	List<String> createCallTaskByParam(Map<String, Object> params);
 
 	/**
+	 * 根据条件自动创建外呼任务--一直未接通,一直未呼叫的水库
+	 * @param params
+	 * @return
+	 */
+	List<String> createCallTaskByParamByNotCall(Map<String, Object> params);
+
+	/**
+	 * 根据条件自动创建外呼任务--指定区域呼叫
+	 * @param params
+	 * @return
+	 */
+	List<String> createOutCallTaskJobHandlerByArea(Map<String, Object> params);
+
+	/**
 	 * 智能外呼呼叫前一天未接通人员
 	 * @param map 包含调度时间
 	 * @return
@@ -93,4 +108,27 @@
 	 * @return
 	 */
 	Object getCallResultList(IPage<CallTaskStatistic> page, CallTaskStatistic callTaskStatistic);
+
+	/**
+	 * 详情导出临时接口
+	 * @param callTaskResult
+	 * @param page
+	 * @return
+	 */
+	Object getCallResultListTemp(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult);
+
+	/**
+	 * 创建告警外呼任务
+	 * @param map
+	 * @return
+	 */
+	List<String> createOutCallTaskByAlarm(Map<String, Object> map);
+
+	/**
+	 * 导入表格发送智能外呼
+	 * @param list
+	 * @param time
+	 * @return
+	 */
+    Object importCall(List<CallExcel> list,String time);
 }

--
Gitblit v1.9.3