调整审批记录的保存方式

yangys

2025-07-08 f379dade90ec59e08c037cba4917308e3dfdb928

 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;
@@ -55,7 +57,7 @@

   @Operation(summary = "完成任务", description = "流向下一个节点")
   @PostMapping("completeTask")
   public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(description = "对应的程序id,逗号分隔") String programIds, @Parameter(name = "variables", description = "任务变量") @RequestBody Map<String, Object> variables) {
   public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "任务变量") @RequestBody Map<String, Object> variables) {
      // 增加评论
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
@@ -63,6 +65,10 @@
      // 非空判断
      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));
@@ -72,7 +78,8 @@
      variables.put("approveUserNickName",AuthUtil.getNickName());

      if(variables.containsKey("assignee")){
         addApproveRecord(taskId,processInstanceId,comment,programIds,variables);

         addApproveRecord(taskId,processInstanceId,comment,variables);
         //指定了下一步执行人
         taskService.complete(taskId, variables);

@@ -84,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);
      }


   }
}