From c8195a8a1c34b9fa8db9aa4dc340d4344044ce97 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 29 六月 2021 20:52:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index aa55ddb..45d4db6
--- a/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -63,17 +64,70 @@
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
int page = reportFeeYearCollectionDto.getPage();
+ List<ReportFeeYearCollectionDto> reportFeeYearCollections = null;
+
+ //涓嶅垎椤电洿鎺ユ煡鍏ㄩ噺鏁版嵁
+ if (reportFeeYearCollectionDto.getRow() > 10000) {
+ List<Map> reportFeeYearCollectionMaps =
+ reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfos(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDto));
+
+ reportFeeYearCollections = doCreateReportFeeYearCollections(reportFeeYearCollectionMaps);
+ return reportFeeYearCollections;
+ }
if (page != PageDto.DEFAULT_PAGE) {
reportFeeYearCollectionDto.setPage((page - 1) * reportFeeYearCollectionDto.getRow());
}
- List<ReportFeeYearCollectionDto> reportFeeYearCollections = BeanConvertUtil.covertBeanList(reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDto)), ReportFeeYearCollectionDto.class);
+ reportFeeYearCollections = BeanConvertUtil.covertBeanList(reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDto)), ReportFeeYearCollectionDto.class);
freshDetails(reportFeeYearCollections);
return reportFeeYearCollections;
}
+ /**
+ * 鍒涘缓瀵硅薄
+ *
+ * @param reportFeeYearCollectionMaps
+ * @return
+ */
+ private List<ReportFeeYearCollectionDto> doCreateReportFeeYearCollections(List<Map> reportFeeYearCollectionMaps) {
+ List<ReportFeeYearCollectionDto> reportFeeYearCollectionDtos = new ArrayList<>();
+ ReportFeeYearCollectionDto reportFeeYearCollectionDto = null;
+
+ for (Map reportFeeYearCollectionMap : reportFeeYearCollectionMaps) {
+ if (!hasReportFeeYearCollectionDto(reportFeeYearCollectionMap, reportFeeYearCollectionDtos)) {
+ reportFeeYearCollectionDto = BeanConvertUtil.covertBean(reportFeeYearCollectionMap, ReportFeeYearCollectionDto.class);
+ reportFeeYearCollectionDtos.add(reportFeeYearCollectionDto);
+ }
+ }
+ List<ReportFeeYearCollectionDetailDto> reportFeeYearCollectionDetailDtos = null;
+ ReportFeeYearCollectionDetailDto reportFeeYearCollectionDetailDto = null;
+ for (ReportFeeYearCollectionDto tmpReportFeeYearCollectionDto : reportFeeYearCollectionDtos) {
+ reportFeeYearCollectionDetailDtos = new ArrayList<>();
+ for (Map reportFeeYearCollectionMap : reportFeeYearCollectionMaps) {
+ if (tmpReportFeeYearCollectionDto.getCollectionId().equals(reportFeeYearCollectionMap.get("collectionId"))) {
+ reportFeeYearCollectionDetailDto = BeanConvertUtil.covertBean(reportFeeYearCollectionMap, ReportFeeYearCollectionDetailDto.class);
+ reportFeeYearCollectionDetailDtos.add(reportFeeYearCollectionDetailDto);
+ }
+ }
+ tmpReportFeeYearCollectionDto.setReportFeeYearCollectionDetailDtos(reportFeeYearCollectionDetailDtos);
+ }
+
+ return reportFeeYearCollectionDtos;
+ }
+
+ private boolean hasReportFeeYearCollectionDto(Map reportFeeYearCollectionMap, List<ReportFeeYearCollectionDto> reportFeeYearCollectionDtos) {
+
+ for (ReportFeeYearCollectionDto reportFeeYearCollectionDto : reportFeeYearCollectionDtos) {
+ if (reportFeeYearCollectionDto.getCollectionId().equals(reportFeeYearCollectionMap.get("collectionId"))) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
private void freshDetails(List<ReportFeeYearCollectionDto> reportFeeYearCollections) {
if (reportFeeYearCollections == null || reportFeeYearCollections.size() < 1 || reportFeeYearCollections.size() > 20) {
return;
--
Gitblit v1.8.0