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; }