From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
index 8392379..94e8a0e 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -16,14 +16,14 @@
*/
package org.springblade.modules.house.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import liquibase.pro.packaged.S;
import lombok.AllArgsConstructor;
-import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.node.TreeIntegerNode;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
@@ -31,25 +31,20 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
import org.springblade.modules.house.entity.HouseholdEntity;
-import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.excel.HouseHoldImporter;
import org.springblade.modules.house.service.IHouseholdService;
-import org.springblade.modules.house.service.IUserHouseLabelService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
-import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IUserService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* 住户 控制器
@@ -78,6 +73,7 @@
/**
* 住户 自定义查询详情
+ *
* @param household
* @return
*/
@@ -86,6 +82,7 @@
public R getDetail(HouseholdEntity household) {
return R.data(householdService.getDetail(household));
}
+
/**
* 住户 分页
*/
@@ -108,9 +105,32 @@
return R.data(pages);
}
+ /**
+ * 住户 自定义分页
+ */
+ @GetMapping("/getKeynotePersonnelPage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入household")
+ public R<IPage<HouseholdVO>> getKeynotePersonnelPage(HouseholdVO household, Query query) {
+ IPage<HouseholdVO> pages = householdService.getKeynotePersonnelPage(Condition.getPage(query), household);
+ return R.data(pages);
+ }
+
+ /**
+ * 住户标签统计
+ */
+ @GetMapping("/getlabelStatistics")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "住户标签统计", notes = "传入household")
+ public R<List<TreeIntegerNode>> getlabelStatistics(HouseholdVO household) {
+ List<TreeIntegerNode> pages = householdService.getlabelStatistics(household);
+ return R.data(pages);
+ }
+
/**
* 住户列表查询
+ *
* @param household
* @return
*/
@@ -151,6 +171,7 @@
/**
* 住户 自定义新增或修改
+ *
* @param household
* @return
*/
@@ -209,6 +230,7 @@
/**
* 住户对应物业，网格，公安负责人查询
+ *
* @param household
* @return
*/
@@ -221,6 +243,7 @@
/**
* 用户信息统计
+ *
* @param code
* @param roleType
* @return
@@ -229,12 +252,13 @@
@ApiOperationSupport(order = 14)
@ApiOperation(value = "用户信息统计", notes = " ")
public R getHouseHoldStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
- return R.data(householdService.getHouseHoldStatistics(code,roleType));
+ return R.data(householdService.getHouseHoldStatistics(code, roleType));
}
/**
* 住户业主信息处理，将业主人员插入到用户表
+ *
* @return
*/
@GetMapping("/userHandle")
@@ -244,14 +268,13 @@
/**
* 获取所有住户
+ *
* @return
*/
@GetMapping("/getAllHouseHold")
public R getAllHouseHold(HouseholdVO household) {
return R.data(householdService.getAllHouseHold(household));
}
-
-
}
--
Gitblit v1.9.3