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 2e0bfde..76e9946 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 @@ -1,5 +1,7 @@ package org.jeecg.modules.zh.view.hy.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.zh.view.hy.entity.Hy; @@ -7,6 +9,7 @@ import org.jeecg.modules.zh.view.hy.service.IHyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -52,8 +55,11 @@ public class HyController { * 会员投递次数排行榜 */ @RequestMapping(value = "/queryHyTdcsList", method = RequestMethod.GET) - public Result queryHyTdcsList(Hy hy) { - List list = service.queryHyTdcsList(hy); + public Result queryHyTdcsList(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.queryHyTdcsList(page,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 c9e694a..1cd1539 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 @@ -1,6 +1,9 @@ package org.jeecg.modules.zh.view.hy.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.zh.view.hy.entity.Hy; import java.util.List; @@ -13,7 +16,7 @@ public interface HyMapper extends BaseMapper{ List queryHousingestateList(); List queryHyRegisterList(Hy hy); List queryHyXzList(Hy hy); - List queryHyTdcsList(Hy hy); + IPage queryHyTdcsList(Page page, @Param("hy")Hy hy); List queryHyTdzlList(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 2b8081f..913eb72 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 @@ -29,27 +29,38 @@ select - phone, - money, - weight, - add_time as addTime, - invalid, - start_weight as startWeight, - end_weight as endWeight, - updated_at as updatedAt, - deduct_money as deductMoney - from bl_order_info - where phone = #{phone} - order by add_time desc + @row_num := @row_num + 1 AS rowNumber, + t.* + from (SELECT @row_num := 0) r, + ( + select + a.phone, + a.money, + a.weight, + a.add_time as addTime, + a.invalid, + a.start_weight as startWeight, + a.end_weight as endWeight, + a.updated_at as updatedAt, + a.deduct_money as deductMoney, + b.name as housingestateName, + c.content, + a.cause + from bl_order_info a + inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id + inner join bl_device_info c on a.imei = c.imei + where a.phone = #{phone} + + and a.add_time >= #{beginTime} + + + and a.add_time <= #{endTime} + + + and a.invalid = #{invalid} + + + and a.housingestate_id = #{housingestateId} + + ) t + order by t.addTime desc 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 222e6cf..a1f4f01 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 @@ -1,5 +1,7 @@ package org.jeecg.modules.zh.view.hy.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.zh.view.hy.entity.Hy; import java.util.List; @@ -13,7 +15,7 @@ public interface IHyService extends IService { List queryHousingestateList(); List queryHyRegisterList(Hy hy); List queryHyXzList(Hy hy); - List queryHyTdcsList(Hy hy); + IPage queryHyTdcsList(Page page, Hy hy); List queryHyTdzlList(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 8f2880b..5cf43b1 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 @@ -1,5 +1,7 @@ package org.jeecg.modules.zh.view.hy.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.system.entity.SysDataLog; import org.jeecg.modules.zh.view.hy.entity.Hy; @@ -44,8 +46,8 @@ public class HyServiceImpl extends ServiceImpl implements IHyServi * 会员投递次数排行榜 */ @Override - public List queryHyTdcsList(Hy hy) { - return baseMapper.queryHyTdcsList(hy); + public IPage queryHyTdcsList(Page page, Hy hy) { + return baseMapper.queryHyTdcsList(page,hy); } /**