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/mapper/CallTaskMapper.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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..d878c84 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,35 @@
* @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();
}
--
Gitblit v1.9.3