|
@@ -59,7 +59,7 @@ public class StudentConsumeDateController {
|
|
|
MPJWrappers.<StudentConsumeDate>lambdaJoin()
|
|
|
.orderByDesc(StudentConsumeDate::getId)
|
|
|
.eq(ObjectUtil.isNotNull(dto.getUserId()), StudentConsumeDate::getStudentId, dto.getUserId())
|
|
|
- .eq(ObjectUtil.isNotNull(dto.getConsumeType()), StudentConsumeDate::getConsumeType, dto.getConsumeType())
|
|
|
+ .eq(StrUtil.isNotEmpty(dto.getConsumeType()), StudentConsumeDate::getConsumeType, dto.getConsumeType())
|
|
|
.between(ObjectUtil.isNotNull(dto.getStartDate()) && ObjectUtil.isNotNull(dto.getEndDate()), StudentConsumeDate::getConsumeTime, dto.getStartDate(), dto.getEndDate())
|
|
|
.select(StudentConsumeDate.class, x -> VoToColumnUtil.fieldsToColumns(StudentConsumeDatePageVo.class).contains(x.getProperty()))
|
|
|
.select(StudentConsumeDate::getId)
|