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 | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 173 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 b29d062..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
@@ -1,5 +1,6 @@
package cn.gistack.sm.intelligentCall.mapper;
+import cn.gistack.sm.intelligentCall.entity.Scene;
import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -9,13 +10,13 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* @author zhongrj
* @date 2023-04-25
*/
@Mapper
-@DS("ztznwh")
public interface CallTaskMapper{
/**
@@ -24,6 +25,7 @@
* @param callTask
* @return
*/
+ @DS("ztznwh")
@InterceptorIgnore(tenantLine = "true")
List<CallTaskStatistic> getCallListPage(@Param("page") IPage<CallTaskStatistic> page, @Param("callTask") CallTaskStatistic callTask);
@@ -31,7 +33,176 @@
* 查询呼叫详情列表信息
* @param callTaskResult
* @param page
+ * @param list
+ * @param idsList
* @return
*/
- List<CallTaskResultVO> getCallTaskResultListPage(@Param("page") IPage<CallTaskResultVO> page,@Param("callTaskResult") CallTaskResultVO callTaskResult);
+ @DS("ztznwh")
+ @InterceptorIgnore(tenantLine = "true")
+ List<CallTaskResultVO> getCallTaskResultListPage(@Param("page") IPage<CallTaskResultVO> page,
+ @Param("callTaskResult") CallTaskResultVO callTaskResult,
+ @Param("list") List<String> list,
+ @Param("idsList") List<String> idsList);
+
+ /**
+ * 通过水库编码获取行政区名称
+ * @param adCode
+ * @return
+ */
+ @DS("zt")
+ String getAreaNameByAdCode(@Param("adCode") String adCode);
+
+ /**
+ * 通过行政区编号获取水库名称
+ * @param adCode
+ * @return
+ */
+ @DS("zt")
+ List<String> getWaterNameByAreaCode(@Param("adCode") String adCode);
+
+ /**
+ * 查询所有下级区域
+ * @param areaCode
+ * @return
+ */
+ @DS("zt")
+ List<String> getAllChildrenAreaByAreaCode(@Param("areaCode") String areaCode);
+
+ /**
+ * 查询智能外呼统计数据-按日期-行政区统计
+ * @param page
+ * @param callTaskStatistic
+ * @param list
+ * @return
+ */
+ @DS("zt")
+ List<CallTaskStatistic> getOutgoingStatisticList(@Param("page") IPage<CallTaskStatistic> page,
+ @Param("callTaskStatistic") CallTaskStatistic callTaskStatistic,
+ @Param("list") List<String> list);
+
+ /**
+ * 查询智能外呼统计数据-行政区统计
+ * @param callTaskStatistic
+ * @return
+ */
+ @DS("zt")
+ List<CallTaskStatistic> getOutgoingStatisticByArea(@Param("callTaskStatistic") CallTaskStatistic callTaskStatistic);
+
+ /**
+ * 查询外呼多少天内已呼叫过的人员手机号集合信息
+ * @param params
+ * @return
+ */
+ List<String> getCallUserPhoneByParam(@Param("params")Map<String, Object> params);
+
+ /**
+ * 通过任务名称查询taskId
+ * @param taskName
+ * @return
+ */
+ @DS("znwh")
+ String getTaskIdByTaskName(@Param("taskName") String taskName);
+
+ /**
+ * 查询前一天呼叫未接通人员
+ * @return
+ */
+ @DS("znwh")
+ List<Scene> getBeforeOneDayCallNotConnect(@Param("params")Map<String, Object> params);
+
+ /**
+ * 查询前一天已填报的人员
+ * @param map
+ * @return
+ */
+ List<String> getFillRecordList(@Param("params") Map<String, Object> map);
+
+ /**
+ * 查询三天都未接通的人员
+ * @param map
+ * @return
+ */
+ @DS("znwh")
+ List<String> getBeforeThreeDayCallNotConnect(@Param("params") Map<String, Object> map);
+
+ /**
+ * 查询 按区域统计连续三天，连续两天未接通，前一天拒接对应的数量
+ * @param callTaskStatistic
+ * @param resultStatus
+ * @param number
+ * @param day
+ * @return
+ */
+ @DS("zt")
+ @InterceptorIgnore(tenantLine = "true")
+ List<CallTaskStatistic> getNotCallConnectStatisticList(@Param("callTaskStatistic") CallTaskStatistic callTaskStatistic,
+ @Param("resultStatus") String resultStatus,
+ @Param("number") Integer number,
+ @Param("day") Map<String, Object> day);
+
+ /**
+ * 查询未接通，拒接的呼叫结果详情列表信息
+ * @param page
+ * @param list
+ * @param callTaskStatistic
+ * @param day
+ * @return
+ */
+ List<CallTaskStatistic> getCallNotConnectResultList(@Param("page") IPage<CallTaskStatistic> page,
+ @Param("list") List<String> list,
+ @Param("callTaskStatistic") CallTaskStatistic callTaskStatistic,
+ @Param("day") Map<String, Object> day);
+
+ /**
+ * 通过 taskId 查询未呼叫人员（mysql）
+ * @param taskId
+ * @return
+ */
+ @DS("znwh")
+ List<Scene> getCallNotConnectListByTaskId(@Param("taskId") String taskId);
+
+ /**
+ * 查询当前天除去日常呼叫外的统计数据
+ * @param callTaskStatistic
+ * @return
+ */
+ List<CallTaskStatistic> getNoDayOutgoingStatisticList(@Param("callTaskStatistic") CallTaskStatistic callTaskStatistic);
+
+ /**
+ * 按日期行政区呼叫结果详情列表信息
+ * @param callTaskStatistic (count 1:查所有被叫号码 2：查接通号码 3：查未接通号码 4：查拒接号码)
+ * @param page
+ * @return
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ List<CallTaskStatistic> getCallResultList(@Param("page") IPage<CallTaskStatistic> page,
+ @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