From f379dade90ec59e08c037cba4917308e3dfdb928 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 17:02:06 +0800
Subject: [PATCH] 调整审批记录的保存方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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..ab823cd 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,5 +1,6 @@
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;
@@ -17,6 +18,7 @@
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.entity.ProcessProgRef;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -77,7 +79,7 @@
if(variables.containsKey("assignee")){
- addApproveRecord(taskId,processInstanceId,comment,programIds,variables);
+ addApproveRecord(taskId,processInstanceId,comment,variables);
//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
taskService.complete(taskId, variables);
@@ -89,29 +91,16 @@
}
- 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.saveApproveRecords(task,processInstanceId,operateResult,comment);
+ List<Long> programIdList = new ArrayList<>();
- approveRecordService.save(rec);
- }
+
}
}
--
Gitblit v1.9.3