Merge branch 'master' of http://47.115.223.229:8888/yangjun/huanzi-java

# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/BlHousingestateInfoMapper.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/IBlHousingestateInfoService.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/impl/BlHousingestateInfoServiceImpl.java

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/controller/BlHousingestateInfoController.java

@@ -88,8 +88,11 @@ public class BlHousingestateInfoController extends JeecgController<BlHousingesta
 	  * 小区新增会员统计
 	  */
 	 @RequestMapping(value = "/queryXqHyXzList", method = RequestMethod.GET)
-	 public Result queryHyXzList(Hy hy) {
+	 public Result queryHyXzList(Hy hy,
-		 List<Hy> list = service.queryXqHyXzList(hy);
+								 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 Page<Hy> page = new Page<Hy>(pageNo, pageSize);
+		 IPage<Hy> list = service.queryXqHyXzList(page,hy);
 		 return Result.ok(list);
 	 }
 
@@ -98,18 +101,23 @@ public class BlHousingestateInfoController extends JeecgController<BlHousingesta
 	  * 小区会员投递次数排行榜
 	  */
 	 @RequestMapping(value = "/queryXqHyTdcsList", method = RequestMethod.GET)
-	 public Result queryXqHyTdcsList(Hy hy) {
+	 public Result queryXqHyTdcsList(Hy hy,
-		 List<Hy> list = service.queryXqHyTdcsList(hy);
+									 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 Page<Hy> page = new Page<Hy>(pageNo, pageSize);
+		 IPage<Hy> list = service.queryXqHyTdcsList(page,hy);
 		 return Result.ok(list);
 	 }
 
-
 	 /**
 	  * 小区会员投递重量排行榜
 	  */
 	 @RequestMapping(value = "/queryXqHyTdzlList", method = RequestMethod.GET)
-	 public Result queryXqHyTdzlList(Hy hy) {
+	 public Result queryXqHyTdzlList(Hy hy,
-		 List<Hy> list = service.queryXqHyTdzlList(hy);
+									 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 Page<Hy> page = new Page<Hy>(pageNo, pageSize);
+		 IPage<Hy> list = service.queryXqHyTdzlList(page,hy);
 		 return Result.ok(list);
 	 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/BlHousingestateInfoMapper.java

@@ -17,11 +17,10 @@ import org.jeecg.modules.zh.view.hy.entity.Hy;
  */
 public interface BlHousingestateInfoMapper extends BaseMapper<BlHousingestateInfo> {
 
-    IPage<BlHousingestateInfo> findPage(Page<BlHousingestateInfo> page, @Param("params")BlHousingestateInfo blHousingestateInfo);
+    IPage<Hy> queryXqHyTdzlList(Page<Hy> page, @Param("hy")Hy hy);
 
-    List<Hy> queryXqHyTdzlList(Hy hy);
+    IPage<Hy> queryXqHyXzList(Page<Hy> page, @Param("hy")Hy hy);
 
-    List<Hy> queryXqHyXzList(Hy hy);
+    IPage<Hy> queryXqHyTdcsList(Page<Hy> page, @Param("hy")Hy hy);
 
-    List<Hy> queryXqHyTdcsList(Hy hy);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.zh.view.housingestateInfo.mapper.BlHousingestateInfoMapper">
-
     <select id="findPage" parameterType="org.jeecg.modules.zh.view.housingestateInfo.entity.BlHousingestateInfo" resultType="org.jeecg.modules.zh.view.housingestateInfo.entity.BlHousingestateInfo">
         select
-            housingestate_id as housingestateId,
+        housingestate_id as housingestateId,
-            name,
+        name,
-            status,
+        status,
-            type,
+        type,
-            (select count(*) from bl_device_info b where a.housingestate_id = b.housingestate_id) as dtus_count,
+        (select count(*) from bl_device_info b where a.housingestate_id = b.housingestate_id) as dtus_count,
-            (select count(*) from bl_user_info b where a.housingestate_id = b.housingestate_id) as hyCount
+        (select count(*) from bl_user_info b where a.housingestate_id = b.housingestate_id) as hyCount
         from bl_housingestate_info a
         <where>
             <if test="params.name != null and params.name != ''">
@@ -21,43 +20,41 @@
 
     <select id="queryXqHyTdzlList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
         select
-            a.housingestate_id as housingestateId,
+        a.housingestate_id as housingestateId,
-            b.name as housingestateName,
+        b.name as housingestateName,
-            round(sum(a.weight),2) as weight
+        round(sum(a.weight),2) as weight
         from bl_order_info a
         inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
         and a.add_time  >= #{beginTime}
         and a.add_time  &lt;= #{endTime}
         group by a.housingestate_id,b.name
         ORDER BY weight desc
-        limit 10
     </select>
 
     <select id="queryXqHyXzList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
         select
-            a.housingestate_id as housingestateId,
+        a.housingestate_id as housingestateId,
-            b.name as housingestateName,
+        b.name as housingestateName,
-            count(a.phone) as cn
+        count(a.phone) as cn
         from bl_user_info a
         inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
         where a.register_date >= #{beginTime}
         and a.register_date &lt;= #{endTime}
         group by a.housingestate_id,b.name
         ORDER BY cn desc
-        limit 10
     </select>
 
     <select id="queryXqHyTdcsList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
         select
-            a.housingestate_id as housingestateId,
+        a.housingestate_id as housingestateId,
-            b.name as housingestateName,
+        b.name as housingestateName,
-            count(a.id) as cn
+        count(a.id) as cn
         from bl_order_info a
         inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
         where a.add_time  >= #{beginTime}
         and a.add_time  &lt;= #{endTime}
         group by a.housingestate_id,b.name
         order by cn desc
-        limit 10
     </select>
+
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/IBlHousingestateInfoService.java

@@ -18,9 +18,10 @@ public interface IBlHousingestateInfoService extends IService<BlHousingestateInf
 
     IPage<BlHousingestateInfo> findPage(Page<BlHousingestateInfo> page,BlHousingestateInfo blHousingestateInfo);
 
-    List<Hy> queryXqHyTdzlList(Hy hy);
+    IPage<Hy> queryXqHyTdzlList(Page<Hy> page,Hy hy);
 
-    List<Hy> queryXqHyTdcsList(Hy hy);
+    IPage<Hy> queryXqHyTdcsList(Page<Hy> page,Hy hy);
+
+    IPage<Hy> queryXqHyXzList(Page<Hy> page,Hy hy);
 
-    List<Hy> queryXqHyXzList(Hy hy);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/service/impl/BlHousingestateInfoServiceImpl.java

@@ -24,20 +24,22 @@ public class BlHousingestateInfoServiceImpl extends ServiceImpl<BlHousingestateI
     @Override
     public IPage<BlHousingestateInfo> findPage(Page<BlHousingestateInfo> page, BlHousingestateInfo blHousingestateInfo) {
         return baseMapper.findPage(page,blHousingestateInfo);
+
     }
 
     @Override
-    public List<Hy> queryXqHyTdzlList(Hy hy) {
+    public IPage<Hy> queryXqHyTdzlList(Page<Hy> page,Hy hy) {
-        return baseMapper.queryXqHyTdzlList(hy);
+        return baseMapper.queryXqHyTdzlList(page,hy);
     }
 
     @Override
-    public List<Hy> queryXqHyTdcsList(Hy hy) {
+    public IPage<Hy> queryXqHyTdcsList(Page<Hy> page,Hy hy) {
-        return baseMapper.queryXqHyTdcsList(hy);
+        return baseMapper.queryXqHyTdcsList(page,hy);
     }
 
     @Override
-    public List<Hy> queryXqHyXzList(Hy hy) {
+    public IPage<Hy> queryXqHyXzList(Page<Hy> page,Hy hy) {
-        return baseMapper.queryXqHyXzList(hy);
+        return baseMapper.queryXqHyXzList(page,hy);
     }
+
 }