@@ -97,6 +97,8 @@ public class ConstructionManage { | |||||
query.eq(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()); | query.eq(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()); | ||||
query.eq(Project::getStage, ProjectStatusEnum.PROJECT_APPROVED.getCode()); | query.eq(Project::getStage, ProjectStatusEnum.PROJECT_APPROVED.getCode()); | ||||
query.eq(Project::getNewest, Boolean.TRUE); | query.eq(Project::getNewest, Boolean.TRUE); | ||||
//只能看自己单位的 | |||||
query.eq(Project::getBuildOrgCode,user.getEmpPosUnitCode()); | |||||
query.orderByAsc(Project::getTransactionTime); | query.orderByAsc(Project::getTransactionTime); | ||||
Page<Project> page = projectService.page(req.page(), query); | Page<Project> page = projectService.page(req.page(), query); | ||||
long total; | long total; | ||||
@@ -89,6 +89,8 @@ public class FinalAcceptanceManage { | |||||
VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!"); | VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!"); | ||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | ||||
//待终验 并且还未过期 | //待终验 并且还未过期 | ||||
//只能看自己单位的 | |||||
query.eq(Project::getBuildOrgCode,user.getEmpPosUnitCode()); | |||||
query.eq(Project::getStatus,ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode()); | query.eq(Project::getStatus,ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode()); | ||||
query.eq(Project::getStage,ProjectStatusEnum.PROJECT_APPROVED.getCode()); | query.eq(Project::getStage,ProjectStatusEnum.PROJECT_APPROVED.getCode()); | ||||
query.ge(Project::getPlanAcceptanceTime, LocalDateTime.now()); | query.ge(Project::getPlanAcceptanceTime, LocalDateTime.now()); | ||||
@@ -74,6 +74,8 @@ public class PurchaseManage { | |||||
UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId()); | UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId()); | ||||
VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!"); | VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!"); | ||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | ||||
//只能看自己单位的 | |||||
query.eq(Project::getBuildOrgCode,user.getEmpPosUnitCode()); | |||||
//待采购状态 | //待采购状态 | ||||
query.in(Project::getStatus, Lists.newArrayList(ProjectStatusEnum.TO_BE_PURCHASED.getCode(), | query.in(Project::getStatus, Lists.newArrayList(ProjectStatusEnum.TO_BE_PURCHASED.getCode(), | ||||
ProjectStatusEnum.OPERATION.getCode())); | ProjectStatusEnum.OPERATION.getCode())); | ||||