Merge branch 'dev'

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

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 审批不通过
      */

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<Boolean> achieve(@ApiParam(value = "流程实例id", required = true) @PathVariable("id") String id) {
+
+        return BaseResponse.success(projectReEvaluationService.achieve(id));
+    }
 }

src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java

@@ -105,4 +105,11 @@ public interface IProjectReEvaluationService extends IBaseService<ProjectReEvalu
      * @return 返回结果
      */
     TraceDetail findTraceDetail(String instanceId);
+
+    /**
+     * 项目重评生效
+     * @param id 主键ID
+     * @return 返回结果
+     */
+    boolean achieve(String id);
 }

src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java

@@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.project.projectreevaluation.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -181,9 +182,6 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean submitForApproval(String id) {
-//        boolean result = updateStatus(id,ProjectCommonUtil.RE_EVALUATION_STATUS_0,ProjectCommonUtil.RE_EVALUATION_STATUS_2);
-//        initSection(id);
-
         //1 去采购系统校验子项目信息是否发生改变  如果发生改变不可以重新评审
         ProjectReEvaluation evaluation = this.getById(id);
         ProjectSection section = sectionService.getById(evaluation.getSectionId());
@@ -213,12 +211,10 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional(rollbackFor = Exception.class,timeoutMills = 60000 * 2)
     public boolean callbackApproval(WasUpdateBizDTO dto) {
         boolean result = false;
         if(StringUtils.equals(EbpProjectCommonUtil.CALLBACK_APPROVAL_STATUS_YES,dto.getAuditState())){
             result = updateStatus(dto.getId(),ProjectCommonUtil.RE_EVALUATION_STATUS_1,ProjectCommonUtil.RE_EVALUATION_STATUS_2);
-            initSection(dto.getId());
         }else if(StringUtils.equals(EbpProjectCommonUtil.CALLBACK_APPROVAL_STATUS_NO,dto.getAuditState())){
             result = updateStatus(dto.getId(),ProjectCommonUtil.RE_EVALUATION_STATUS_1,ProjectCommonUtil.RE_EVALUATION_STATUS_9);
         }
@@ -296,7 +292,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
     /**
      * 校验发起审批的标段所处流程是否正确  状态是否正确
      * 只有当标段所处定标环节才可以重新评标
-     * 如果重新评审数据有审批中 初始化  不可以新增 只能修改或进行评审
+     * 如果重新评审数据有审批中 初始化 审批通过 不可以新增 只能修改或进行评审
      * @param sectionId 标段ID
      */
     @Override
@@ -320,10 +316,11 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
             ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_SAVE_ERROR.throwException();
         }
 
-
+        //校验查询状态是 0 初始化 1 提交审批  2 审批通过 则不允许有新增操作
+        Integer[] statusArray = {ProjectCommonUtil.RE_EVALUATION_STATUS_0,ProjectCommonUtil.RE_EVALUATION_STATUS_1,ProjectCommonUtil.RE_EVALUATION_STATUS_2};
         QueryWrapper<ProjectReEvaluation> 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<ProjectReEva
         return response.getData();
     }
 
+    @Override
+    @GlobalTransactional(timeoutMills = 60000 * 2)
+    public boolean achieve(String id) {
+        boolean result = updateStatus(id,ProjectCommonUtil.RE_EVALUATION_STATUS_2,ProjectCommonUtil.RE_EVALUATION_STATUS_3);
+        initSection(id);
+        return result;
+    }
+
 
     /**
      * 初始化标段信息

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:
     # 逻辑删除配置