Merge branch 'master' into 'pro'

修改配置文件

See merge request eshop/biz_service_ebtp_project!25

pro.yaml

@@ -47,25 +47,25 @@ spec:
             mountPath: /log
         ports:            
         - containerPort: 18012  #[8] 容器需要监听的端口号，与配置文件中的server.port参数相同，与参数[4]相同
-        livenessProbe:
+#        livenessProbe:
-          failureThreshold: 3
+#          failureThreshold: 3
-          httpGet:
+#          httpGet:
-            port: 18012            #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
+#            port: 18012            #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
-            path: /actuator/prometheus  
+#            path: /actuator/prometheus
-            scheme: HTTP
+#            scheme: HTTP
-          initialDelaySeconds: 300
+#          initialDelaySeconds: 300
-          periodSeconds: 60
+#          periodSeconds: 60
-          successThreshold: 1
+#          successThreshold: 1
-          timeoutSeconds: 2
+#          timeoutSeconds: 2
-        readinessProbe:
+#        readinessProbe:
-           failureThreshold: 1
+#           failureThreshold: 1
-           httpGet:
+#           httpGet:
-             port: 18012           #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
+#             port: 18012           #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
-             path: /actuator/prometheus
+#             path: /actuator/prometheus
-             scheme: HTTP
+#             scheme: HTTP
-           periodSeconds: 5
+#           periodSeconds: 5
-           successThreshold: 2
+#           successThreshold: 2
-           timeoutSeconds: 2
+#           timeoutSeconds: 2
         resources:
           requests:
             cpu: 1000m

src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java

@@ -494,7 +494,7 @@ public class ProjectCommonUtil {
     public static final int INQUIRY_NOTICE_STATUS_2 = 2;
 
     /**
-     * 异常处理标段是否被选中 1 否
+     * 异常处理标段是否被选中 1 选中
      */
     public static final int IS_EXCEPTION_CHECK_1 = 1;
 

src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml

@@ -144,6 +144,7 @@
         select t.id,
         t.bid_sect_name as bidSectName,
         t.bid_sect_biz_num as bidSectBizNum,
+        t.business_module as businessModule,
         t.status as status
         from biz_project_section t
         where t.project_id = ${projectId}
@@ -156,6 +157,7 @@
         (case when e.id is not null then '1' else '0' end) as isExceptionCheck,
         t.bid_sect_name as bidSectName,
         t.bid_sect_biz_num as bidSectBizNum,
+        t.business_module as businessModule,
         t.status as status
         from biz_project_section t
         left join biz_project_section_exception e on e.section_id = t.id and e.exception_id = ${exceptionId}
@@ -170,6 +172,7 @@
         select t.id,
         t.bid_sect_name as bidSectName,
         t.bid_sect_biz_num as bidSectBizNum,
+        t.business_module as businessModule,
         t.status as status
         from biz_project_section t,biz_project_section_exception e
         where e.section_id = t.id

src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java

@@ -31,7 +31,7 @@ public class ProjectSectionVO extends ProjectSection implements Serializable {
     private BasePageRequest basePageRequest;
 
     /**
-     * 是否被选中 0 是  1 否
+     * 是否被选中 0 不选中  1 选中
      */
     @ApiModelProperty(value = "是否被选中 0 不选中  1 选中")
     private Integer isExceptionCheck;

src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java

@@ -488,7 +488,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
         boolean isReviewMethod = recordService.isReviewMethod(recordService.getById(projectId));
         //项目异常新增
         List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectEditSectionBySave(projectId);
-        sectionVOList.stream().filter(n -> (n.getStatus() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7)
+        sectionVOList = sectionVOList.stream().filter(n -> (n.getBusinessModule() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7)
                 && n.getStatus() < ProjectCommonUtil.BUSINESS_MODULE_12)).collect(Collectors.toList());
         return sectionVOList;
     }
@@ -498,9 +498,10 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
         boolean isReviewMethod = recordService.isReviewMethod(recordService.getById(projectId));
         //项目异常修改
         List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectEditSectionByUpdate(projectId, exceptionId);
-        sectionVOList.stream().filter(n -> !(n.getIsExceptionCheck() == ProjectCommonUtil.IS_EXCEPTION_CHECK_1
+        sectionVOList = sectionVOList.stream().filter(n -> !(
-                && (n.getStatus() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7)
+                n.getIsExceptionCheck() != ProjectCommonUtil.IS_EXCEPTION_CHECK_1 //不选中状态and(标段在发布之前的流程and归档流程)
-                && n.getStatus() >= ProjectCommonUtil.BUSINESS_MODULE_12))).collect(Collectors.toList());
+                && (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) && n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12)
+        )).collect(Collectors.toList());
         return sectionVOList;
     }
 

src/main/resources/application-test.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:
     # 逻辑删除配置

src/main/resources/application-uat.yml

@@ -55,7 +55,7 @@ spring:
         connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000
     props:
       sql:
-        show: true
+        show: false
 
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss