|
@@ -506,7 +506,7 @@ public class CreateYfDailyReportStatisticsJob implements JobHandler {
|
|
|
Set<Long> fiveMonthCompleteTaskIds = new HashSet<>();
|
|
Set<Long> fiveMonthCompleteTaskIds = new HashSet<>();
|
|
|
if (CollUtil.isNotEmpty(fiveMonthReports)) {
|
|
if (CollUtil.isNotEmpty(fiveMonthReports)) {
|
|
|
// 求和:所有日报压裂层 单位:层
|
|
// 求和:所有日报压裂层 单位:层
|
|
|
- fiveMonthSumLayers = fiveReports.stream()
|
|
|
|
|
|
|
+ fiveMonthSumLayers = fiveMonthReports.stream()
|
|
|
.map(IotFiveDailyReportDO::getDailyWorkingLayers)
|
|
.map(IotFiveDailyReportDO::getDailyWorkingLayers)
|
|
|
.filter(Objects::nonNull)
|
|
.filter(Objects::nonNull)
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
@@ -534,7 +534,7 @@ public class CreateYfDailyReportStatisticsJob implements JobHandler {
|
|
|
Set<Long> fiveYearCompleteTaskIds = new HashSet<>();
|
|
Set<Long> fiveYearCompleteTaskIds = new HashSet<>();
|
|
|
if (CollUtil.isNotEmpty(fiveYearReports)) {
|
|
if (CollUtil.isNotEmpty(fiveYearReports)) {
|
|
|
// 求和:所有日报压裂层 单位:层
|
|
// 求和:所有日报压裂层 单位:层
|
|
|
- fiveYearSumLayers = fiveReports.stream()
|
|
|
|
|
|
|
+ fiveYearSumLayers = fiveYearReports.stream()
|
|
|
.map(IotFiveDailyReportDO::getDailyWorkingLayers)
|
|
.map(IotFiveDailyReportDO::getDailyWorkingLayers)
|
|
|
.filter(Objects::nonNull)
|
|
.filter(Objects::nonNull)
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|