From 266d528c0a883ceb8ffd537b9690a07e5053367a Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 25 Mar 2021 12:30:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86=E5=8F=91=E5=B8=83=E6=89=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E6=A0=87=E6=AE=B5=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectsection/dao/mapper/ProjectSectionMapper.xml | 3 +++ .../service/impl/ProjectSectionServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml index d78f4b4..a622ef4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml +++ b/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 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index 661ca6c..d476e35 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -488,7 +488,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionVOList = projectSectionMapper.selectEditSectionBySave(projectId); - sectionVOList.stream().filter(n -> (n.getStatus() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) + 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; } @@ -499,8 +499,8 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionVOList = projectSectionMapper.selectEditSectionByUpdate(projectId, exceptionId); sectionVOList.stream().filter(n -> !(n.getIsExceptionCheck() == ProjectCommonUtil.IS_EXCEPTION_CHECK_1 - && (n.getStatus() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) - && 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; } From 1b6230312b3a1b1740c720f068d37fb9516274fe Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 25 Mar 2021 13:09:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86=E5=8F=91=E5=B8=83=E6=89=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E6=A0=87=E6=AE=B5=E8=BF=87=E6=BB=A4?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/common/ProjectCommonUtil.java | 2 +- .../project/projectsection/entity/ProjectSectionVO.java | 2 +- .../service/impl/ProjectSectionServiceImpl.java | 9 +++++---- 3 files changed, 7 insertions(+), 6 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 61b6220..a2bd7fc 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 @@ -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; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java index b993e25..906c755 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java +++ b/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; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index d476e35..055e9a6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -488,7 +488,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionVOList = projectSectionMapper.selectEditSectionBySave(projectId); - sectionVOList.stream().filter(n -> (n.getBusinessModule() > (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 sectionVOList = projectSectionMapper.selectEditSectionByUpdate(projectId, exceptionId); - sectionVOList.stream().filter(n -> !(n.getIsExceptionCheck() == ProjectCommonUtil.IS_EXCEPTION_CHECK_1 - && (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) - && n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12))).collect(Collectors.toList()); + sectionVOList = sectionVOList.stream().filter(n -> !( + n.getIsExceptionCheck() != ProjectCommonUtil.IS_EXCEPTION_CHECK_1 //不选中状态and(标段在发布之前的流程and归档流程) + && (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) && n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12) + )).collect(Collectors.toList()); return sectionVOList; } From 3b72edf8a6129ac73887eb3fc083a9852287b5e2 Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 25 Mar 2021 15:12:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pro.yaml | 38 ++++++++++++------------- src/main/resources/application-test.yml | 2 +- src/main/resources/application-uat.yml | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pro.yaml b/pro.yaml index 97cc123..10068bb 100644 --- a/pro.yaml +++ b/pro.yaml @@ -47,25 +47,25 @@ spec: mountPath: /log ports: - containerPort: 18012 #[8] 容器需要监听的端口号，与配置文件中的server.port参数相同，与参数[4]相同 - livenessProbe: - failureThreshold: 3 - httpGet: - port: 18012 #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 - path: /actuator/prometheus - scheme: HTTP - initialDelaySeconds: 300 - periodSeconds: 60 - successThreshold: 1 - timeoutSeconds: 2 - readinessProbe: - failureThreshold: 1 - httpGet: - port: 18012 #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 - path: /actuator/prometheus - scheme: HTTP - periodSeconds: 5 - successThreshold: 2 - timeoutSeconds: 2 +# livenessProbe: +# failureThreshold: 3 +# httpGet: +# port: 18012 #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 +# path: /actuator/prometheus +# scheme: HTTP +# initialDelaySeconds: 300 +# periodSeconds: 60 +# successThreshold: 1 +# timeoutSeconds: 2 +# readinessProbe: +# failureThreshold: 1 +# httpGet: +# port: 18012 #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 +# path: /actuator/prometheus +# scheme: HTTP +# periodSeconds: 5 +# successThreshold: 2 +# timeoutSeconds: 2 resources: requests: cpu: 1000m diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 79104bf..757b285 100644 --- a/src/main/resources/application-test.yml +++ b/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: # 逻辑删除配置 diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 536139b..2a9e6d8 100644 --- a/src/main/resources/application-uat.yml +++ b/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