project_management-java.git

			@@ -19,9 +19,7 @@
			import com.ycl.domain.entity.*;
			import com.ycl.domain.form.*;
			import com.ycl.domain.json.*;
			import com.ycl.domain.vo.CustomerTaskVO;
			import com.ycl.domain.vo.IndexCustomerTaskVO;
			import com.ycl.domain.vo.ProjectProcessDetailVO;
			import com.ycl.domain.vo.*;
			import com.ycl.event.event.TaskLogEvent;
			import com.ycl.mapper.ProjectEngineeringMapper;
			import com.ycl.mapper.ProjectInfoMapper;
			@@ -29,7 +27,6 @@
			import com.ycl.service.*;
			import com.ycl.common.base.Result;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ycl.domain.vo.ProjectProcessVO;
			import com.ycl.domain.query.ProjectProcessQuery;
			import com.ycl.service.common.TaskCommonService;
			import com.ycl.system.service.ISysDeptService;
			@@ -105,9 +102,20 @@
			IPage<ProjectProcessVO> page = PageUtil.getPage(query, ProjectProcessVO.class);
			baseMapper.getPage(query, page);
			for (ProjectProcessVO vo : page.getRecords()) {
			vo.setChildren(TreeUtil.treeForProjectEng(baseMapper.getEngineeringList(vo.getId())));
			List<ProjectEngineeringVO> childList = baseMapper.getEngineeringList(vo.getId());
			childList.stream().forEach(child -> {
			if (StringUtils.isNotBlank(child.getProcessDefId())) {
			ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(child.getProcessDefId()).singleResult();
			if (Objects.nonNull(processDefinition)) {
			child.setSuspended(processDefinition.isSuspended());
			child.setFlowableProcessName(processDefinition.getName() + "(v" + processDefinition.getVersion() + ")");
			child.setDeployId(processDefinition.getDeploymentId());
			}
			}
			});
			vo.setChildren(TreeUtil.treeForProjectEng(childList));
			vo.setStatus(vo.getProjectStatus());
			if (Objects.nonNull(vo.getProcessDefId())) {
			if (StringUtils.isNotBlank(vo.getProcessDefId())) {
			ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(vo.getProcessDefId()).singleResult();
			if (Objects.nonNull(processDefinition)) {
			vo.setSuspended(processDefinition.isSuspended());

	business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -41,6 +41,15 @@
			@ApiModelProperty("流程定义id")
			private String processDefId;

			@ApiModelProperty("发布id")
			private String deployId;

			@ApiModelProperty("流程名称")
			private String flowableProcessName;

			@ApiModelProperty("流程是否挂起/暂停")
			private boolean suspended;

			/** 项目推进类型 */
			@ApiModelProperty("项目推进类型")
			private String projectType;