From 3d558e1bb5091b76a6525f6fab015574e1755200 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 09 九月 2025 18:27:30 +0800
Subject: [PATCH] 确认单下载增加容错
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 88 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
index 3ccbd66..2b18b4e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
@@ -6,16 +6,21 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
+import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.mdm.basesetting.producedivision.entity.MdmUser;
+import org.springblade.mdm.basesetting.producedivision.service.MdmUserService;
+import org.springblade.mdm.flow.service.DoneQueryService;
import org.springblade.mdm.flow.service.FlowBusinessService;
+import org.springblade.mdm.flow.service.FlowCommonService;
+import org.springblade.mdm.flow.service.FlowTransferService;
+import org.springblade.mdm.flow.vo.DoneQueryVO;
import org.springblade.mdm.flow.vo.FlowVO;
-import org.springblade.system.feign.IUserClient;
+import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
import org.springblade.system.feign.IUserSearchClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +30,6 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
-import java.util.Map;
@Slf4j
@RestController
@@ -35,9 +39,19 @@
@Autowired
private TaskService taskService;
@Autowired
+ private MdmUserService mdmUserService;
+ @Autowired
private FlowBusinessService businessService;
@Autowired
private IUserSearchClient userSearchClient;
+
+ @Autowired
+ private FlowTransferService flowTransferService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+
+ @Autowired
+ private DoneQueryService doneQueryService;
/**
* 寰呭姙浠诲姟鍒楄〃椤�
*/
@@ -46,8 +60,29 @@
@Operation(summary = "寰呭姙浠诲姟", description = "浼犲叆娴佺▼淇℃伅")
public R<IPage<FlowVO>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, @Parameter(description = "鍒涘缓鏃堕棿寮�濮�") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeBegin, @Parameter(description = "鍒涘缓鏃堕棿鎴") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeEnd, Query query) {
IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), createTimeBegin,createTimeEnd,keyword);
+
+ //pages = businessService.selectFinishedPage(Condition.getPage(query), "",createTimeBegin, createTimeEnd, keyword);
+
return R.data(pages);
}
+ @GetMapping("done-list-old")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "褰撳墠鐢ㄦ埛宸插姙浠诲姟鍒嗛〉", description = "浼犲叆娴佺▼淇℃伅")
+ public R<IPage<FlowVO>> doneList(@Parameter(description = "鍏抽敭瀛�") String keyword, @Parameter(description = "鍒涘缓鏃堕棿寮�濮�") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeBegin, @Parameter(description = "鍒涘缓鏃堕棿鎴") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeEnd, Query query) {
+ IPage<FlowVO> pages = businessService.selectDonePage(Condition.getPage(query),"" ,createTimeBegin,createTimeEnd,keyword);
+
+ return R.data(pages);
+ }
+ @GetMapping("done-list")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "褰撳墠鐢ㄦ埛宸插姙浠诲姟鍒嗛〉2", description = "浼犲叆娴佺▼淇℃伅2")
+ //public R<IPage<FlowVO>> doneList2(@Parameter(description = "鍏抽敭瀛�") String keyword, @Parameter(description = "鍒涘缓鏃堕棿寮�濮�") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeBegin, @Parameter(description = "鍒涘缓鏃堕棿鎴") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeEnd, Query query) {
+ public R<IPage<FlowVO>> doneList2(DoneQueryVO query) {
+ IPage<FlowVO> pages = doneQueryService.selectDonePage(query);
+
+ return R.data(pages);
+ }
+
/**
* 寰呭姙浠诲姟鍒楄〃椤�
@@ -62,28 +97,41 @@
@Operation(summary = "杞淳浠诲姟", description = "")
@PostMapping("transferTask")
- public R<Void> transferTask(String taskId,String newAssigneeId, String processInstanceId, String comment, @RequestBody Map<String, Object> variables) {
+ public R<Void> transferTask(String taskId,String newAssigneeId, String processInstanceId, String comment) {
// 澧炲姞璇勮
- if (StringUtil.isNoneBlank(processInstanceId, comment)) {
- taskService.addComment(taskId, processInstanceId, comment);
+ try {
+ this.flowTransferService.transferTask(taskId, newAssigneeId, comment);
+ return R.success("娴佺▼杞淳鎴愬姛");
+ }catch(Exception e) {
+ return R.fail(e.getMessage());
}
- // 闈炵┖鍒ゆ柇
- if (Func.isEmpty(variables)) {
- variables = Kv.create();
- }
- // 瀹屾垚浠诲姟
- taskService.setAssignee(taskId, newAssigneeId);
- return R.success("娴佺▼杞淳鎴愬姛");
}
/**
- * 寰呭姙浠诲姟鍒楄〃椤�
+ * 澶勭悊浜轰笅鎷夋暟鎹�
*/
@GetMapping("flow-user-list")
@ApiOperationSupport(order = 3)
- @Operation(summary = "鐢ㄦ埛涓嬫媺鏁版嵁", description = "鐢ㄦ埛涓嬫媺鏁版嵁")
- public R<List<User>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId) {
- return userSearchClient.listByDept(deptId);
-
+ @Operation(summary = "澶勭悊浜轰笅鎷夋暟鎹�", description = "澶勭悊浜轰笅鎷夋暟鎹�")
+ public R<List<MdmUser>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId, String taskId) {
+ return R.data(mdmUserService.listByDeptAndRoleAlias());
}
+
+ @GetMapping("flow-user-tree")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "澶勭悊浜轰笅鎷夋暟鎹�-鏍戝舰", description = "澶勭悊浜轰笅鎷夋暟鎹�")
+ public R<List<ProgramNodeVO>> flowUserTree(@Parameter(description = "閮ㄩ棬ID") String deptId, String taskId) {
+ return R.data(mdmUserService.flowUserTree());
+ }
+
+ /**
+ * 涓婁竴姝ュ鎵逛汉鏌ヨ
+ */
+ /*
+ @GetMapping("previus-approve-user")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "涓婁竴姝ュ鎵逛汉鏌ヨ", description = "涓婁竴姝ュ鎵逛汉鏌ヨ锛岃繑鍥炲鎵逛汉id")
+ public R<String> previusApproveUserId(@Parameter(description = "閮ㄩ棬ID") String processInstanceId) {
+ return R.data(this.flowCommonService.previusAssignee(processInstanceId));
+ }*/
}
--
Gitblit v1.9.3