From 494aeb58eb885b40ab2fdb083aaa79007bb79ae2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 17:46:23 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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..1b504c3 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,14 @@
*/
package org.springblade.modules.house.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
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 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;
@@ -43,7 +43,10 @@
* @param household
* @return
*/
- List<HouseholdVO> selectHouseholdPage(IPage page,@Param("household") HouseholdVO household);
+ List<HouseholdVO> selectHouseholdPage(IPage page,
+ @Param("household") HouseholdVO household,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 获取全部
@@ -112,12 +115,22 @@
* 查询所有未入库的业主信息
* @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);
}
--
Gitblit v1.9.3