修改查询条件
This commit is contained in:
parent
ef6e4748c8
commit
4aadcd3435
|
@ -68,10 +68,11 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
|
||||||
@GetMapping(value = "/qyList")
|
@GetMapping(value = "/qyList")
|
||||||
public Result<IPage<NuBaseInfo>> qyList(NuBaseInfo nuBaseInfo,
|
public Result<IPage<NuBaseInfo>> qyList(NuBaseInfo nuBaseInfo,
|
||||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "15") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
||||||
QueryWrapper<NuBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap);
|
QueryWrapper<NuBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap);
|
||||||
|
queryWrapper.isNotNull("b.id");
|
||||||
Page<NuBaseInfo> page = new Page<NuBaseInfo>(pageNo, pageSize);
|
Page<NuBaseInfo> page = new Page<NuBaseInfo>(pageNo, pageSize);
|
||||||
IPage<NuBaseInfo> pageList = nuBaseInfoService.qyList(page, queryWrapper);
|
IPage<NuBaseInfo> pageList = nuBaseInfoService.qyList(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
record_plan_id as recordPlanId,
|
record_plan_id as recordPlanId,
|
||||||
a.nu_id as nuId,
|
a.nu_id as nuId,
|
||||||
b.nu_name as nuName,
|
b.nu_name as nuName,
|
||||||
ifnull(c.multitrans,0) as multitrans
|
ifnull(c.multitrans,0) as multitrans,
|
||||||
|
a.sn
|
||||||
from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id
|
from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id
|
||||||
left join nu_iot_tplink_camera_capability c on a.device_index = c.device_index
|
left join nu_iot_tplink_camera_capability c on a.device_index = c.device_index
|
||||||
<where>
|
<where>
|
||||||
|
|
Loading…
Reference in New Issue