|
@@ -57,6 +57,8 @@ public class AnnualPlanLibManage { |
|
|
private final IProjectService projectService; |
|
|
private final IProjectService projectService; |
|
|
private final StateMachineUtils stateMachine; |
|
|
private final StateMachineUtils stateMachine; |
|
|
|
|
|
|
|
|
|
|
|
private final ProjectLibManage projectLibManage; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 年度计划查询状态 |
|
|
* 年度计划查询状态 |
|
|
*/ |
|
|
*/ |
|
@@ -87,6 +89,8 @@ public class AnnualPlanLibManage { |
|
|
query.eq(Project::getIsTemporaryAugment, isTemporaryAugment); |
|
|
query.eq(Project::getIsTemporaryAugment, isTemporaryAugment); |
|
|
query.orderByDesc(Project::getAnnualPlanAddTime); |
|
|
query.orderByDesc(Project::getAnnualPlanAddTime); |
|
|
query.in(Project::getStatus, CollUtils.fieldList(ANNUAL_PLAN_LIST_STATUS, ProjectStatusEnum::getCode)); |
|
|
query.in(Project::getStatus, CollUtils.fieldList(ANNUAL_PLAN_LIST_STATUS, ProjectStatusEnum::getCode)); |
|
|
|
|
|
//数据权限 |
|
|
|
|
|
projectLibManage.buildProjectLibPermission(query); |
|
|
Page<Project> page = projectService.page(req.page(), query); |
|
|
Page<Project> page = projectService.page(req.page(), query); |
|
|
long total; |
|
|
long total; |
|
|
if ((total = page.getTotal()) == 0) { |
|
|
if ((total = page.getTotal()) == 0) { |
|
|