Commit 4e1784b08107562a0c910ab8fa914f06b40cc34a
1 parent
d8ddee37
来源与报表统一为 60
Showing
2 changed files
with
4 additions
and
4 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/ValhallaReportDimension.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/report/PublicReportBizService.java
| @@ -165,7 +165,7 @@ public class PublicReportBizService { | @@ -165,7 +165,7 @@ public class PublicReportBizService { | ||
| 165 | }else { | 165 | }else { |
| 166 | //不是1号的数据直接从上次抽取的数据中查询月初一的数据 | 166 | //不是1号的数据直接从上次抽取的数据中查询月初一的数据 |
| 167 | List<PublicReportData> reportDataList = publicReportDataService.list(Wrappers.<PublicReportData>lambdaQuery() | 167 | List<PublicReportData> reportDataList = publicReportDataService.list(Wrappers.<PublicReportData>lambdaQuery() |
| 168 | - .eq(PublicReportData::getReportDimension, ValhallaReportDimension.D99.getValue()) | 168 | + .eq(PublicReportData::getReportDimension, ValhallaReportDimension.D60.getValue()) |
| 169 | .eq(PublicReportData::getDataDate, startMonDate) | 169 | .eq(PublicReportData::getDataDate, startMonDate) |
| 170 | ); | 170 | ); |
| 171 | if (!CollectionUtils.isEmpty(reportDataList)){ | 171 | if (!CollectionUtils.isEmpty(reportDataList)){ |
| @@ -557,13 +557,13 @@ public class PublicReportBizService { | @@ -557,13 +557,13 @@ public class PublicReportBizService { | ||
| 557 | 557 | ||
| 558 | private PublicReportData getPublicReportDataD99Increase(List<PublicReportData> publicReportData20List,PublicPoolReportDTO publicPoolReportDTO,Long groupId){ | 558 | private PublicReportData getPublicReportDataD99Increase(List<PublicReportData> publicReportData20List,PublicPoolReportDTO publicPoolReportDTO,Long groupId){ |
| 559 | if (CollectionUtils.isEmpty(publicReportData20List)){ | 559 | if (CollectionUtils.isEmpty(publicReportData20List)){ |
| 560 | - return new PublicReportData(ValhallaReportDimension.D99.getValue(),groupId); | 560 | + return new PublicReportData(ValhallaReportDimension.D60.getValue(),groupId); |
| 561 | } | 561 | } |
| 562 | Optional<PublicReportData> dataOptional = publicReportData20List.stream().filter(e -> publicPoolReportDTO.getType().equals(e.getType()) && publicPoolReportDTO.getShopId().equals(e.getShopId())).findFirst(); | 562 | Optional<PublicReportData> dataOptional = publicReportData20List.stream().filter(e -> publicPoolReportDTO.getType().equals(e.getType()) && publicPoolReportDTO.getShopId().equals(e.getShopId())).findFirst(); |
| 563 | if (dataOptional.isPresent()){ | 563 | if (dataOptional.isPresent()){ |
| 564 | return dataOptional.get(); | 564 | return dataOptional.get(); |
| 565 | } | 565 | } |
| 566 | - return new PublicReportData(ValhallaReportDimension.D99.getValue(),groupId); | 566 | + return new PublicReportData(ValhallaReportDimension.D60.getValue(),groupId); |
| 567 | } | 567 | } |
| 568 | 568 | ||
| 569 | private PublicReportData getPublicReportDataD10(List<PublicReportData> publicReportData20List,Long shopId,Long groupId){ | 569 | private PublicReportData getPublicReportDataD10(List<PublicReportData> publicReportData20List,Long shopId,Long groupId){ |