From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
index bb34e55..2bdfeac 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -17,14 +17,16 @@
package org.springblade.modules.house.mapper;
import org.apache.ibatis.annotations.Param;
-import org.springblade.common.node.TreeNode;
+import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.excel.HouseHoldExcel;
import java.util.List;
+import java.util.Map;
/**
* 住户 Mapper 接口
@@ -49,7 +51,7 @@
* @param userId
* @return
*/
- List<TreeNode> selectHouseNodeList(@Param("userId") Long userId);
+ List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);
/**
* 查询房屋人员情况
@@ -65,7 +67,37 @@
*/
HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household);
- List<HouseHoldExcel> export(HouseholdVO household);
+ /**
+ * 导出
+ * @param household
+ * @return
+ */
+ List<HouseHoldExcel> export(@Param("household") HouseholdVO household);
Integer statistics(Long userId);
+
+ /**
+ * 查询物业
+ * @param household
+ * @return
+ */
+ HouseholdOtherVO getProperty(@Param("household") HouseholdVO household);
+
+ /**
+ * 查询网格
+ * @param household
+ * @return
+ */
+ HouseholdOtherVO getGrid(@Param("household") HouseholdVO household);
+
+ /**
+ * 查询公安信息
+ * @param household
+ * @return
+ */
+ HouseholdOtherVO getSecurity(@Param("household") HouseholdVO household);
+
+ List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId,String roleType);
+
+ List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId,String roleType);
}
--
Gitblit v1.9.3