|
|
@@ -264,8 +264,8 @@ public interface IotRyDailyReportMapper extends BaseMapperX<IotRyDailyReportDO>
|
|
|
List<IotRyDailyReportDO> list = selectList(new LambdaQueryWrapperX<IotRyDailyReportDO>()
|
|
|
.eq(ObjUtil.isNotNull(deptId), IotRyDailyReportDO::getDeptId, deptId)
|
|
|
.lt(IotRyDailyReportDO::getCreateTime, reportDate)
|
|
|
- .apply("YEAR(construction_start_date) = {0}", year)
|
|
|
- .apply("MONTH(construction_start_date) = {0}", month));
|
|
|
+ .apply("YEAR(create_time) = {0}", year)
|
|
|
+ .apply("MONTH(create_time) = {0}", month));
|
|
|
|
|
|
return list.stream()
|
|
|
.map(IotRyDailyReportDO::getDailyFootage)
|
|
|
@@ -315,7 +315,7 @@ public interface IotRyDailyReportMapper extends BaseMapperX<IotRyDailyReportDO>
|
|
|
List<IotRyDailyReportDO> list = selectList(new LambdaQueryWrapperX<IotRyDailyReportDO>()
|
|
|
.eq(ObjUtil.isNotNull(deptId), IotRyDailyReportDO::getDeptId, deptId)
|
|
|
.lt(IotRyDailyReportDO::getCreateTime, reportDate)
|
|
|
- .apply("YEAR(construction_start_date) = {0}", year));
|
|
|
+ .apply("YEAR(create_time) = {0}", year));
|
|
|
|
|
|
return list.stream()
|
|
|
.map(IotRyDailyReportDO::getDailyFootage)
|