From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index b0f4d66..990dfee 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -15,7 +15,9 @@
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.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +29,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,31 +40,37 @@
@Autowired
private TaskService taskService;
+ /** 鍒嗛〉鏌ヨ浠诲姟鍒楄〃锛屽苟鏍规嵁 mission_flow_step_instance 鍒ゆ柇姣忔潯鏄惁鍙偣瀹屾垚锛坈anComplete锛夛紝渚涘墠绔睍绀哄畬鎴愭寜閽� */
@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(buildPageRowsUtils.rowsMap(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(buildPageRowsUtils.rowsMap(list));
}
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping({"/task/many/{ids}", "/tasks/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(taskService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/task/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(taskService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:task:save')")
@@ -76,19 +84,20 @@
if (!taskService.save(task)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(task);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(task));
}
@PreAuthorize("hasAuthority('manager:task:update')")
@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)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(task);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(task));
}
@PreAuthorize("hasAuthority('manager:task:remove')")
@@ -112,13 +121,13 @@
taskService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/task/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskService.list(), Task.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(taskService.list()), Task.class), response);
}
@PreAuthorize("hasAuthority('manager:task:update')")
@@ -128,7 +137,7 @@
if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id, getLoginUserId()));
+ return R.ok("瀹屾垚浠诲姟鎴愬姛").add(buildPageRowsUtils.rowsMap(taskService.operateComplete(id, getLoginUserId())));
}
/**
@@ -143,7 +152,7 @@
throw new CoolException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
}
try {
- return R.ok("鍑哄簱瀹屾垚").add(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_PICK));
+ return R.ok("鍑哄簱瀹屾垚").add(buildPageRowsUtils.rowsMap(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_PICK)));
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
--
Gitblit v1.9.1