From 3357f4b98b68460c920df66260b0e641b60569be Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 19:14:25 +0800
Subject: [PATCH] 修复工控网导入判断是否有固化程序的判断
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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 34ad7f2..e1fa5b8 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,7 +6,9 @@
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;
@@ -32,6 +34,8 @@
@Autowired
private TaskService taskService;
@Autowired
+ private HistoryService historyService;
+ @Autowired
private FlowBusinessService businessService;
@Autowired
private IUserSearchClient userSearchClient;
@@ -46,8 +50,20 @@
@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")
+ @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);
+ }
+
/**
* 寰呭姙浠诲姟鍒楄〃椤�
@@ -64,15 +80,6 @@
@PostMapping("transferTask")
public R<Void> transferTask(String taskId,String newAssigneeId, String processInstanceId, String comment) {
// 澧炲姞璇勮
- /*
- if (StringUtil.isNoneBlank(processInstanceId, comment)) {
- taskService.addComment(taskId, processInstanceId, comment);
- }
-
- // 瀹屾垚浠诲姟
- taskService.setAssignee(taskId, newAssigneeId);
-
- */
try {
this.flowTransferService.transferTask(taskId, newAssigneeId, comment);
return R.success("娴佺▼杞淳鎴愬姛");
@@ -91,4 +98,26 @@
return userSearchClient.listByDept(deptId);
}
+
+ /**
+ * 涓婁竴姝ュ鎵逛汉鏌ヨ
+ */
+ @GetMapping("previus-approve-user")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "涓婁竴姝ュ鎵逛汉鏌ヨ", description = "涓婁竴姝ュ鎵逛汉鏌ヨ锛岃繑鍥炲鎵逛汉id")
+ public R<String> previusApproveUserId(@Parameter(description = "閮ㄩ棬ID") String processInstanceId) {
+ // 鑾峰彇鍘嗗彶浠诲姟瀹炰緥
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .orderByHistoricTaskInstanceEndTime().asc()
+ .list();
+
+ // 鑾峰彇涓婁竴涓凡瀹屾垚鐨勪换鍔�
+ String assignee = "";
+ if(!historicTasks.isEmpty()) {
+ assignee = historicTasks.get(historicTasks.size() - 1).getAssignee();
+ }
+ return R.data(assignee);
+
+ }
}
--
Gitblit v1.9.3