From 2212759d051a0f60b4f0ada73d678cf150e29c84 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 二月 2026 18:26:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index de932ed..ffcff1b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -28,6 +28,7 @@
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -75,9 +76,9 @@
@ApiOperation("鏌ヨ浠诲姟鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
@PostMapping("/list")
- public TableDataInfo list(@RequestBody ServiceTask serviceTask) {
- PageUtils.startPageByPost(serviceTask.getPageNum(), serviceTask.getPageSize());
-// List<ServiceTask> list = serviceTaskService.selectServiceTaskList(serviceTask);
+ public Map<String, Object> list(@RequestBody ServiceTask serviceTask) {
+ Integer offset = PageUtils.getOffset(serviceTask.getPageNum(), serviceTask.getPageSize());
+ serviceTask.setPageNum(offset);
List<ServiceTask> list = serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask);
List<ServiceTaskVO> serviceTaskVOS = DtoConversionUtils.sourceToTarget(list, ServiceTaskVO.class);
@@ -98,19 +99,13 @@
}
}
//鑾峰彇total
- long total = PageUtils.count(new ISelect() {
- @Override
- public void doSelect() {
- serviceTask.setPageNum(null);
- serviceTask.setPageSize(null);
- serviceTaskService.selectServiceTaskList(serviceTask);
- }
- });
+ serviceTask.setPageNum(null);
+ serviceTask.setPageSize(null);
+ List<ServiceTask> serviceTasks = serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask);
- return getDataTable2(total, serviceTaskVOS);
+ return getDataTable3(CollectionUtils.isNotEmpty(serviceTasks)?serviceTasks.size():0L, serviceTaskVOS);
}
-
- return getDataTable2(0, serviceTaskVOS);
+ return getDataTable3(0L, serviceTaskVOS);
}
/**
--
Gitblit v1.9.3