From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 25 +++++++++++++++++++++++++
1 files changed, 25 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 055cbe3..577071e 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
@@ -8,6 +8,9 @@
import cn.gistack.sm.intelligentCall.service.ICallSmsNoticeTaskService;
import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
+import cn.gistack.sm.sjztmd.word.vo.DzkInfo;
+import cn.gistack.sm.sjztmd.word.vo.OverDetail;
+import cn.gistack.sm.sjztmd.word.vo.TotalInfo;
import com.alibaba.excel.EasyExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -186,6 +189,20 @@
return R.data(callService.getCallResultListTemp(Condition.getPage(query),callTaskResult));
}
+ /**
+ * 外呼数据导出
+ * @param callTaskResult
+ * @param response
+ * @return
+ */
+ @GetMapping("/exportCallResultList")
+ public void getCallResultListTemp(CallTaskResultVO callTaskResult,Query query,HttpServletResponse response) throws Exception {
+ //获取总览、大中库、明细数据
+ List<CallTaskResultVO> callTaskResultVOList
+ = callService.getCallResultListTemp(Condition.getPage(query), callTaskResult);
+ cn.gistack.sm.intelligentCall.util.ExcelUtil.generateExcel(response,callTaskResultVOList,callTaskResult);
+ }
+
/**
* 导入表格发送智能外呼
@@ -216,4 +233,12 @@
List<CallExcel> list = new ArrayList<>();
ExcelUtil.export(response, "智能外呼数据模板", "智能外呼数据表", list, CallExcel.class);
}
+
+ /**
+ * 测试接口-调用外呼库查询任务详情信息
+ */
+ @GetMapping("/getTaskDetail")
+ public R getTaskDetail(Integer taskId) {
+ return R.data(callService.getTaskDetail(taskId));
+ }
}
--
Gitblit v1.9.3