From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java
index 0079e02..517c627 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java
@@ -174,7 +174,41 @@
 	 * @param page
 	 * @return
 	 */
+	@InterceptorIgnore(tenantLine = "true")
 	List<CallTaskStatistic> getCallResultList(@Param("page") IPage<CallTaskStatistic> page,
-											  @Param("list") List<String> list,
 											  @Param("callTaskStatistic") CallTaskStatistic callTaskStatistic);
+
+	/**
+	 * 详情导出临时接口
+	 * @param callTaskResult
+	 * @param page
+	 * @return
+	 */
+	@DS("ztznwh")
+	@InterceptorIgnore(tenantLine = "true")
+	List<CallTaskResultVO> getCallResultListTemp(@Param("page") IPage<CallTaskResultVO> page,
+												 @Param("callTaskResult")  CallTaskResultVO callTaskResult,
+												 @Param("list")  List<String> list);
+
+	/**
+	 * 查询从未接通和从未呼叫的水库
+	 * @return
+	 */
+	@DS("ztznwh")
+	@InterceptorIgnore(tenantLine = "true")
+    List<Scene> getNotCallOrCallNotConnect();
+
+	/**
+	 * 按区域查询需要呼叫的人员信息
+	 * @return
+	 */
+	@DS("ztznwh")
+	@InterceptorIgnore(tenantLine = "true")
+	List<Scene> getCallListByArea();
+
+	/**
+	 * 测试接口-调用外呼库查询任务详情信息
+	 */
+	@DS("znwh")
+    Map<Object,Object> getTaskDetail(@Param("taskId") Integer taskId);
 }

--
Gitblit v1.9.3