From 1911be8941e5fe2705c2c56e74e52bd426468793 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 15:26:34 +0800
Subject: [PATCH] 固化流程，建立node；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 78 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index 911f2cc..c3a583e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -1,10 +1,13 @@
package org.springblade.mdm.flow.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.springblade.core.secure.utils.AuthUtil;
@@ -13,10 +16,15 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.ApproveRecordService;
+import org.springblade.mdm.flow.service.FlowCommonService;
+import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -30,21 +38,25 @@
@Slf4j
@RestController
+@AllArgsConstructor
@RequestMapping("/flow/dispatch")
@Tag(name = "娲惧伐娴佺▼", description = "娲惧伐娴佺▼")
public class DispatchController {
- @Autowired
- private StartDispatcher dispatcher;
- @Autowired
- private TaskService taskService;
- @Autowired
- private ProcessProgRefService processProgRefService;
+ private final StartDispatcher dispatcher;
- @Autowired
- private ApproveRecordService approveRecordService;
+ private final TaskService taskService;
+ private final RuntimeService runtimeService;
+ private final ProcessProgRefService processProgRefService;
+
+ private final ApproveRecordService approveRecordService;
+ private final FlowCommonService flowCommonService;
+
+ private final FlowProgramFileService flowProgramFileService;
+
+ private final NcNodeAutoCreateService ncNodeAutoCreateService;
/**
- * 鏂板
+ * 鍙戣捣娲惧伐娴佺▼
*/
@PostMapping("/start")
@Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
@@ -56,6 +68,14 @@
@Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
@PostMapping("completeTask")
public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+
+ Task task = taskService.createTaskQuery()
+ .taskId(taskId)
+ .singleResult();
+ String operateResult = variables.get("approve")+"";
+ if(task.getTaskDefinitionKey().equals("programmingTask")) {//缂栧埗鑺傜偣
+ flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
+ }
// 澧炲姞璇勮
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
@@ -64,20 +84,18 @@
if (Func.isEmpty(variables)) {
variables = Kv.create();
}
- String programIds = null;
- if(variables.containsKey("programIds")){
- programIds = variables.get("programIds").toString();
- }
- if(StringUtils.isNotEmpty(programIds)) {
- processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
- }
//鍔犲叆瀹℃壒鐢ㄦ埛
- variables.put("approveUserNickName",AuthUtil.getNickName());
+ variables.put(FlowContants.LAST_STEP_USER_NICKNAME,AuthUtil.getNickName());
if(variables.containsKey("assignee")){
+ addApproveRecord(taskId,processInstanceId,comment,variables);
- addApproveRecord(taskId,processInstanceId,comment,programIds,variables);
+ //鍦ㄧ紪鍒朵换鍔℃椂锛屽垱寤鸿妭鐐癸紙娌℃湁鑺傜偣鍒欏垱寤猴紝鏈夊氨鐩存帴浣跨敤
+ if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
+ ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
+ }
+
//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
taskService.complete(taskId, variables);
@@ -89,29 +107,13 @@
}
- void addApproveRecord(String taskId, String processInstanceId, String comment,String programIds,Map<String, Object> variables){
- List<Long> programIdList = new ArrayList<>();
- if(programIds != null){
- programIdList = Func.toLongList(programIds);
- }else{
- programIdList.add(null);
- }
+ void addApproveRecord(String taskId, String processInstanceId, String comment,Map<String, Object> variables){
+ String operateResult = variables.get("approve")+"";
+
Task task = taskService.createTaskQuery()
.taskId(taskId)
.singleResult();
- for(Long programId : programIdList){
- ApproveRecord rec = new ApproveRecord();
- rec.setTaskName(task.getName());
- rec.setComment(comment);
- rec.setNcProgramId(programId);
- rec.setOperateResult(variables.get("approve")+"");//瀹℃壒缁撴灉
- rec.setOperateTime(DateUtil.now());
- rec.setProcessInstanceId(processInstanceId);
- rec.setUserId(AuthUtil.getUserId());
- rec.setUserNickname(AuthUtil.getNickName());
-
- approveRecordService.save(rec);
- }
+ approveRecordService.saveApproveRecords(task,processInstanceId,operateResult,comment);
}
}
--
Gitblit v1.9.3