diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java index 3948b8e..155b5d4 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java @@ -129,7 +129,7 @@ public class BigScreenController extends BaseController { startPage(); // List list = metaActualUserInfoService.list(new QueryWrapper<>(metaActualUserInfo)); // 常驻人员查询 - QueryWrapper queryCzryWrapper = new QueryWrapper<>(); + QueryWrapper queryCzryWrapper = new QueryWrapper<>(metaActualUserInfo); queryCzryWrapper.ne("actual_user_type", 102); queryCzryWrapper.orderByDesc("house_hold_address"); List list = actualUserInfoService.list(queryCzryWrapper); diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/MetaActualUserInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/MetaActualUserInfoController.java index bca80ff..dbd1fbe 100644 --- a/gather-app/src/main/java/com/ruoyi/database/controller/MetaActualUserInfoController.java +++ b/gather-app/src/main/java/com/ruoyi/database/controller/MetaActualUserInfoController.java @@ -37,13 +37,36 @@ public class MetaActualUserInfoController extends BaseController { @ApiOperation("查询实有人口信息表") public TableDataInfo list(MetaActualUserInfo metaActualUserInfo) { startPage(); - QueryWrapper querySyrkWrapper = new QueryWrapper<>(); + QueryWrapper querySyrkWrapper = new QueryWrapper<>(metaActualUserInfo); querySyrkWrapper.ne("actual_user_type", 101); querySyrkWrapper.orderByDesc("house_hold_address"); List list = metaActualUserInfoService.list(querySyrkWrapper); return getDataTable(list); } + @GetMapping("/ldrk") + @ApiOperation("查询流动人口信息表") + public TableDataInfo ldrkList(MetaActualUserInfo metaActualUserInfo) { + startPage(); + QueryWrapper queryLdrkWrapper = new QueryWrapper<>(metaActualUserInfo); + queryLdrkWrapper.eq("actual_user_type", 102); + queryLdrkWrapper.orderByDesc("house_hold_address"); + List list = metaActualUserInfoService.list(queryLdrkWrapper); + return getDataTable(list); + } + + @GetMapping("/czry") + @ApiOperation("查询常住人口信息表") + public TableDataInfo czryList(MetaActualUserInfo metaActualUserInfo) { + startPage(); + QueryWrapper queryCzryWrapper = new QueryWrapper<>(metaActualUserInfo); + queryCzryWrapper.ne("actual_user_type", 102); + queryCzryWrapper.ne("actual_user_type", 101); + queryCzryWrapper.orderByDesc("house_hold_address"); + List list = metaActualUserInfoService.list(queryCzryWrapper); + return getDataTable(list); + } + @PostMapping @ApiOperation("新增实有人口信息表") @Log(title = "实有人口信息表", businessType = BusinessType.INSERT)