From ed6259e22e246a7ec1264319c4bd93cfb72afeb1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 25 Apr 2023 21:34:17 +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 | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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 dd20993..88212d7 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,14 @@
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.*;
@@ -43,4 +48,30 @@
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));
+ }
+
}
--
Gitblit v1.9.3