diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/controller/HyController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/controller/HyController.java index 76e9946..7ccb0f3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/controller/HyController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/controller/HyController.java @@ -67,8 +67,11 @@ public class HyController { * 会员投递重量排行榜 */ @RequestMapping(value = "/queryHyTdzlList", method = RequestMethod.GET) - public Result queryHyTdzlList(Hy hy) { - List list = service.queryHyTdzlList(hy); + public Result queryHyTdzlList(Hy hy, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage list = service.queryHyTdzlList(page,hy); return Result.ok(list); } @@ -76,8 +79,11 @@ public class HyController { * 会员违规信息统计 */ @RequestMapping(value = "/queryHyWgList", method = RequestMethod.GET) - public Result queryHyWgList(Hy hy) { - List list = service.queryHyWgList(hy); + public Result queryHyWgList(Hy hy, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage list = service.queryHyWgList(page,hy); return Result.ok(list); } @@ -93,4 +99,10 @@ public class HyController { return Result.ok(list); } + @RequestMapping(value = "/queryHywgList", method = RequestMethod.GET) + public Result queryHywgList(Hy hy) { + List list = service.queryHywgList(hy); + return Result.ok(list); + } + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/HyMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/HyMapper.java index 1cd1539..7c855c1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/HyMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/HyMapper.java @@ -17,11 +17,12 @@ public interface HyMapper extends BaseMapper{ List queryHyRegisterList(Hy hy); List queryHyXzList(Hy hy); IPage queryHyTdcsList(Page page, @Param("hy")Hy hy); - List queryHyTdzlList(Hy hy); - List queryHyWgList(Hy hy); + IPage queryHyTdzlList(Page page, @Param("hy")Hy hy); + IPage queryHyWgList(Page page, @Param("hy")Hy hy); List queryAllHyTdcsList(Hy hy); List queryHyjlList(Hy hy); + List queryHywgList(Hy hy); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml index 913eb72..cdc810b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml @@ -65,37 +65,48 @@ + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/IHyService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/IHyService.java index a1f4f01..2fc8393 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/IHyService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/IHyService.java @@ -16,10 +16,11 @@ public interface IHyService extends IService { List queryHyRegisterList(Hy hy); List queryHyXzList(Hy hy); IPage queryHyTdcsList(Page page, Hy hy); - List queryHyTdzlList(Hy hy); - List queryHyWgList(Hy hy); + IPage queryHyTdzlList(Page page,Hy hy); + IPage queryHyWgList(Page page,Hy hy); List queryAllHyTdcsList(Hy hy); List queryHyjlList(Hy hy); + List queryHywgList(Hy hy); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/impl/HyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/impl/HyServiceImpl.java index 5cf43b1..1fd4c1b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/impl/HyServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/impl/HyServiceImpl.java @@ -54,16 +54,16 @@ public class HyServiceImpl extends ServiceImpl implements IHyServi * 会员投递重量排行榜 */ @Override - public List queryHyTdzlList(Hy hy) { - return baseMapper.queryHyTdzlList(hy); + public IPage queryHyTdzlList(Page page, Hy hy) { + return baseMapper.queryHyTdzlList(page,hy); } /** * 会员违规信息统计 */ @Override - public List queryHyWgList(Hy hy) { - return baseMapper.queryHyWgList(hy); + public IPage queryHyWgList(Page page,Hy hy) { + return baseMapper.queryHyWgList(page,hy); } /** @@ -82,4 +82,12 @@ public class HyServiceImpl extends ServiceImpl implements IHyServi return baseMapper.queryHyjlList(hy); } + /** + * 查询会员违规投递历史信息 + */ + @Override + public List queryHywgList(Hy hy) { + return baseMapper.queryHywgList(hy); + } + }