From 9858d97e0814bf61b97c937ef209222403fa1f27 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 04 七月 2025 02:43:31 +0800
Subject: [PATCH] dnc导出修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 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 bf87426..f464779 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
@@ -4,19 +4,28 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
+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.entity.ApproveRecord;
import org.springblade.mdm.flow.excution.StartDispatcher;
+import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -29,20 +38,24 @@
private StartDispatcher dispatcher;
@Autowired
private TaskService taskService;
+ @Autowired
+ private ProcessProgRefService processProgRefService;
+ @Autowired
+ private ApproveRecordService approveRecordService;
/**
* 鏂板
*/
@PostMapping("/start")
@Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
- public R<Boolean> save(@RequestBody TaskAssignVO startVO) {
+ public R<Boolean> start(@RequestBody TaskAssignVO startVO) {
dispatcher.start(startVO);
return R.status(true);
}
@Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
@PostMapping("completeTask")
- public R<Void> completeTask(String taskId, String processInstanceId, String comment, @Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+ public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(description = "瀵瑰簲鐨勭▼搴廼d,閫楀彿鍒嗛殧") String programIds, @Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
// 澧炲姞璇勮
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
@@ -51,9 +64,18 @@
if (Func.isEmpty(variables)) {
variables = Kv.create();
}
+ if(StringUtils.isNotEmpty(programIds)) {
+ processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
+ }
+
+ //鍔犲叆瀹℃壒鐢ㄦ埛
+ variables.put("approveUserNickName",AuthUtil.getNickName());
+
if(variables.containsKey("assignee")){
+ addApproveRecord(taskId,processInstanceId,comment,programIds,variables);
//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
taskService.complete(taskId, variables);
+
return R.success("娴佺▼鎻愪氦鎴愬姛");
}else {
// 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�
@@ -61,4 +83,30 @@
}
}
+
+ 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);
+ }
+ 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);
+ }
+
+ }
}
--
Gitblit v1.9.3