From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 e9540bb..e8ac436 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -21,7 +21,9 @@
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.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;
@@ -42,6 +44,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
+import java.util.Map;
/**
* 住户 控制器
@@ -70,6 +73,7 @@
/**
* 住户 自定义查询详情
+ *
* @param household
* @return
*/
@@ -78,6 +82,7 @@
public R getDetail(HouseholdEntity household) {
return R.data(householdService.getDetail(household));
}
+
/**
* 住户 分页
*/
@@ -108,6 +113,17 @@
@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);
}
@@ -155,6 +171,7 @@
/**
* 住户 自定义新增或修改
+ *
* @param household
* @return
*/
@@ -184,7 +201,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "住户审核统计", notes = "网格员调用")
public R getStatistics() {
- return R.data(householdService.statistics(AuthUtil.getUserId(), ""));
+ return R.data(householdService.statistics(AuthUtil.getUserId(), "",0));
}
/**
@@ -213,6 +230,7 @@
/**
* 住户对应物业，网格，公安负责人查询
+ *
* @param household
* @return
*/
@@ -225,6 +243,7 @@
/**
* 用户信息统计
+ *
* @param code
* @param roleType
* @return
@@ -233,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")
@@ -248,14 +268,13 @@
/**
* 获取所有住户
+ *
* @return
*/
@GetMapping("/getAllHouseHold")
public R getAllHouseHold(HouseholdVO household) {
return R.data(householdService.getAllHouseHold(household));
}
-
-
}
--
Gitblit v1.9.3