From 12c684efe62b0adf7a8b125c81da4d6b657aa06e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 May 2023 11:48:30 +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 | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 7054178..9e333f1 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
@@ -37,7 +37,8 @@
@InterceptorIgnore(tenantLine = "true")
List<CallTaskResultVO> getCallTaskResultListPage(@Param("page") IPage<CallTaskResultVO> page,
@Param("callTaskResult") CallTaskResultVO callTaskResult,
- @Param("list") List<String> list);
+ @Param("list") List<String> list,
+ @Param("idsList") List<String> idsList);
/**
* 通过水库编码获取行政区名称
@@ -49,9 +50,27 @@
/**
* 通过行政区编号获取水库名称
+ * @param adCode
+ * @return
+ */
+ @DS("zt")
+ List<String> getWaterNameByAreaCode(@Param("adCode") String adCode);
+
+ /**
+ * 查询所有下级区域
* @param areaCode
* @return
*/
@DS("zt")
- List<String> getWaterNameByAreaCode(@Param("adCode") String areaCode);
+ List<String> getAllChildrenAreaByAreaCode(@Param("areaCode") String areaCode);
+
+ /**
+ * 查询智能外呼统计数据-按日期-行政区统计
+ * @param callTaskStatistic
+ * @return
+ */
+ @DS("zt")
+ List<CallTaskStatistic> getOutgoingStatisticList(@Param("page") IPage<CallTaskStatistic> page,
+ @Param("callTaskStatistic") CallTaskStatistic callTaskStatistic,
+ @Param("list") List<String> list);
}
--
Gitblit v1.9.3