From 0a8f9800a264c848adf1361db5bcab5b2fc32869 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 15:56:34 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 93bc9de..e482d71 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -13,8 +13,8 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
-import com.smartor.service.IServiceSubtaskRecordService;
-import com.smartor.service.IServiceSubtaskService;
+import com.smartor.service.*;
+import com.smartor.service.impl.IvrTaskTemplateServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -50,10 +51,11 @@
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
//@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
@PostMapping("/patItem")
- public TableDataInfo patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ public Map<String, Object> patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
List<ServiceSubtask> serviceSubtaskList = null;
if (serviceSubtaskVO != null) {
- PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ Integer offset = PageUtils.getOffset(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ serviceSubtaskVO.setPageNum(offset);
serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
}
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -67,18 +69,12 @@
List<Map<String, Object>> list = new ArrayList<>();
list.add(map);
//鑾峰彇total
- long total = PageUtils.count(new ISelect() {
- @Override
- public void doSelect() {
- serviceSubtaskVO.setPageNum(null);
- serviceSubtaskVO.setPageSize(null);
- serviceSubtaskService.patItem(serviceSubtaskVO);
- }
- });
- return getDataTable2(total, list);
-// return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
- }
+ serviceSubtaskVO.setPageNum(null);
+ serviceSubtaskVO.setPageSize(null);
+ List<ServiceSubtask> serviceSubtasks = serviceSubtaskService.patItem(serviceSubtaskVO);
+ return getDataTable3(CollectionUtils.isNotEmpty(serviceSubtasks)?serviceSubtasks.size():0, list);
+ }
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
@@ -268,4 +264,16 @@
return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
}
+ /**
+ * 闅忚缁熻瀵煎嚭
+ */
+ @ApiOperation("鏈嶅姟缁熻鏌ヨ-鎸夋椂闂寸淮搴︾粺璁″嚭闄�/闂ㄨ瘖闅忚鏁版嵁")
+ @PostMapping("/getServiceStatistics")
+ public AjaxResult getServiceStatistics(@RequestBody ServiceStatisticsRequest serviceStatisticsRequest) {
+ SysUser user = getLoginUser().getUser();
+ serviceStatisticsRequest.setOrgid(user.getOrgid());
+ List<ServiceStatisticsResponse> serviceStatistics = serviceSubtaskService.getServiceStatistics(serviceStatisticsRequest);
+ return success(serviceStatistics);
+ }
+
}
--
Gitblit v1.9.3