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

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Api(tags="小区信息")
 @RestController
-@RequestMapping("/housingestateInfo/blHousingestateInfo")
+@RequestMapping("/zh/blHousingestateInfo")
 @Slf4j
 public class BlHousingestateInfoController extends JeecgController<BlHousingestateInfo, IBlHousingestateInfoService> {
 	@Autowired
@@ -68,9 +68,8 @@ public class BlHousingestateInfoController extends JeecgController<BlHousingesta
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<BlHousingestateInfo> queryWrapper = QueryGenerator.initQueryWrapper(blHousingestateInfo, req.getParameterMap());
 		Page<BlHousingestateInfo> page = new Page<BlHousingestateInfo>(pageNo, pageSize);
-		IPage<BlHousingestateInfo> pageList = blHousingestateInfoService.page(page, queryWrapper);
+		IPage<BlHousingestateInfo> pageList = blHousingestateInfoService.findPage(page, blHousingestateInfo);
 		return Result.OK(pageList);
 	}
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/entity/BlHousingestateInfo.java

@@ -63,6 +63,10 @@ public class BlHousingestateInfo implements Serializable {
 	@Excel(name = "设备数量", width = 15)
     @ApiModelProperty(value = "设备数量")
     private String dtusCount;
+    /**注册会员数*/
+    @Excel(name = "注册会员数", width = 15)
+    @ApiModelProperty(value = "注册会员数")
+    private String hyCount;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

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

@@ -1,44 +1,60 @@
 <?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,
+        name,
+        status,
+        type,
+        (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
+        from bl_housingestate_info a
+        <where>
+            <if test="params.name != null and params.name != ''">
+                AND name LIKE concat('%',#{params.name},'%')
+            </if>
+        </where>
+        order by housingestate_id
+    </select>
 
     <select id="queryXqHyTdzlList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
-        select * from (
+        select
-        select round(sum(a.weight),2) as  cn ,b.`name` as shortHour
+        a.housingestate_id as housingestateId,
-        from bl_order_info a , bl_housingestate_info b
+        b.name as housingestateName,
-        where a.housingestate_id = b.housingestate_id
+        round(sum(a.weight),2) as weight
-        and a.add_time  >= #{hy.beginTime}
+        from bl_order_info a
-        and a.add_time  &lt;= #{hy.endTime}
+        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        GROUP BY b.`NAME`
+        and a.add_time  >= #{beginTime}
-        ORDER BY sum(a.weight) desc
+        and a.add_time  &lt;= #{endTime}
-        ) tb
+        group by a.housingestate_id,b.name
+        ORDER BY weight desc
     </select>
 
     <select id="queryXqHyXzList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
-        select * from (
+        select
-        select b.`NAME` as shortDay,count(*) as cn
+        a.housingestate_id as housingestateId,
-        from bl_user_info a , bl_housingestate_info b
+        b.name as housingestateName,
-        where a.housingestate_id = b.housingestate_id
+        count(a.phone) as cn
-        and a.register_date >= #{hy.beginTime}
+        from bl_user_info a
-        and a.register_date &lt;= #{hy.endTime}
+        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        group by b.`NAME`
+        where a.register_date >= #{beginTime}
-        ORDER BY count(*) desc
+        and a.register_date &lt;= #{endTime}
-        ) tb
+        group by a.housingestate_id,b.name
+        ORDER BY cn desc
     </select>
 
     <select id="queryXqHyTdcsList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
-        select * from (
         select
-        b.`NAME` as phone,
+        a.housingestate_id as housingestateId,
-        count(*) as cn
+        b.name as housingestateName,
-        from bl_order_info a , bl_housingestate_info b
+        count(a.id) as cn
-        where  a.housingestate_id = b.housingestate_id
+        from bl_order_info a
-        and a.add_time  >= #{hy.beginTime}
+        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        and a.add_time  &lt;= #{hy.endTime}
+        where a.add_time  >= #{beginTime}
-        group by b.`NAME`
+        and a.add_time  &lt;= #{endTime}
-        order by count(*) desc
+        group by a.housingestate_id,b.name
-        ) tb
+        order by cn desc
     </select>
 
 </mapper>

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

@@ -16,6 +16,8 @@ import java.util.List;
  */
 public interface IBlHousingestateInfoService extends IService<BlHousingestateInfo> {
 
+    IPage<BlHousingestateInfo> findPage(Page<BlHousingestateInfo> page,BlHousingestateInfo blHousingestateInfo);
+
     IPage<Hy> queryXqHyTdzlList(Page<Hy> page,Hy hy);
 
     IPage<Hy> queryXqHyTdcsList(Page<Hy> page,Hy hy);

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

@@ -21,6 +21,12 @@ import java.util.List;
 @Service
 public class BlHousingestateInfoServiceImpl extends ServiceImpl<BlHousingestateInfoMapper, BlHousingestateInfo> implements IBlHousingestateInfoService {
 
+    @Override
+    public IPage<BlHousingestateInfo> findPage(Page<BlHousingestateInfo> page, BlHousingestateInfo blHousingestateInfo) {
+        return baseMapper.findPage(page,blHousingestateInfo);
+
+    }
+
     @Override
     public IPage<Hy> queryXqHyTdzlList(Page<Hy> page,Hy hy) {
         return baseMapper.queryXqHyTdzlList(page,hy);