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 cdc810b..bed78e8 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 @@ -150,19 +150,26 @@ 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} - + + + and a.phone = #{phone} + + + and a.add_time >= #{beginTime} + + + and a.add_time <= #{endTime} + + + and a.invalid = #{invalid} + + + and a.housingestate_id = #{housingestateId} + + + and a.imei = #{imei} + + ) t order by t.addTime desc diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java index 3283fc8..020af91 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java @@ -68,8 +68,11 @@ public class ShebeiController extends JeecgController { * 设备投递次数排行榜 */ @RequestMapping(value = "/querySheBeiTdcsList", method = RequestMethod.GET) - public Result querySheBeiTdcsList(Shebei shebei) { - List list = service.querySheBeiTdcsList(shebei); + public Result querySheBeiTdcsList(Shebei shebei, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage list = service.querySheBeiTdcsList(page,shebei); return Result.ok(list); } @@ -83,8 +86,11 @@ public class ShebeiController extends JeecgController { * 设备投递重量排行榜 */ @RequestMapping(value = "/querySheBeiTdzlList", method = RequestMethod.GET) - public Result querySheBeiTdzlList(Shebei shebei) { - List list = service.querySheBeiTdzlList(shebei); + public Result querySheBeiTdzlList(Shebei shebei, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage list = service.querySheBeiTdzlList(page,shebei); return Result.ok(list); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java index 827955b..866d424 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java @@ -113,4 +113,6 @@ public class Shebei implements Serializable { private String shortDay; @TableField(exist = false) private String money; + @TableField(exist = false) + private Integer rowNumber; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java index 02d84df..8967d08 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java @@ -20,9 +20,9 @@ public interface ShebeiMapper extends BaseMapper { Shebei getHousingestate(Shebei shebei); Shebei getDevice(Shebei shebei); List deviceList(Shebei shebei); - List querySheBeiTdcsList(Shebei shebei); + IPage querySheBeiTdcsList(Page page,@Param("params") Shebei shebei); List queryAllSheBeiTdcsList(Shebei shebei); - List querySheBeiTdzlList(Shebei shebei); + IPage querySheBeiTdzlList(Page page,@Param("params") Shebei shebei); List querySheBeiTdjetjList(Shebei shebei); List querySheBeiTdcstjList(Shebei shebei); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml index 04b16ba..af0497d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml @@ -92,27 +92,27 @@ select - b.name as housingestateName, - c.content, - a.imei, - a.weight - from ( - select - housingestate_id, - imei, - round(sum(weight),2) as weight - from bl_order_info - where add_time >= #{beginTime} - and add_time <= #{endTime} - - and housingestate_id = #{housingestateId} - - group by housingestate_id,imei - order by weight desc - limit 10 - ) a - left join bl_housingestate_info b on a.housingestate_id = b.housingestate_id - left join bl_device_info c on a.imei = c.imei + @row_num := @row_num + 1 AS rowNumber, + t.* + from (SELECT @row_num := 0) r, + ( + select + a.housingestate_id, + b.name as housingestateName, + a.imei, + c.content, + round(sum(weight),2) as weight + 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.add_time >= #{params.beginTime} + and a.add_time <= #{params.endTime} + + and a.housingestate_id = #{params.housingestateId} + + group by a.housingestate_id,b.name,a.imei,c.content + ) t + order by t.weight desc