mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审批问题处理

master
pengqiang 2022-04-19 17:34:25 +08:00
parent c1ed59744a
commit b78b0b9d8e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cn/palmte/work/service/ProjectEstimateService.java
View File

@ -253,7 +253,7 @@ public class ProjectEstimateService {
Admin admin) throws Exception { Admin admin) throws Exception {
Project p = estimateAddSave(project, estimateBean, admin, ApproveStatusEnum.APPROVAL_PENDING); Project p = estimateAddSave(project, estimateBean, admin, ApproveStatusEnum.APPROVAL_PENDING);
projectInstanceService.startEstimateProcessInstance(p, admin); //projectInstanceService.startEstimateProcessInstance(p, admin);
estimateApprove(0, p, admin); estimateApprove(0, p, admin);
@ -270,7 +270,7 @@ public class ProjectEstimateService {
Project p = projectService.addProject(project, admin, approveStatusEnum); Project p = projectService.addProject(project, admin, approveStatusEnum);
saveEstimate(p, estimateBean); saveEstimate(p, estimateBean);
return project; return p;
} }
/** /**
* 编辑概算保存项目并发起审核 * 编辑概算保存项目并发起审核

4
src/main/java/cn/palmte/work/service/ProjectInstanceService.java
View File

@ -4,6 +4,8 @@ import cn.palmte.work.bean.ApproveStatusEnum;
import cn.palmte.work.bean.StatusEnum; import cn.palmte.work.bean.StatusEnum;
import cn.palmte.work.config.activiti.ActConstant; import cn.palmte.work.config.activiti.ActConstant;
import cn.palmte.work.model.*; import cn.palmte.work.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import top.jfunc.common.utils.CollectionUtil; import top.jfunc.common.utils.CollectionUtil;
@ -19,6 +21,7 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class ProjectInstanceService { public class ProjectInstanceService {
private static final Logger logger = LoggerFactory.getLogger(ActProcInsService.class);
@Autowired @Autowired
private ProjectRepository projectRepository; private ProjectRepository projectRepository;
@Autowired @Autowired
@ -93,6 +96,7 @@ public class ProjectInstanceService {
HashMap<String, Object> variables = new HashMap<>(); HashMap<String, Object> variables = new HashMap<>();
variables.put(ActConstant.KEY_PROJECT_TYPE, project.getType()); variables.put(ActConstant.KEY_PROJECT_TYPE, project.getType());
String businessKey = String.valueOf(project.getId()); String businessKey = String.valueOf(project.getId());
logger.info("startProcess processDefkey:{}, businessKey：{}", processDefkey, businessKey);
String processInstanceId = actProcInsService.startProcessInstance(processDefkey, businessKey, variables); String processInstanceId = actProcInsService.startProcessInstance(processDefkey, businessKey, variables);
//保存流程实例id与项目的关联关系 //保存流程实例id与项目的关联关系