From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java |   86 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 70 insertions(+), 16 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 6c27bfe..3010962 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,13 +1,17 @@
 package cn.gistack.sm.intelligentCall.controller;
 
+import cn.gistack.sm.intelligentCall.entity.CallTaskResult;
 import cn.gistack.sm.intelligentCall.service.CallService;
+import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
+import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.*;
 
 /**
@@ -28,20 +32,10 @@
 	 * 创建任务
 	 * @return
 	 */
-	@GetMapping("/createCall")
-	public R createCall(){
-		List<Map<String,String>> list = new ArrayList<>();
-		Map<String,String> maps = new HashMap<>();
-		maps.put("phone","15170720695");
-		maps.put("name","测试水库");
-		maps.put("over","1.2");
-		maps.put("code","1241241122");
-		maps.put("userName","zrj");
-		maps.put("userId","123456");
-		list.add(maps);
-		callService.createTask(list);
+	@PostMapping("/createCall")
+	public R createCall(@RequestBody Map<String,Object> map){
 		// 返回
-		return R.status(true);
+		return R.data(callService.createTask(map));
 	}
 
 	/**
@@ -54,4 +48,64 @@
 		return R.data(callService.getCallDetail(taskId,calleeNumber));
 	}
 
+
+	/**
+	 * 查询呼叫列表信息
+	 * @param callTask
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/getCallListPage")
+	public R getCallListPage(CallTaskStatistic callTask, Query query){
+		// 返回
+		return R.data(callService.getCallListPage(Condition.getPage(query),callTask));
+	}
+
+
+	/**
+	 * 查询呼叫详情列表信息
+	 * @param callTaskResult
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/getCallTaskResultListPage")
+	public R getCallTaskResultListPage(CallTaskResultVO callTaskResult, Query query){
+		// 返回
+		return R.data(callService.getCallTaskResultListPage(Condition.getPage(query),callTaskResult));
+	}
+
+	/**
+	 * 导出呼叫详情列表信息
+	 * @param callTaskResult
+	 * @return
+	 */
+	@GetMapping("/getCallTaskResultList")
+	public R getCallTaskResultList(CallTaskResultVO callTaskResult){
+		// 返回
+		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));
+	}
+
 }

--
Gitblit v1.9.3