|
|
@@ -11,7 +11,7 @@ import com.ningdatech.pmapi.declared.entity.dto.DeclaredProjectListParamDto; |
|
|
|
import com.ningdatech.pmapi.projectlib.enums.ProjectStatusEnum; |
|
|
|
import com.ningdatech.pmapi.projectlib.model.entity.Project; |
|
|
|
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; |
|
|
|
import com.ningdatech.pmapi.projectlib.service.INdProjectService; |
|
|
|
import com.ningdatech.pmapi.projectlib.service.IProjectService; |
|
|
|
import com.wflow.bean.entity.WflowModels; |
|
|
|
import com.wflow.exception.BusinessException; |
|
|
|
import com.wflow.workflow.bean.vo.ProcessStartParamsVo; |
|
|
@@ -41,7 +41,7 @@ import java.util.stream.Collectors; |
|
|
|
@RequiredArgsConstructor |
|
|
|
public class DeclaredProjectManage { |
|
|
|
|
|
|
|
private final INdProjectService ndProjectService; |
|
|
|
private final IProjectService projectService; |
|
|
|
|
|
|
|
private final ProcessInstanceService processService; |
|
|
|
|
|
|
@@ -58,7 +58,7 @@ public class DeclaredProjectManage { |
|
|
|
.eq(Objects.nonNull(params.getProjectStatusSecond()), Project::getProjectStatusSecond, params.getProjectStatusSecond()) |
|
|
|
.like(StringUtils.isNotBlank(params.getProjectName()), Project::getProjectName, params.getProjectName()) |
|
|
|
.orderByDesc(Project::getUpdateOn); |
|
|
|
ndProjectService.page(page,wrapper); |
|
|
|
projectService.page(page,wrapper); |
|
|
|
if(0L == page.getTotal()){ |
|
|
|
return PageVo.empty(); |
|
|
|
} |
|
|
@@ -106,7 +106,7 @@ public class DeclaredProjectManage { |
|
|
|
project.setProjectStatusFirst(ProjectStatusEnum.NOT_APPROVED.getCode()); |
|
|
|
project.setProjectStatusSecond(ProjectStatusEnum.UNDER_INTERNAL_AUDIT.getCode()); |
|
|
|
project.setInstCode(instanceId); |
|
|
|
ndProjectService.save(project); |
|
|
|
projectService.save(project); |
|
|
|
}catch (Exception e){ |
|
|
|
log.error("项目信息入库错误 ",e); |
|
|
|
throw new BusinessException("项目信息入库错误 请注意格式"); |
|
|
|