From cc8111f703c72074888e79fc5d7f5f24aa13d49e Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 27 Sep 2024 15:06:02 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E9=A1=B9=E7=9B=AE=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/projectdeclared/manage/ProjectReviewManage.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectReviewManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectReviewManage.java index cdf641b..26227e6 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectReviewManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectReviewManage.java @@ -10,6 +10,7 @@ import com.hz.pm.api.common.exception.ReturnException; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.common.model.constant.ExistsSqlConst; +import com.hz.pm.api.common.model.constant.MhUnitConst; import com.hz.pm.api.common.statemachine.event.ProjectStateChangeEvent; import com.hz.pm.api.common.statemachine.util.ProjectStateMachineUtil; import com.hz.pm.api.common.util.BizUtils; @@ -102,7 +103,6 @@ public class ProjectReviewManage { String instanceId = processInstanceService.startProcessLs(model, processParam, orgMap); BeanUtils.copyProperties(reqProj, project); - projectStateMachineUtil.pass(project); if (projectService.updateById(project)) { projectSaveHelper.saveApplication(reqProj, project, null); projectSaveHelper.savePaymentPlans(project, reqProj.getPaymentPlanList()); @@ -282,7 +282,7 @@ public class ProjectReviewManage { List records = CollUtils.convert(page.getRecords(), w -> { projectIds.add(w.getId()); ProjectLibListItemVO item = BeanUtil.copyProperties(w, ProjectLibListItemVO.class); - if (!ProjectStatus.EXPERT_REVIEW_PASSED.eq(w.getStatus()) + if (!ProjectStatus.EXPERT_REVIEW_FAILED.eq(w.getStatus()) && !ProjectStatus.COMPLIANCE_REVIEW_PASSED.eq(w.getStatus()) && !ProjectStatus.WITHOUT_EXPERT_REVIEW.eq(w.getStatus()) && !ProjectStatus.ON_EXPERT_REVIEW.eq(w.getStatus()) @@ -329,18 +329,14 @@ public class ProjectReviewManage { } List viewUnitIdList = CollUtils.convert(childUnitIds, String::valueOf); //单位管理员 看到自己单位去申报的 + 待预审的主管单位是自己单位的项目 - query.and(q1 -> q1.in(Project::getBuildOrgCode, viewUnitIdList) - .or(q2 -> q2.eq(Project::getStage, ProjectStatus.NOT_APPROVED.getCode()) - .in(Project::getSuperOrgCode, viewUnitIdList))); + query.in(Project::getBuildOrgCode, viewUnitIdList); } break; case SUPER_ADMIN: { - if (declaredUnitId != null) { + if (declaredUnitId != null && MhUnitConst.ROOT_UNIT_ID != declaredUnitId) { List viewUnitIds = mhUnitCache.getViewChildIdsRecursion(declaredUnitId); List viewUnitIdList = CollUtils.convert(viewUnitIds, String::valueOf); - query.and(q1 -> q1.in(Project::getBuildOrgCode, viewUnitIdList) - .or(q2 -> q2.eq(Project::getStage, ProjectStatus.NOT_APPROVED.getCode()) - .in(Project::getSuperOrgCode, viewUnitIdList))); + query.in(Project::getBuildOrgCode, viewUnitIdList); } } break; @@ -360,7 +356,7 @@ public class ProjectReviewManage { public void uploadConstructionPlanSealFile(UploadConstructionPlanSealFileReq req) { Project project = projectService.getNewProject(req.getProjectId()); - if (project == null || (ProjectStatus.WITHOUT_EXPERT_REVIEW.eq(project.getStatus()) + if (project == null || (!ProjectStatus.WITHOUT_EXPERT_REVIEW.eq(project.getStatus()) && !ProjectStatus.EXPERT_REVIEW_FAILED.eq(project.getStatus()))) { throw ReturnException.wrap("项目不存在或项目状态异常"); }