|
|
@@ -518,6 +518,10 @@ public class WorkbenchManage { |
|
|
|
Long unitId = Optional.ofNullable(req.getUnitId()).orElseGet(LoginUserUtil::getMhUnitId); |
|
|
|
List<Long> viewUnitIds = mhUnitCache.getViewChildIdsRecursion(unitId); |
|
|
|
LambdaQueryWrapper<Project> query = Wrappers.lambdaQuery(Project.class) |
|
|
|
.select(Project::getId, Project::getStage, Project::getStatus, Project::getProjectCode, |
|
|
|
Project::getBuildOrgCode, Project::getBuildOrgName, Project::getApprovalAmount, |
|
|
|
Project::getCreateOn, Project::getProjectName, Project::getProjectYear, |
|
|
|
Project::getDeclareAmount, Project::getReviewAmount) |
|
|
|
.eq(req.getProjectYear() != null, Project::getProjectYear, req.getProjectYear()) |
|
|
|
.like(StrUtil.isNotBlank(req.getBuildOrg()), Project::getBuildOrgName, req.getBuildOrg()) |
|
|
|
.like(StrUtil.isNotBlank(req.getProjectName()), Project::getProjectName, req.getProjectName()) |
|
|
@@ -573,7 +577,6 @@ public class WorkbenchManage { |
|
|
|
.projectYear(w.getProjectYear()) |
|
|
|
.buildOrg(w.getBuildOrgName()) |
|
|
|
.buildOrgCode(w.getBuildOrgCode()) |
|
|
|
.bizDomain(w.getBizDomain()) |
|
|
|
.approvedAmount(w.getApprovalAmount()) |
|
|
|
.reviewAmount(w.getReviewAmount()) |
|
|
|
.declaredAmount(w.getDeclareAmount()) |
|
|
|