From 86079d1c2bd7981165487e6e08d2399b80687f6e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 九月 2025 14:21:49 +0800
Subject: [PATCH] 工控网导出使用实际编程人匹配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 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 b87ef6b..44016d0 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
@@ -12,10 +12,14 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+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.FlowVO;
+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;
@@ -34,7 +38,7 @@
@Autowired
private TaskService taskService;
@Autowired
- private HistoryService historyService;
+ private MdmUserService mdmUserService;
@Autowired
private FlowBusinessService businessService;
@Autowired
@@ -42,6 +46,11 @@
@Autowired
private FlowTransferService flowTransferService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+
+ @Autowired
+ private DoneQueryService doneQueryService;
/**
* 寰呭姙浠诲姟鍒楄〃椤�
*/
@@ -55,11 +64,19 @@
return R.data(pages);
}
- @GetMapping("done-list")
+ @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) {
+ IPage<FlowVO> pages = doneQueryService.selectDonePage(Condition.getPage(query) ,createTimeBegin,createTimeEnd,keyword);
return R.data(pages);
}
@@ -89,32 +106,30 @@
}
/**
- * 寰呭姙浠诲姟鍒楄〃椤�
+ * 澶勭悊浜轰笅鎷夋暟鎹�
*/
@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) {
- // 鑾峰彇鍘嗗彶浠诲姟瀹炰緥
- List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(processInstanceId)
- .orderByHistoricTaskInstanceEndTime().asc()
- .list();
-
- // 鑾峰彇涓婁竴涓凡瀹屾垚鐨勪换鍔�
- HistoricTaskInstance previousTask = historicTasks.get(historicTasks.size() - 2);
- return R.data(previousTask.getAssignee());
-
- }
+ return R.data(this.flowCommonService.previusAssignee(processInstanceId));
+ }*/
}
--
Gitblit v1.9.3