From 466bbdbec9a0ed2aac095ecd5745eaff77423959 Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Thu, 1 Feb 2024 14:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BigScreenController.java       |  2 +-
 .../MetaActualUserInfoController.java         | 25 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

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<MetaActualUserInfo> list = metaActualUserInfoService.list(new QueryWrapper<>(metaActualUserInfo));
         // 常驻人员查询
-        QueryWrapper<MetaActualUserInfo> queryCzryWrapper = new QueryWrapper<>();
+        QueryWrapper<MetaActualUserInfo> queryCzryWrapper = new QueryWrapper<>(metaActualUserInfo);
         queryCzryWrapper.ne("actual_user_type", 102);
         queryCzryWrapper.orderByDesc("house_hold_address");
         List<MetaActualUserInfo> 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<MetaActualUserInfo> list(MetaActualUserInfo metaActualUserInfo) {
         startPage();
-        QueryWrapper<MetaActualUserInfo> querySyrkWrapper = new QueryWrapper<>();
+        QueryWrapper<MetaActualUserInfo> querySyrkWrapper = new QueryWrapper<>(metaActualUserInfo);
         querySyrkWrapper.ne("actual_user_type", 101);
         querySyrkWrapper.orderByDesc("house_hold_address");
         List<MetaActualUserInfo> list = metaActualUserInfoService.list(querySyrkWrapper);
         return getDataTable(list);
     }
 
+    @GetMapping("/ldrk")
+    @ApiOperation("查询流动人口信息表")
+    public TableDataInfo<MetaActualUserInfo> ldrkList(MetaActualUserInfo metaActualUserInfo) {
+        startPage();
+        QueryWrapper<MetaActualUserInfo> queryLdrkWrapper = new QueryWrapper<>(metaActualUserInfo);
+        queryLdrkWrapper.eq("actual_user_type", 102);
+        queryLdrkWrapper.orderByDesc("house_hold_address");
+        List<MetaActualUserInfo> list = metaActualUserInfoService.list(queryLdrkWrapper);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/czry")
+    @ApiOperation("查询常住人口信息表")
+    public TableDataInfo<MetaActualUserInfo> czryList(MetaActualUserInfo metaActualUserInfo) {
+        startPage();
+        QueryWrapper<MetaActualUserInfo> queryCzryWrapper = new QueryWrapper<>(metaActualUserInfo);
+        queryCzryWrapper.ne("actual_user_type", 102);
+        queryCzryWrapper.ne("actual_user_type", 101);
+        queryCzryWrapper.orderByDesc("house_hold_address");
+        List<MetaActualUserInfo> list = metaActualUserInfoService.list(queryCzryWrapper);
+        return getDataTable(list);
+    }
+
     @PostMapping
     @ApiOperation("新增实有人口信息表")
     @Log(title = "实有人口信息表", businessType = BusinessType.INSERT)