From 47d87a4cd9ec58d44d93a73d0bf52613566cb261 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 27 Apr 2023 17:41:46 +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 | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 89b7000..ae0cbb5 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,9 +1,9 @@
package cn.gistack.sm.intelligentCall.controller;
-import cn.gistack.sm.intelligentCall.entity.CallTask;
+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 cn.gistack.sm.intelligentCall.vo.CallTaskVO;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -33,9 +33,9 @@
* @return
*/
@PostMapping("/createCall")
- public R createCall(@RequestBody List<Map<String,String>> list){
+ public R createCall(@RequestBody Map<String,Object> map){
// 返回
- return R.data(callService.createTask(list));
+ return R.data(callService.createTask(map));
}
/**
@@ -61,4 +61,17 @@
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));
+ }
+
}
--
Gitblit v1.9.3