From 4ec472d8828e34fbcfb3990451d059e486b7d5ea Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 17 Jan 2024 19:32:46 +0800
Subject: [PATCH] 议事管理bug
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 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 ca68e29..b06f2d6 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;
@@ -44,6 +44,13 @@
* @return
*/
List<HouseholdVO> selectHouseholdPage(IPage page,@Param("household") HouseholdVO household);
+
+ /**
+ * 获取全部
+ * @param household
+ * @return
+ */
+ List<HouseholdVO> getAllHouseHold(@Param("household")HouseholdVO household);
/**
@@ -74,7 +81,7 @@
*/
List<HouseHoldExcel> export(@Param("household") HouseholdVO household);
- Integer statistics(Long userId);
+ Integer statistics(Long userId,String neiCode);
/**
* 查询物业
@@ -97,7 +104,30 @@
*/
HouseholdOtherVO getSecurity(@Param("household") HouseholdVO household);
- List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId);
+ List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId,String roleType);
- List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId);
+ List<Map<String, Object>> getHouseHoldStatisticsAge(String code, Long userId,String roleType);
+
+ /**
+ * 查询所有未入库的业主信息
+ * @return
+ */
+ List<HouseholdEntity> getNotInsertUserHousehold();
+
+ /**
+ * 住户列表查询
+ *
+ * @param household
+ * @return
+ */
+ 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