From 7f6fd4d231ccbd1f7eff7b85501710d8bfded6e1 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Sat, 11 May 2024 17:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/PerformanceAppraisalPlanManage.java | 6 +----- .../projectdeclared/manage/ConstructionPlanManage.java | 4 ++-- .../manage/PrequalificationDeclaredProjectManage.java | 3 +-- .../projectdeclared/manage/ReviewByDeptJointManage.java | 2 +- .../projectlib/handle/ConstructionPlanReviewHandle.java | 2 +- .../api/projectlib/handle/DeptUnitedReviewHandle.java | 2 +- .../api/projectlib/handle/PreliminaryPreviewHandle.java | 2 +- .../projectlib/handle/ProjectFinalInspectionHandle.java | 2 +- .../pm/api/projectlib/handle/UnitInnerAuditHandle.java | 2 +- .../hz/pm/api/projectlib/manage/ProjectLibManage.java | 17 ++++++++--------- .../hz/pm/api/projectlib/model/entity/ProjectInst.java | 2 +- .../hz/pm/api/todocenter/manage/TodoCenterManage.java | 6 +++--- hz-pm-api/src/main/resources/security/auth-pre.yml | 1 + hz-pm-api/src/main/resources/security/auth-prod.yml | 1 + 14 files changed, 24 insertions(+), 28 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/PerformanceAppraisalPlanManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/PerformanceAppraisalPlanManage.java index 3324327..fcd0132 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/PerformanceAppraisalPlanManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/PerformanceAppraisalPlanManage.java @@ -7,13 +7,10 @@ import java.util.stream.Collectors; import com.hz.pm.api.performance.model.entity.*; import com.hz.pm.api.performance.service.*; import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum; -import com.hz.pm.api.projectlib.helper.ProjectHelper; import com.hz.pm.api.projectlib.manage.ProjectLibManage; import com.hz.pm.api.projectlib.model.req.ProjectListReq; import com.hz.pm.api.projectlib.model.vo.ProjectApplicationVO; import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO; -import com.wflow.workflow.bean.vo.ProcessTaskVo; -import org.checkerframework.checker.nullness.qual.Nullable; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -44,7 +41,6 @@ import com.hz.pm.api.performance.model.vo.PerformanceAppraisalProjectVO; import com.hz.pm.api.performance.model.vo.PerformanceAppraisalVO; import com.hz.pm.api.projectlib.enumeration.InstTypeEnum; import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; -import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum; import com.hz.pm.api.projectlib.model.entity.Project; import com.hz.pm.api.projectlib.model.entity.ProjectApplication; import com.hz.pm.api.projectlib.model.entity.ProjectInst; @@ -400,7 +396,7 @@ public class PerformanceAppraisalPlanManage { ProjectInst projectInst = projectInstService.getOne(Wrappers.lambdaQuery(ProjectInst.class) .in(ProjectInst::getProjectId, allVersionProjectIds) .eq(ProjectInst::getInstType, InstTypeEnum.PROJECT_FINAL_INSPECTION.getCode()) - .orderByDesc(ProjectInst::getCreatOn) + .orderByDesc(ProjectInst::getCreateOn) .last(BizConst.LIMIT_1)); if (Objects.isNull(projectInst)){ diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionPlanManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionPlanManage.java index 89b88d3..a445f12 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionPlanManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionPlanManage.java @@ -203,7 +203,7 @@ public class ConstructionPlanManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(ProjectProcessStageEnum.CONSTRUCTION_PROJECT_APPROVAL_PROCESS.getCode()); projectInstService.save(projectInst); @@ -257,7 +257,7 @@ public class ConstructionPlanManage { projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); projectInst.setInstType(InstTypeEnum.CONSTRUCTION_PLAN_REVIEW.getCode()); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInstService.save(projectInst); } catch (Exception e) { diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PrequalificationDeclaredProjectManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PrequalificationDeclaredProjectManage.java index 7bec4ac..0f4d849 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PrequalificationDeclaredProjectManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PrequalificationDeclaredProjectManage.java @@ -19,7 +19,6 @@ import com.hz.pm.api.projectdeclared.model.dto.DefaultDeclaredDTO; import com.hz.pm.api.projectdeclared.model.dto.PretrialDeclaredExportDTO; import com.hz.pm.api.projectdeclared.model.req.PrequalificationDeclaredListReq; import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; -import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum; import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum; import com.hz.pm.api.projectlib.helper.ProjectHelper; import com.hz.pm.api.projectlib.manage.ProjectLibManage; @@ -232,7 +231,7 @@ public class PrequalificationDeclaredProjectManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(ProjectProcessStageEnum.PROJECT_PREQUALIFICATION_APPROVAL_PROCESS.getCode()); projectInstService.save(projectInst); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ReviewByDeptJointManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ReviewByDeptJointManage.java index 05f6d09..2b394e3 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ReviewByDeptJointManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ReviewByDeptJointManage.java @@ -120,7 +120,7 @@ public class ReviewByDeptJointManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(ProjectProcessStageEnum.DEPARTMENT_JOINT_APPROVAL_PROCESS.getCode()); projectInstService.save(projectInst); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ConstructionPlanReviewHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ConstructionPlanReviewHandle.java index b030906..b6a7ab9 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ConstructionPlanReviewHandle.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ConstructionPlanReviewHandle.java @@ -64,7 +64,7 @@ public class ConstructionPlanReviewHandle extends AbstractProcessBusinessHandle .in(ProjectInst::getProjectId, allVersionProjectIds) .eq(ProjectInst::getInstType, InstTypeEnum.CONSTRUCTION_PLAN_REVIEW.getCode()) .ne(ProjectInst::getInstCode, TodoCenterConstant.Declared.NULL_INST_CODE) - .orderByDesc(ProjectInst::getCreatOn) + .orderByDesc(ProjectInst::getCreateOn) .last(BizConst.LIMIT_1)); ProcessProgressVo instanceDetail = null; // 未找到当前版本项目的建设方案审核流程且当前项目版本号大于1(是被驳回重新申报的项目) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/DeptUnitedReviewHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/DeptUnitedReviewHandle.java index 967b84c..d4f11d9 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/DeptUnitedReviewHandle.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/DeptUnitedReviewHandle.java @@ -65,7 +65,7 @@ public class DeptUnitedReviewHandle extends AbstractProcessBusinessHandle { .in(ProjectInst::getProjectId, allVersionProjectIds) .eq(ProjectInst::getInstType, InstTypeEnum.DEPT_UNITED_REVIEW.getCode()) .ne(ProjectInst::getInstCode, TodoCenterConstant.Declared.NULL_INST_CODE) - .orderByDesc(ProjectInst::getCreatOn) + .orderByDesc(ProjectInst::getCreateOn) .last(BizConst.LIMIT_1)); if (Objects.isNull(projectInst)) { processDetailVO.setStepStatus(StepStatusEnum.NOT_START); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/PreliminaryPreviewHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/PreliminaryPreviewHandle.java index 42736c2..8280658 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/PreliminaryPreviewHandle.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/PreliminaryPreviewHandle.java @@ -68,7 +68,7 @@ public class PreliminaryPreviewHandle extends AbstractProcessBusinessHandle { .in(ProjectInst::getProjectId, allVersionProjectIds) .eq(ProjectInst::getInstType, InstTypeEnum.PRELIMINARY_PREVIEW.getCode()) .ne(ProjectInst::getInstCode, TodoCenterConstant.Declared.NULL_INST_CODE) - .orderByDesc(ProjectInst::getCreatOn) + .orderByDesc(ProjectInst::getCreateOn) .last("limit 1")); ProcessProgressVo instanceDetail = null; // 未找到当前版本项目的预审审核流程且当前项目版本号大于1(是被驳回重新申报的项目或者建设方案申报的项目) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ProjectFinalInspectionHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ProjectFinalInspectionHandle.java index 9a2f692..3e58f31 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ProjectFinalInspectionHandle.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ProjectFinalInspectionHandle.java @@ -62,7 +62,7 @@ public class ProjectFinalInspectionHandle extends AbstractProcessBusinessHandle .in(ProjectInst::getProjectId, allVersionProjectIds) .eq(ProjectInst::getInstType, InstTypeEnum.PROJECT_FINAL_INSPECTION.getCode()) .ne(ProjectInst::getInstCode, TodoCenterConstant.Declared.NULL_INST_CODE) - .orderByDesc(ProjectInst::getCreatOn) + .orderByDesc(ProjectInst::getCreateOn) .last(BizConst.LIMIT_1)); if (Objects.isNull(projectInst)){ diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/UnitInnerAuditHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/UnitInnerAuditHandle.java index d536393..ee5db27 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/UnitInnerAuditHandle.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/UnitInnerAuditHandle.java @@ -67,7 +67,7 @@ public class UnitInnerAuditHandle extends AbstractProcessBusinessHandle { .in(ProjectInst::getProjectId, allVersionProjectIds) .eq(ProjectInst::getInstType, InstTypeEnum.UNIT_INNER_AUDIT.getCode()) .ne(ProjectInst::getInstCode, TodoCenterConstant.Declared.NULL_INST_CODE) - .orderByDesc(ProjectInst::getCreatOn) + .orderByDesc(ProjectInst::getCreateOn) .last(BizConst.LIMIT_1)); ProcessProgressVo instanceDetail = null; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java index fd3037b..8b2f2e5 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java @@ -78,7 +78,6 @@ import com.hz.pm.api.safety.service.IPersonSafetyInfoService; import com.hz.pm.api.safety.service.ISupplierSafetyQualificationService; import com.hz.pm.api.todocenter.model.req.ProcessDetailReq; import com.hz.pm.api.todocenter.service.ITodoService; -import com.hz.pm.api.user.entity.UserInfo; import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO; import com.hz.pm.api.user.security.auth.model.UserInfoDetails; import com.hz.pm.api.user.util.LoginUserUtil; @@ -855,7 +854,7 @@ public class ProjectLibManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(ProjectProcessStageEnum.ORG_INTERNAL_APPROVAL_PROCESS.getCode()); projectInstService.save(projectInst); @@ -886,7 +885,7 @@ public class ProjectLibManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(ProjectProcessStageEnum.CONSTRUCTION_PROJECT_APPROVAL_PROCESS.getCode()); projectInstService.save(projectInst); @@ -1109,7 +1108,7 @@ public class ProjectLibManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(instType); projectInstService.save(projectInst); @@ -1143,7 +1142,7 @@ public class ProjectLibManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(instType); projectInstService.save(projectInst); @@ -1185,7 +1184,7 @@ public class ProjectLibManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(instType); projectInstService.save(projectInst); @@ -1225,7 +1224,7 @@ public class ProjectLibManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInst.setInstType(instType); projectInstService.save(projectInst); @@ -1451,7 +1450,7 @@ public class ProjectLibManage { projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); projectInst.setInstType(InstTypeEnum.APPLY_DELAY.getCode()); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInstService.save(projectInst); } @@ -1481,7 +1480,7 @@ public class ProjectLibManage { projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); projectInst.setInstType(InstTypeEnum.APPLY_BORROW.getCode()); - projectInst.setCreatOn(LocalDateTime.now()); + projectInst.setCreateOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInstService.save(projectInst); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/ProjectInst.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/ProjectInst.java index 7537377..0df444a 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/ProjectInst.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/ProjectInst.java @@ -38,7 +38,7 @@ public class ProjectInst implements Serializable { private Integer instType; @ApiModelProperty("创建时间") - private LocalDateTime creatOn; + private LocalDateTime createOn; @ApiModelProperty("修改时间") private LocalDateTime updateOn; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java index 4afefdc..c0c8138 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java @@ -1170,7 +1170,7 @@ public class TodoCenterManage { newPi.setProjectId(project.getId()); newPi.setInstType(oldInst.getInstType()); newPi.setInstCode(instCode); - newPi.setCreatOn(LocalDateTime.now()); + newPi.setCreateOn(LocalDateTime.now()); newPi.setUpdateOn(LocalDateTime.now()); projectInstService.save(newPi); @@ -1574,11 +1574,11 @@ public class TodoCenterManage { ProjectInst projectInst = projectInstService.getOne(Wrappers.lambdaQuery(ProjectInst.class) .eq(ProjectInst::getProjectId, projectId) .eq(ProjectInst::getInstType, InstTypeEnum.PRELIMINARY_PREVIEW.getCode()) - .orderByDesc(ProjectInst::getCreatOn) + .orderByDesc(ProjectInst::getCreateOn) .last("limit 1")); LocalDateTime time = null; if (Objects.nonNull(projectInst)) { - time = projectInst.getCreatOn(); + time = projectInst.getCreateOn(); paramsMap.put("time", NdDateUtils.format(time, "yyyy-MM-dd HH:mm")); } else { paramsMap.put("time", null); diff --git a/hz-pm-api/src/main/resources/security/auth-pre.yml b/hz-pm-api/src/main/resources/security/auth-pre.yml index 7833ea3..ebfd945 100644 --- a/hz-pm-api/src/main/resources/security/auth-pre.yml +++ b/hz-pm-api/src/main/resources/security/auth-pre.yml @@ -70,6 +70,7 @@ security: - /api/v1/wps-convert/** - /api/v1/belong-org/business-strip/list - /expert/ephemeral/*/registration + - /open/api/** role-map: "engineer": "project_manager": diff --git a/hz-pm-api/src/main/resources/security/auth-prod.yml b/hz-pm-api/src/main/resources/security/auth-prod.yml index e1550a1..6228ff9 100644 --- a/hz-pm-api/src/main/resources/security/auth-prod.yml +++ b/hz-pm-api/src/main/resources/security/auth-prod.yml @@ -71,6 +71,7 @@ security: - /api/v1/wps-convert/** - /api/v1/belong-org/business-strip/list - /expert/ephemeral/*/registration + - /open/api/** role-map: "engineer": "project_manager":