#

luxiaotao1123

2024-10-18 9c5567aaa3bd765e350a9a9773ca510f76410210

 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;
@@ -38,7 +37,7 @@
        PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
        QueryWrapper<Task> wrapper = pageParam.buildWrapper(true, "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");
    }


}