mdm.git - Gitblit

			@@ -1,7 +1,6 @@

			package org.springblade.mdm.flow.service;

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import lombok.AllArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang3.StringUtils;
			@@ -12,9 +11,7 @@
			import org.springblade.mdm.flow.entity.ApproveRecord;
			import org.springblade.mdm.flow.mapper.ApproveRecordMapper;
			import org.springblade.mdm.flow.vo.ApproveRecordVO;
			import org.springblade.mdm.program.entity.ProcessProgRef;
			import org.springblade.mdm.program.service.ProcessProgRefService;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;

			import java.util.List;
			@@ -34,9 +31,9 @@
			return this.getBaseMapper().listByNcProgramId(ncProgramId);
			}

			public void saveApproveRecords(Task task, String processInstanceId, String operateResult, String comment) {
			public void saveApproveRecords(Task task, String operateResult, String comment) {

			String processDefinitionKey = flowCommonService.getDefinitionKey(processInstanceId);
			String processDefinitionKey = flowCommonService.getDefinitionKey(task.getProcessInstanceId());

			ApproveRecord rec = new ApproveRecord();
			rec.setTaskName(task.getName());
			@@ -44,8 +41,9 @@
			//rec.setNcProgramId(refObj.getNcProgramId());
			rec.setOperateResult(operateResult);//审批结果
			rec.setOperateTime(DateUtil.now());
			rec.setProcessInstanceId(processInstanceId);
			rec.setProcessInstanceId(task.getProcessInstanceId());
			rec.setProcessDefinitionKey(processDefinitionKey);
			rec.setTaskDefinitionKey(task.getTaskDefinitionKey());
			rec.setUserId(AuthUtil.getUserId());
			rec.setUserNickname(AuthUtil.getNickName());