From bc30484ac7a5feea3162d56b9ff76a9c976aba48 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 四月 2024 15:06:41 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 98a7db5..82885bf 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
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.IvrTask;
import com.smartor.domain.IvrTaskVO;
@@ -14,6 +15,7 @@
import com.smartor.service.IIvrTaskSingleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -41,25 +43,28 @@
/**
* 鏌ヨ璇煶浠诲姟鍒楄〃
*/
- @ApiOperation("鏌ヨ璇煶浠诲姟鍒楄〃")
+ @ApiOperation("鏌ヨ浠诲姟鍒楄〃")
@PreAuthorize("@ss.hasPermi('smartor:ivrtask:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrTask ivrTask) {
- startPage();
+ PageUtils.startPageByPost(ivrTask.getPageNum(), ivrTask.getPageSize());
List<IvrTask> list = ivrTaskService.selectIvrTaskList(ivrTask);
List<IvrTaskVO> ivrTaskVOS = DtoConversionUtils.sourceToTarget(list, IvrTaskVO.class);
- for (IvrTaskVO ivrTaskVO : ivrTaskVOS) {
- IvrTaskSingle ivrTaskcall = new IvrTaskSingle();
- ivrTaskcall.setTaskid(ivrTaskVO.getTaskid());
- List<IvrTaskSingle> ivrTaskcalls = iIvrTaskCallService.selectIvrTaskcallList(ivrTaskcall);
- //宸插彂閫�
- long yfs = ivrTaskcalls.stream().filter(ivrTaskcall1 -> ivrTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
- //鏈彂閫�
- long wfs = ivrTaskcalls.stream().filter(ivrTaskcall1 -> ivrTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
- ivrTaskVO.setYfs(yfs);
- ivrTaskVO.setWfs(wfs);
+ if (CollectionUtils.isNotEmpty(ivrTaskVOS)) {
+ for (IvrTaskVO ivrTaskVO : ivrTaskVOS) {
+ IvrTaskSingle ivrTaskcall = new IvrTaskSingle();
+ ivrTaskcall.setTaskid(ivrTaskVO.getTaskid());
+ List<IvrTaskSingle> ivrTaskcalls = iIvrTaskCallService.selectIvrTaskcallList(ivrTaskcall);
+ if (CollectionUtils.isNotEmpty(ivrTaskcalls)) {
+ //宸插彂閫�
+ long yfs = ivrTaskcalls.stream().filter(ivrTaskcall1 -> ivrTaskcall1.getSendstate() != null && ivrTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
+ //鏈彂閫�
+ long wfs = ivrTaskcalls.stream().filter(ivrTaskcall1 -> ivrTaskcall1.getSendstate() != null && ivrTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
+ ivrTaskVO.setYfs(yfs);
+ ivrTaskVO.setWfs(wfs);
+ }
+ }
}
-
return getDataTable(ivrTaskVOS);
}
@@ -130,9 +135,6 @@
public AjaxResult removeTask(@PathVariable Long taskId) {
return toAjax(ivrTaskService.deleteIvrTaskByTaskid(taskId));
}
-
-
-
}
--
Gitblit v1.9.3