From e0ea9e5777482cc495802eb7357d5c89e6fbb4ff Mon Sep 17 00:00:00 2001 From: dxc Date: Fri, 9 Apr 2021 11:18:50 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=A0=87=E6=AE=B5=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202=E3=80=81sonar=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=203=E3=80=81=E9=87=87=E8=B4=AD=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectrecord/entity/ProjectRecordVO.java | 1 - .../service/impl/ProjectRecordServiceImpl.java | 8 +++++--- .../impl/ProjectReEvaluationServiceImpl.java | 8 ++------ .../service/impl/ProjectSectionServiceImpl.java | 15 ++++++++------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java index 0061b13..606346b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java @@ -15,7 +15,6 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index e55563e..be539aa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -467,16 +467,18 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl query = getProjectRecordQueryWrapper(projectRecordVO); - + query.orderByDesc("create_date"); if(null == projectRecordVO.getBasePageRequest()){ projectRecordVO.setBasePageRequest(new BasePageRequest()); } - query.orderByDesc("create_date"); + //查询 IPage p = new Page<>(projectRecordVO.getBasePageRequest().getPageNo(), projectRecordVO.getBasePageRequest().getPageSize()); IPage result = this.page(p, query); + IPage voPage = result.convert(c -> BeanUtil.toBean(c,ProjectRecordVO.class)); + assembleProjectPage(voPage.getRecords()); - return result.convert(c -> BeanUtil.toBean(c,ProjectRecordVO.class)); + return voPage; } @Override diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java index 530cde0..29d6505 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java @@ -187,12 +187,8 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId())); log.info("重评校验子项目信息返回结果：{}",JsonUtils.objectToJson(baseResponse)); - if(!baseResponse.isSuccess()){ - CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); - } - if(!baseResponse.getData()){ - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.throwException(); - } + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.customValid(!baseResponse.getData()); }catch (Exception e){ ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_CHECK_STATUS_ERROR.throwException(); } 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 ce3ce90..d1ed280 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 @@ -482,16 +482,17 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionVOList = projectSectionMapper.selectArchiveById(projectSection); - List sectionIds = sectionVOList.stream().map(n -> n.getId() + "_" + n.getRoomSort()).collect(Collectors.toList()); + if(null != sectionVOList && !sectionVOList.isEmpty()){ + List sectionIds = sectionVOList.stream().map(n -> n.getId() + "_" + n.getRoomSort()).collect(Collectors.toList()); - //调用归档信息查询是否已归档 - BaseResponse> baseResponse = archiveApi.getArchiveSection(sectionIds); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); + //调用归档信息查询是否已归档 + BaseResponse> baseResponse = archiveApi.getArchiveSection(sectionIds); + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); - Map archiveMap = baseResponse.getData(); - - sectionVOList = sectionVOList.stream().filter(n -> archiveMap.get(n.getId() + "_" +n.getRoomSort())).collect(Collectors.toList()); + Map archiveMap = baseResponse.getData(); + sectionVOList = sectionVOList.stream().filter(n -> archiveMap.get(n.getId() + "_" +n.getRoomSort())).collect(Collectors.toList()); + } return sectionVOList; }