|
@@ -253,7 +253,12 @@ public class ClassTimeStatisticsController {
|
|
queryWrapper
|
|
queryWrapper
|
|
.select(ClassTimeStatisticsRecord::getId)
|
|
.select(ClassTimeStatisticsRecord::getId)
|
|
.selectAs(ClassTimeStatisticsRecord::getAllClassTime, ClassTimeStatistics::getAllClassTime)
|
|
.selectAs(ClassTimeStatisticsRecord::getAllClassTime, ClassTimeStatistics::getAllClassTime)
|
|
- .select(ClassTimeStatistics.class,x -> VoToColumnUtil.fieldsToColumns(ClassTimeStatisticsPageVo.class).contains(x.getProperty()))
|
|
|
|
|
|
+ .select(ClassTimeStatistics::getYear)
|
|
|
|
+ .select(ClassTimeStatistics::getMonth)
|
|
|
|
+ .select(ClassTimeStatistics::getStartDate)
|
|
|
|
+ .select(ClassTimeStatistics::getEndDate)
|
|
|
|
+ .select(ClassTimeStatistics::getModifyDate)
|
|
|
|
+ .select(ClassTimeStatistics::getStatus)
|
|
.innerJoin(ClassTimeStatisticsRecord.class, ClassTimeStatisticsRecord::getClassTimeStatisticsId, ClassTimeStatistics::getId)
|
|
.innerJoin(ClassTimeStatisticsRecord.class, ClassTimeStatisticsRecord::getClassTimeStatisticsId, ClassTimeStatistics::getId)
|
|
.eq(dto.getYear() != null, ClassTimeStatistics::getYear, dto.getYear())
|
|
.eq(dto.getYear() != null, ClassTimeStatistics::getYear, dto.getYear())
|
|
.eq(dto.getMonth() != null, ClassTimeStatistics::getMonth, dto.getMonth())
|
|
.eq(dto.getMonth() != null, ClassTimeStatistics::getMonth, dto.getMonth())
|