From a2989e934129341e30d13a649ea01e008a95348f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 27 May 2023 16:16:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

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

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java
index 5c83f22..d6bf920 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java
@@ -1,6 +1,7 @@
 package cn.gistack.sm.intelligentCall.controller;
 
 import cn.gistack.sm.intelligentCall.entity.CallTaskResult;
+import cn.gistack.sm.intelligentCall.entity.Scene;
 import cn.gistack.sm.intelligentCall.service.CallService;
 import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
 import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
@@ -85,4 +86,37 @@
 		return R.data(callService.getCallTaskResultList(callTaskResult));
 	}
 
+	/**
+	 * 查询智能外呼统计数据-按日期-行政区统计
+	 * @param callTaskStatistic
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/getOutgoingStatisticList")
+	public R getOutgoingStatisticList(CallTaskStatistic callTaskStatistic, Query query){
+		// 返回
+		return R.data(callService.getOutgoingStatisticList(Condition.getPage(query),callTaskStatistic));
+	}
+
+	/**
+	 * 查询智能外呼统计数据-行政区统计
+	 * @param callTaskStatistic
+	 * @return
+	 */
+	@GetMapping("/getOutgoingStatisticByArea")
+	public R getOutgoingStatisticByArea(CallTaskStatistic callTaskStatistic){
+		// 返回
+		return R.data(callService.getOutgoingStatisticByArea(callTaskStatistic));
+	}
+
+	/**
+	 * 根据条件自动创建外呼任务
+	 * @param params
+	 * @return
+	 */
+	@PostMapping("/createCallTaskByParams")
+	public R createCallTaskByParam(@RequestBody Map<String, Object> params){
+		// 返回
+		return R.data(callService.createCallTaskByParam(params));
+	}
 }

--
Gitblit v1.9.3