|
|
@@ -1,6 +1,7 @@ |
|
|
|
package com.ningdatech.pmapi.projectlib.handle; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.ningdatech.pmapi.common.constant.BizConst; |
|
|
|
import com.ningdatech.pmapi.common.constant.CommonConst; |
|
|
|
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; |
|
|
|
import com.ningdatech.pmapi.projectlib.model.entity.Project; |
|
|
@@ -57,7 +58,9 @@ public class ProvinceUnitedReviewHandle extends AbstractProcessBusinessHandle { |
|
|
|
ProjectStatusChange startChange = projectStatusChangeService.getOne(Wrappers.lambdaQuery(ProjectStatusChange.class) |
|
|
|
.in(ProjectStatusChange::getProjectId, allVersionProjectId) |
|
|
|
.eq(ProjectStatusChange::getBeforeStatus, ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode()) |
|
|
|
.eq(ProjectStatusChange::getAfterStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode())); |
|
|
|
.eq(ProjectStatusChange::getAfterStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()).orderByDesc(ProjectStatusChange::getCreateOn) |
|
|
|
.orderByDesc(ProjectStatusChange::getCreateOn) |
|
|
|
.last(BizConst.LIMIT_1)); |
|
|
|
if(Objects.nonNull(startChange)){ |
|
|
|
processDetailVO.setFinishTime(startChange.getCreateOn()); |
|
|
|
} |
|
|
@@ -66,7 +69,9 @@ public class ProvinceUnitedReviewHandle extends AbstractProcessBusinessHandle { |
|
|
|
ProjectStatusChange passChange = projectStatusChangeService.getOne(Wrappers.lambdaQuery(ProjectStatusChange.class) |
|
|
|
.in(ProjectStatusChange::getProjectId, allVersionProjectId) |
|
|
|
.eq(ProjectStatusChange::getBeforeStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()) |
|
|
|
.eq(ProjectStatusChange::getAfterStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS.getCode())); |
|
|
|
.eq(ProjectStatusChange::getAfterStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS.getCode()) |
|
|
|
.orderByDesc(ProjectStatusChange::getCreateOn) |
|
|
|
.last(BizConst.LIMIT_1)); |
|
|
|
if(Objects.nonNull(passChange)){ |
|
|
|
processDetailVO.setFinishTime(passChange.getCreateOn()); |
|
|
|
} |
|
|
@@ -75,7 +80,9 @@ public class ProvinceUnitedReviewHandle extends AbstractProcessBusinessHandle { |
|
|
|
ProjectStatusChange rejectChange = projectStatusChangeService.getOne(Wrappers.lambdaQuery(ProjectStatusChange.class) |
|
|
|
.in(ProjectStatusChange::getProjectId, allVersionProjectId) |
|
|
|
.eq(ProjectStatusChange::getBeforeStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()) |
|
|
|
.eq(ProjectStatusChange::getAfterStatus, ProjectStatusEnum.THE_JOINT_REVIEW_OF_PROVINCIAL_DEPARTMENTS_FAILED.getCode())); |
|
|
|
.eq(ProjectStatusChange::getAfterStatus, ProjectStatusEnum.THE_JOINT_REVIEW_OF_PROVINCIAL_DEPARTMENTS_FAILED.getCode()) |
|
|
|
.orderByDesc(ProjectStatusChange::getCreateOn) |
|
|
|
.last(BizConst.LIMIT_1)); |
|
|
|
if(Objects.nonNull(rejectChange)){ |
|
|
|
processDetailVO.setFinishTime(rejectChange.getCreateOn()); |
|
|
|
} |
|
|
|