From eccada24ba171d79e36f33e8a08412e857dc1762 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Mon, 29 Mar 2021 16:49:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=A0=E5=A4=A9=E7=9C=BC=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=AD=E5=88=92=E7=BA=BF=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E5=9B=A0=E6=AD=A4=E5=B0=86=E5=85=B6=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=8B=E5=88=92=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pro.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 551d2b88b767d092ad0318a18d9e82f026f82617 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 30 Mar 2021 09:39:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=95=88=E6=8C=89=E9=92=AE=20?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=89=8B=E5=8A=A8=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/common/ProjectCommonUtil.java | 5 +++++ .../ProjectReEvaluationController.java | 13 ++++++++++++ .../service/IProjectReEvaluationService.java | 7 +++++++ .../impl/ProjectReEvaluationServiceImpl.java | 21 ++++++++++++------- 4 files changed, 38 insertions(+), 8 deletions(-) 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 Date: Tue, 30 Mar 2021 09:40:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8E=BB=E6=8E=89=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index bce0279..3cf63ef 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -112,7 +112,7 @@ mybatis-plus: map-underscore-to-camel-case: true auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置