学生消费加条件

src/main/java/com/xjrsoft/module/student/controller/StudentConsumeDateController.java

@@ -58,6 +58,7 @@ public class StudentConsumeDateController {
         IPage<StudentConsumeDatePageVo> page = studentConsumeDateService.selectJoinListPage(ConventPage.getPage(dto), StudentConsumeDatePageVo.class,
                 MPJWrappers.<StudentConsumeDate>lambdaJoin()
                         .orderByDesc(StudentConsumeDate::getId)
+                        .eq(ObjectUtil.isNotNull(dto.getUserId()), StudentConsumeDate::getStudentId, dto.getUserId())
                         .eq(ObjectUtil.isNotNull(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()))

src/main/java/com/xjrsoft/module/student/dto/StudentConsumeDatePageDto.java

@@ -41,5 +41,9 @@ public class StudentConsumeDatePageDto extends PageInput {
     @ApiModelProperty("结束日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime endDate;
-
+    /**
+     * 学生id
+     */
+    @ApiModelProperty("学生id")
+    private Long userId;
 }