fix:修改管理端获取活动信息收集记录列表,添加分页参数

This commit is contained in:
嘉多宝宝 2026-01-15 16:07:34 +08:00
parent 83be471093
commit fb2bd56e10
2 changed files with 13 additions and 6 deletions

View File

@ -36,8 +36,9 @@ public class AdminActivityInfoCollectionController {
@GetMapping("/list/{activityId}")
@SaCheckPermission("admin:activity:info:collection:list")
@Operation(summary = "获取活动信息收集记录列表")
public ResultBean<List<AdminActivityInfoCollectionResp>> list(@PathVariable Integer activityId) {
return ResultBean.success(adminActivityInfoCollectionService.list(activityId));
public ResultBean<PageListBean<AdminActivityInfoCollectionResp>> list(@RequestBody @Validated ActivityInfoCollectionQueryReq req,
@PathVariable Integer activityId) {
return ResultBean.success(adminActivityInfoCollectionService.list(req, activityId));
}

View File

@ -66,9 +66,15 @@ public class AdminActivityInfoCollectionService {
* @param activityId 活动Id
* @return 返回活动列表
*/
public List<AdminActivityInfoCollectionResp> list(Integer activityId) {
List<MpActivityInfoCollectionEntity> entity = mpActivityInfoCollectionService.lambdaQuery()
.eq(MpActivityInfoCollectionEntity::getActivityId, activityId).list();
return AdminActivityInfoCollectionConvert.INSTANCE.convertToRespList(entity);
public PageListBean<AdminActivityInfoCollectionResp> list(ActivityInfoCollectionQueryReq req ,Integer activityId) {
LambdaQueryWrapper<MpActivityInfoCollectionEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MpActivityInfoCollectionEntity::getActivityId, activityId)
.like(Objects.nonNull(req.getChildName()) && !req.getChildName().isEmpty(), MpActivityInfoCollectionEntity::getChildName, req.getChildName())
.eq(Objects.nonNull(req.getGrade()) && !req.getGrade().isEmpty(), MpActivityInfoCollectionEntity::getGrade, req.getGrade())
.like(Objects.nonNull(req.getSchool()) && !req.getSchool().isEmpty(), MpActivityInfoCollectionEntity::getSchool, req.getSchool())
.like(Objects.nonNull(req.getChildGender()) && !req.getChildGender().isEmpty(), MpActivityInfoCollectionEntity::getChildGender, req.getChildGender())
.orderByDesc(MpActivityInfoCollectionEntity::getCreateTime);
Page<MpActivityInfoCollectionEntity> result = mpActivityInfoCollectionService.page(new Page<>(req.getPageNo(), req.getPageSize()), wrapper);
return PageConverterUtils.convertPageListBean(result, AdminActivityInfoCollectionConvert.INSTANCE::convertToRespList);
}
}