#

vincentlu

1 天以前 4992e4e60b73a87c3781aabd9367e11e3eaa370e

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java

@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.constant.Constants;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.domain.PageResult;
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.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -25,13 +28,16 @@

    @Autowired
    private TaskService taskService;
    @Autowired
    private BusinessSortService businessSortService;

    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/task/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
        return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true)));
        PageResult<Task> pageResult = taskService.pageRel(pageParam);
        return R.ok().add(pageResult);
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
@@ -108,4 +114,18 @@
        ExcelUtil.build(ExcelUtil.create(taskService.list(), Task.class), response);
    }

    @PreAuthorize("hasAuthority('manager:task:update')")
    @OperationLog("Complete Task")
    @GetMapping("/task/complete/{id}")
    public R complete(@PathVariable Long id) {
        return taskService.complete(id, getLoginUserId(), Constants.HANDLE) ? R.ok("Complete Success") : R.error("Complete Fail");
    }

    @PreAuthorize("hasAuthority('manager:task:update')")
    @OperationLog("Cancel Task")
    @GetMapping("/task/cancel/{id}")
    public R cancel(@PathVariable Long id) {
        return taskService.cancel(id, getLoginUserId(), Constants.HANDLE) ? R.ok("Cancel Success") : R.error("Cancel Fail");
    }

}