From fd6d26f8ffe6a37533e741337f3eca9134d934c7 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 15 一月 2025 10:42:59 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java index 84a8161..179dcad 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java @@ -12,7 +12,6 @@ import com.zy.acs.manager.common.utils.BusinessSortService; import com.zy.acs.manager.common.utils.ExcelUtil; import com.zy.acs.manager.manager.entity.Task; -import com.zy.acs.manager.manager.enums.TaskStsType; import com.zy.acs.manager.manager.service.TaskService; import com.zy.acs.manager.system.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +35,9 @@ public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class); - QueryWrapper<Task> wrapper = pageParam.buildWrapper(true, "io_time"); + QueryWrapper<Task> wrapper = pageParam.buildWrapper(false, "io_time"); if (hasCreateTimeDesc(pageParam.getOrders())) { - wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts")); +// wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts")); } return R.ok().add(taskService.page(pageParam, wrapper)); } @@ -130,6 +129,5 @@ public R cancel(@PathVariable Long id) { return taskService.cancel(id, getLoginUserId()) ? R.ok("Cancel Success") : R.error("Cancel Fail"); } - } -- Gitblit v1.9.1