#乐观锁

zhou zhou

17 小时以前 2f8e173048d22c5b40612c3538b9c1aa5a5397f6

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java

@@ -15,6 +15,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
@@ -27,7 +28,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@RestController
@@ -38,19 +39,25 @@
    @Autowired
    private TaskService taskService;

    /** 分页查询任务列表，并根据 mission_flow_step_instance 判断每条是否可点完成（canComplete），供前端展示完成按钮 */
    @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);
        QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true);
        return R.ok().add(taskService.page(pageParam, queryWrapper));
        Page<Task> pageResult = taskService.page(pageParam, queryWrapper);
        taskService.fillCanComplete(pageResult.getRecords());
        return R.ok().add(pageResult);
    }

    /** 查询任务列表，同样根据 flowStepInstance 填充 canComplete */
    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/task/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(taskService.list());
        List<Task> list = taskService.list();
        taskService.fillCanComplete(list);
        return R.ok().add(list);
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
@@ -83,6 +90,7 @@
    @OperationLog("Update 任务工作档")
    @PostMapping("/task/update")
    public R update(@RequestBody Task task) {
        OptimisticLockUtils.requireVersion("任务", task.getVersion());
        task.setUpdateBy(getLoginUserId());
        task.setUpdateTime(new Date());
        if (!taskService.updateById(task)) {