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 | 96 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 80 insertions(+), 16 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 d8e7e7e..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,34 +16,35 @@
*/
package org.springblade.modules.house.controller;
+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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import liquibase.pro.packaged.S;
import lombok.AllArgsConstructor;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+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;
import org.springblade.core.mp.support.Query;
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.excel.HouseHoldExcel;
import org.springblade.modules.house.excel.HouseHoldImporter;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
-import org.springblade.modules.house.service.IHouseholdService;
-import org.springblade.core.boot.ctrl.BladeController;
+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.List;
+import java.util.Map;
/**
* 住户 控制器
@@ -72,6 +73,7 @@
/**
* 住户 自定义查询详情
+ *
* @param household
* @return
*/
@@ -80,6 +82,7 @@
public R getDetail(HouseholdEntity household) {
return R.data(householdService.getDetail(household));
}
+
/**
* 住户 分页
*/
@@ -100,6 +103,40 @@
public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) {
IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household);
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
+ */
+ @GetMapping("/selectHouseholdList")
+ public R selectHouseholdList(HouseholdVO household) {
+ return R.data(householdService.selectHouseholdList(household));
}
/**
@@ -134,12 +171,13 @@
/**
* 住户 自定义新增或修改
+ *
* @param household
* @return
*/
@PostMapping("/saveOrUpdateHousehold")
@ApiOperation(value = "自定义新增或修改", notes = "传入household")
- public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdEntity household) {
+ public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) {
return R.status(householdService.saveOrUpdateHousehold(household));
}
@@ -149,9 +187,12 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
+ @Transactional(rollbackFor = Exception.class)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(householdService.removeByIds(Func.toLongList(ids)));
+ // 返回
+ return R.status(householdService.removeHousehold(ids));
}
+
/**
* 住户审核统计
@@ -159,8 +200,8 @@
@PostMapping("/statistics")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "住户审核统计", notes = "网格员调用")
- public R remove( ) {
- return R.data(householdService.statistics(AuthUtil.getUserId()));
+ public R getStatistics() {
+ return R.data(householdService.statistics(AuthUtil.getUserId(), ""));
}
/**
@@ -189,6 +230,7 @@
/**
* 住户对应物业，网格，公安负责人查询
+ *
* @param household
* @return
*/
@@ -201,6 +243,7 @@
/**
* 用户信息统计
+ *
* @param code
* @param roleType
* @return
@@ -209,7 +252,28 @@
@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")
+ public R userHandle() {
+ return R.data(householdService.userHandle());
+ }
+
+ /**
+ * 获取所有住户
+ *
+ * @return
+ */
+ @GetMapping("/getAllHouseHold")
+ public R getAllHouseHold(HouseholdVO household) {
+ return R.data(householdService.getAllHouseHold(household));
}
--
Gitblit v1.9.3