From bb60b5747d5f4b85655a541d4990ec7464497b1b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 五月 2024 18:18:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
index 82885bf..d38093c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -50,6 +52,14 @@
PageUtils.startPageByPost(ivrTask.getPageNum(), ivrTask.getPageSize());
List<IvrTask> list = ivrTaskService.selectIvrTaskList(ivrTask);
List<IvrTaskVO> ivrTaskVOS = DtoConversionUtils.sourceToTarget(list, IvrTaskVO.class);
+
+ //璁剧疆鍒嗛〉
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ rspData.setRows(null);
+ rspData.setTotal(0);
+
if (CollectionUtils.isNotEmpty(ivrTaskVOS)) {
for (IvrTaskVO ivrTaskVO : ivrTaskVOS) {
IvrTaskSingle ivrTaskcall = new IvrTaskSingle();
@@ -64,8 +74,18 @@
ivrTaskVO.setWfs(wfs);
}
}
+
+ //鐢ㄤ簬鍒嗛〉
+ ivrTask.setPageNum(null);
+ ivrTask.setPageSize(null);
+ List<IvrTask> ivrTasks = ivrTaskService.selectIvrTaskList(ivrTask);
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ rspData.setRows(ivrTaskVOS);
+ rspData.setTotal(new PageInfo(ivrTasks).getTotal());
}
- return getDataTable(ivrTaskVOS);
+
+ return rspData;
}
/**
--
Gitblit v1.9.3