|
@@ -117,6 +117,9 @@ public class BaseClassDynamicsController {
|
|
|
.orderByDesc(BaseClassDynamics::getId)
|
|
.orderByDesc(BaseClassDynamics::getId)
|
|
|
.select(BaseClassDynamics.class, x -> VoToColumnUtil.fieldsToColumns(BaseClassDynamicsPageVo.class).contains(x.getProperty()))
|
|
.select(BaseClassDynamics.class, x -> VoToColumnUtil.fieldsToColumns(BaseClassDynamicsPageVo.class).contains(x.getProperty()))
|
|
|
.eq(BaseClassDynamics::getCreateUserId, userId);
|
|
.eq(BaseClassDynamics::getCreateUserId, userId);
|
|
|
|
|
+ if(dto.getStartDate() != null && dto.getEndDate() != null){
|
|
|
|
|
+ queryWrapper.between(BaseClassDynamics::getCreateDate, dto.getStartDate().atStartOfDay(), dto.getEndDate().atTime(23,59,59));
|
|
|
|
|
+ }
|
|
|
IPage<BaseClassDynamics> page = baseClassDynamicsService.page(ConventPage.getPage(dto), queryWrapper);
|
|
IPage<BaseClassDynamics> page = baseClassDynamicsService.page(ConventPage.getPage(dto), queryWrapper);
|
|
|
PageOutput<BaseClassDynamicsPageVo> pageOutput = ConventPage.getPageOutput(page, BaseClassDynamicsPageVo.class);
|
|
PageOutput<BaseClassDynamicsPageVo> pageOutput = ConventPage.getPageOutput(page, BaseClassDynamicsPageVo.class);
|
|
|
return RT.ok(pageOutput);
|
|
return RT.ok(pageOutput);
|