From ddafa0375398053baaafdee8612f68c1b75ff7cb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 13:37:54 +0800
Subject: [PATCH] 机床导入1
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 84 insertions(+), 13 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 ea3ebd6..5c85937 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,39 +6,110 @@
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.flow.core.pojo.entity.BladeFlow;
-import org.springblade.mdm.flow.excution.StartDispatcher;
+import org.springblade.mdm.basesetting.producedivision.entity.MdmUser;
+import org.springblade.mdm.basesetting.producedivision.service.MdmUserService;
import org.springblade.mdm.flow.service.FlowBusinessService;
-import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.flow.service.FlowCommonService;
+import org.springblade.mdm.flow.service.FlowTransferService;
+import org.springblade.mdm.flow.vo.FlowVO;
+import org.springblade.system.feign.IUserSearchClient;
+import org.springblade.system.pojo.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
-import java.util.Map;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
@Slf4j
@RestController
@RequestMapping("/flow/")
-@Tag(name = "娲惧伐娴佺▼", description = "娲惧伐娴佺▼")
+@Tag(name = "鐢ㄦ埛涓汉娴佺▼", description = "鐢ㄦ埛涓汉娴佺▼")
public class MyFlowController {
-
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private MdmUserService mdmUserService;
@Autowired
private FlowBusinessService businessService;
+ @Autowired
+ private IUserSearchClient userSearchClient;
+ @Autowired
+ private FlowTransferService flowTransferService;
+ @Autowired
+ private FlowCommonService flowCommonService;
/**
- * 寰呭姙浜嬪姟鍒楄〃椤�
+ * 寰呭姙浠诲姟鍒楄〃椤�
*/
@GetMapping("todo-list")
@ApiOperationSupport(order = 3)
- @Operation(summary = "鎴戠殑娴佺▼", description = "浼犲叆娴佺▼淇℃伅")
- public R<IPage<BladeFlow>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
- IPage<BladeFlow> pages = businessService.selectTodoPage(Condition.getPage(query), keyword);
+ @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);
+ }
+
+
+ /**
+ * 寰呭姙浠诲姟鍒楄〃椤�
+ */
+ @GetMapping("alltask-list")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "鎵�鏈変换鍔★紙fortest锛�", description = "浼犲叆娴佺▼淇℃伅")
+ public R<IPage<FlowVO>> alltaskList(@Parameter(description = "鍏抽敭瀛�") String keyword, LocalDate createTimeBegin, LocalDate createTimeEnd, Query query) {
+ IPage<FlowVO> pages = businessService.selectAllTaskPage(Condition.getPage(query), keyword);
+ return R.data(pages);
+ }
+
+ @Operation(summary = "杞淳浠诲姟", description = "")
+ @PostMapping("transferTask")
+ public R<Void> transferTask(String taskId,String newAssigneeId, String processInstanceId, String comment) {
+ // 澧炲姞璇勮
+ try {
+ this.flowTransferService.transferTask(taskId, newAssigneeId, comment);
+ return R.success("娴佺▼杞淳鎴愬姛");
+ }catch(Exception e) {
+ return R.fail(e.getMessage());
+ }
+ }
+
+ /**
+ * 寰呭姙浠诲姟鍒楄〃椤�
+ */
+ @GetMapping("flow-user-list")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "鐢ㄦ埛涓嬫媺鏁版嵁", description = "鐢ㄦ埛涓嬫媺鏁版嵁")
+ public R<List<MdmUser>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId, String taskId) {
+
+ return R.data(mdmUserService.listByDeptAndRoleAlias());
+ }
+
+ /**
+ * 涓婁竴姝ュ鎵逛汉鏌ヨ
+ */
+ @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