增加产品型号

yangys

2025-07-04 fc588c6e5ccac038cab378931d9bac3033e28f98

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java

@@ -6,12 +6,16 @@
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;
@@ -20,6 +24,8 @@
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
@@ -34,6 +40,9 @@
   private TaskService taskService;
   @Autowired
   private ProcessProgRefService processProgRefService;

   @Autowired
   private ApproveRecordService approveRecordService;
   /**
    * 新增
    */
@@ -61,9 +70,12 @@

      //加入审批用户
      variables.put("approveUserNickName",AuthUtil.getNickName());

      if(variables.containsKey("assignee")){
         addApproveRecord(taskId,processInstanceId,comment,programIds,variables);
         //指定了下一步执行人
         taskService.complete(taskId, variables);

         return R.success("流程提交成功");
      }else {
         // 完成任务,给默认用户
@@ -71,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);
      }

   }
}