diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java index c02c7a1d..812e8526 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.standardization.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; @@ -157,6 +158,21 @@ public class LawsStandardizationController extends JeroController> queryMeetingPageByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId, + @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + return Result.OK(lawsStandardizationService.queryMeetingPageByStandardizationId(standardizationId, pageNo, pageSize)); + } + /** * 标准化活动-详情通过id查询 * @return diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java index fc15827a..20740c9d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.standardization.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.laws.standardization.entity.*; import com.jero.modules.laws.standardization.vo.StandardizationVO; @@ -99,4 +100,13 @@ public interface ILawsStandardizationService extends IService queryMeetingPageByStandardizationId(String standardizationId, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index a2b75802..9560071a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -2,6 +2,8 @@ package com.jero.modules.laws.standardization.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.common.util.SnowflakeUtils; @@ -463,6 +465,21 @@ public class LawsStandardizationServiceImpl extends ServiceImpl() .eq(LawsStandardizationMeeting::getStandardizationId, standardizationId) .orderByDesc(LawsStandardizationMeeting::getCreateTime)); + setUserInfo(lawsStandardizationMeetingList); + return lawsStandardizationMeetingList; + } + + @Override + public IPage queryMeetingPageByStandardizationId(String standardizationId, Integer pageNo, Integer pageSize) { + IPage page = lawsStandardizationMeetingService.page(new Page<>(pageNo, pageSize), + new LambdaQueryWrapper() + .eq(LawsStandardizationMeeting::getStandardizationId, standardizationId) + .orderByDesc(LawsStandardizationMeeting::getCreateTime)); + setUserInfo(page.getRecords()); + return page; + } + + private void setUserInfo(List lawsStandardizationMeetingList) { for (LawsStandardizationMeeting lawsStandardizationMeeting : lawsStandardizationMeetingList) { // 人员信息 if (StringUtils.isNotBlank(lawsStandardizationMeeting.getPersonnelId())){ @@ -480,7 +497,6 @@ public class LawsStandardizationServiceImpl extends ServiceImpl