diff --git a/pro.yaml b/pro.yaml index 10068bb..3b48a80 100644 --- a/pro.yaml +++ b/pro.yaml @@ -75,7 +75,7 @@ spec: memory: 6Gi env: - name: APP_NAME - value: biz-ebtp-project + value: biz_ebtp_project - name: AGENT_LICENCE value: 527BFA7B28577578 - name: APOLLO_CONFIGSERVICE diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java index a2bd7fc..7ded12e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java @@ -403,6 +403,11 @@ public class ProjectCommonUtil { */ public static final int RE_EVALUATION_STATUS_2 = 2; + /** + * 重新评审 3 重评生效 + */ + public static final int RE_EVALUATION_STATUS_3 = 3; + /** * 重新评审 9 审批不通过 */ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java index 0a1c070..2cb2a79 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java @@ -215,4 +215,17 @@ public class ProjectReEvaluationController { return BaseResponse.success(projectReEvaluationService.findTraceDetail(instanceId)); } + + /** + * 项目重评生效 + * @param id 主键ID + * @return 返回结果 + */ + @ApiOperation("项目重评生效") + @GetMapping("/achieve/{id}") + @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") + public BaseResponse achieve(@ApiParam(value = "流程实例id", required = true) @PathVariable("id") String id) { + + return BaseResponse.success(projectReEvaluationService.achieve(id)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java index 4fd6072..c70f7c8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java @@ -105,4 +105,11 @@ public interface IProjectReEvaluationService extends IBaseService evaluationQueryWrapper = new QueryWrapper<>(); evaluationQueryWrapper.eq(ProjectReEvaluationField.SECTION_ID,sectionId); - evaluationQueryWrapper.and(wrapper -> wrapper.eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_0).or().eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1)); + evaluationQueryWrapper.in(ProjectReEvaluationField.STATUS, ListUtil.toList(statusArray)); int count = this.count(evaluationQueryWrapper); if(count > 0){ ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_FIND_STATUS_ERROR.throwException(); @@ -364,6 +361,14 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl