From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 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 317679b..334497a 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -16,14 +16,16 @@
*/
package org.springblade.modules.house.mapper;
-import org.apache.ibatis.annotations.Param;
-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.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.common.node.TreeIntegerNode;
+import org.springblade.common.node.TreeStringNode;
+import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
+import org.springblade.modules.house.vo.HouseholdOtherVO;
+import org.springblade.modules.house.vo.HouseholdVO;
import java.util.List;
import java.util.Map;
@@ -43,32 +45,40 @@
* @param household
* @return
*/
- List<HouseholdVO> selectHouseholdPage(IPage page,@Param("household") HouseholdVO household);
+ List<HouseholdVO> selectHouseholdPage(IPage page,
+ @Param("household") HouseholdVO household,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList);
/**
* 获取全部
+ *
* @param household
* @return
*/
- List<HouseholdVO> getAllHouseHold(@Param("household")HouseholdVO household);
+ List<HouseholdVO> getAllHouseHold(@Param("household") HouseholdVO household);
/**
* 查询房屋集合信息
+ *
* @param userId
* @return
*/
- List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);
+ List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);
/**
* 查询房屋人员情况
+ *
* @param code
* @return
*/
- List<HouseholdVO> getHouseholdListByCode(@Param("code") String code);
+ List<HouseholdVO> getHouseholdListByCode(@Param("code") String code);
/**
* 住户 自定义查询详情
+ *
* @param household
* @return
*/
@@ -76,22 +86,28 @@
/**
* 导出
+ *
* @param household
* @return
*/
List<HouseHoldExcel> export(@Param("household") HouseholdVO household);
- Integer statistics(Long userId,String neiCode);
+ Integer statistics(@Param("household") HouseholdVO household,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList);
/**
* 查询物业
+ *
* @param household
* @return
*/
- HouseholdOtherVO getProperty(@Param("household") HouseholdVO household);
+ HouseholdOtherVO getProperty(@Param("household") HouseholdVO household);
/**
* 查询网格
+ *
* @param household
* @return
*/
@@ -99,25 +115,41 @@
/**
* 查询公安信息
+ *
* @param household
* @return
*/
HouseholdOtherVO getSecurity(@Param("household") HouseholdVO household);
- List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId,String roleType);
+ List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId, String roleType);
- List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId,String roleType);
+ List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId, String roleType);
/**
* 查询所有未入库的业主信息
+ *
* @return
*/
- List<HouseholdEntity> getNotInsertUserHousehold();
+ List<HouseholdEntity> getNotInsertUserHousehold();
/**
* 住户列表查询
+ *
* @param household
* @return
*/
- List<HouseholdVO> selectHouseholdList(@Param("household")HouseholdVO household);
+ List<HouseholdVO> selectHouseholdList(@Param("household") HouseholdVO household);
+
+ List<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, @Param("household") HouseholdVO household);
+
+ /**
+ * 根据人员标签编号集合查询对应的住户（按颜色区分近多少天没有发过任务的住户）
+ *
+ * @param list
+ * @return
+ */
+ List<HouseholdVO> getHouseholdListByParam(@Param("list") List<Integer> list);
+
+ @MapKey(value = "id")
+ Map<Integer, TreeIntegerNode> getlabelStatistics(@Param("household") HouseholdVO household);
}
--
Gitblit v1.9.3