修改sql语句
This commit is contained in:
parent
bb5deff3d8
commit
c877cf2804
|
@ -89,8 +89,11 @@ public class BlHousingestateInfoController extends JeecgController<BlHousingesta
|
||||||
* 小区新增会员统计
|
* 小区新增会员统计
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/queryXqHyXzList", method = RequestMethod.GET)
|
@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);
|
return Result.ok(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,18 +102,23 @@ public class BlHousingestateInfoController extends JeecgController<BlHousingesta
|
||||||
* 小区会员投递次数排行榜
|
* 小区会员投递次数排行榜
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/queryXqHyTdcsList", method = RequestMethod.GET)
|
@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);
|
return Result.ok(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 小区会员投递重量排行榜
|
* 小区会员投递重量排行榜
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/queryXqHyTdzlList", method = RequestMethod.GET)
|
@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);
|
return Result.ok(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,8 @@ package org.jeecg.modules.zh.view.housingestateInfo.mapper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
import org.jeecg.modules.zh.view.housingestateInfo.entity.BlHousingestateInfo;
|
import org.jeecg.modules.zh.view.housingestateInfo.entity.BlHousingestateInfo;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
@ -15,9 +17,10 @@ import org.jeecg.modules.zh.view.hy.entity.Hy;
|
||||||
*/
|
*/
|
||||||
public interface BlHousingestateInfoMapper extends BaseMapper<BlHousingestateInfo> {
|
public interface BlHousingestateInfoMapper extends BaseMapper<BlHousingestateInfo> {
|
||||||
|
|
||||||
List<Hy> queryXqHyTdzlList(Hy hy);
|
IPage<Hy> queryXqHyTdzlList(Page<Hy> page, @Param("hy")Hy hy);
|
||||||
|
|
||||||
List<Hy> queryXqHyXzList(Hy hy);
|
IPage<Hy> queryXqHyXzList(Page<Hy> page, @Param("hy")Hy hy);
|
||||||
|
|
||||||
|
IPage<Hy> queryXqHyTdcsList(Page<Hy> page, @Param("hy")Hy hy);
|
||||||
|
|
||||||
List<Hy> queryXqHyTdcsList(Hy hy);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,34 +4,41 @@
|
||||||
|
|
||||||
|
|
||||||
<select id="queryXqHyTdzlList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
|
<select id="queryXqHyTdzlList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
|
||||||
|
select * from (
|
||||||
select round(sum(a.weight),2) as cn ,b.`name` as shortHour
|
select round(sum(a.weight),2) as cn ,b.`name` as shortHour
|
||||||
from bl_order_info a , bl_housingestate_info b
|
from bl_order_info a , bl_housingestate_info b
|
||||||
where a.housingestate_id = b.housingestate_id
|
where a.housingestate_id = b.housingestate_id
|
||||||
and a.add_time >= #{beginTime}
|
and a.add_time >= #{hy.beginTime}
|
||||||
and a.add_time <= #{endTime}
|
and a.add_time <= #{hy.endTime}
|
||||||
GROUP BY b.`NAME`
|
GROUP BY b.`NAME`
|
||||||
ORDER BY sum(a.weight) desc limit 10
|
ORDER BY sum(a.weight) desc
|
||||||
|
) tb
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="queryXqHyXzList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
|
<select id="queryXqHyXzList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
|
||||||
|
select * from (
|
||||||
select b.`NAME` as shortDay,count(*) as cn
|
select b.`NAME` as shortDay,count(*) as cn
|
||||||
from bl_user_info a , bl_housingestate_info b
|
from bl_user_info a , bl_housingestate_info b
|
||||||
where a.housingestate_id = b.housingestate_id
|
where a.housingestate_id = b.housingestate_id
|
||||||
and a.register_date >= #{beginTime}
|
and a.register_date >= #{hy.beginTime}
|
||||||
and a.register_date <= #{endTime}
|
and a.register_date <= #{hy.endTime}
|
||||||
group by b.`NAME`
|
group by b.`NAME`
|
||||||
ORDER BY count(*) desc limit 10
|
ORDER BY count(*) desc
|
||||||
|
) tb
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="queryXqHyTdcsList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
|
<select id="queryXqHyTdcsList" 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 phone,
|
b.`NAME` as phone,
|
||||||
count(*) as cn
|
count(*) as cn
|
||||||
from bl_order_info a , bl_housingestate_info b
|
from bl_order_info a , bl_housingestate_info b
|
||||||
where a.housingestate_id = b.housingestate_id
|
where a.housingestate_id = b.housingestate_id
|
||||||
and a.add_time >= #{beginTime}
|
and a.add_time >= #{hy.beginTime}
|
||||||
and a.add_time <= #{endTime}
|
and a.add_time <= #{hy.endTime}
|
||||||
group by b.`NAME`
|
group by b.`NAME`
|
||||||
order by count(*) desc limit 10
|
order by count(*) desc
|
||||||
|
) tb
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
|
@ -1,5 +1,7 @@
|
||||||
package org.jeecg.modules.zh.view.housingestateInfo.service;
|
package org.jeecg.modules.zh.view.housingestateInfo.service;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import org.jeecg.modules.zh.view.housingestateInfo.entity.BlHousingestateInfo;
|
import org.jeecg.modules.zh.view.housingestateInfo.entity.BlHousingestateInfo;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import org.jeecg.modules.zh.view.hy.entity.Hy;
|
import org.jeecg.modules.zh.view.hy.entity.Hy;
|
||||||
|
@ -14,9 +16,10 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
public interface IBlHousingestateInfoService extends IService<BlHousingestateInfo> {
|
public interface IBlHousingestateInfoService extends IService<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);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package org.jeecg.modules.zh.view.housingestateInfo.service.impl;
|
package org.jeecg.modules.zh.view.housingestateInfo.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import org.jeecg.modules.zh.view.housingestateInfo.entity.BlHousingestateInfo;
|
import org.jeecg.modules.zh.view.housingestateInfo.entity.BlHousingestateInfo;
|
||||||
import org.jeecg.modules.zh.view.housingestateInfo.mapper.BlHousingestateInfoMapper;
|
import org.jeecg.modules.zh.view.housingestateInfo.mapper.BlHousingestateInfoMapper;
|
||||||
import org.jeecg.modules.zh.view.housingestateInfo.service.IBlHousingestateInfoService;
|
import org.jeecg.modules.zh.view.housingestateInfo.service.IBlHousingestateInfoService;
|
||||||
|
@ -20,17 +22,18 @@ import java.util.List;
|
||||||
public class BlHousingestateInfoServiceImpl extends ServiceImpl<BlHousingestateInfoMapper, BlHousingestateInfo> implements IBlHousingestateInfoService {
|
public class BlHousingestateInfoServiceImpl extends ServiceImpl<BlHousingestateInfoMapper, BlHousingestateInfo> implements IBlHousingestateInfoService {
|
||||||
|
|
||||||
@Override
|
@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
|
@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
|
@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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue