From aeb7d068be92312dcdcea75e1240bcf2a78dd0fe Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 29 Jul 2024 16:49:58 +0800
Subject: [PATCH] 代码优化

---
 src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java |   44 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java
index 577b85d..494be64 100644
--- a/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java
@@ -16,15 +16,17 @@
  */
 package org.springblade.modules.house.mapper;
 
-import org.springblade.modules.house.dto.UserHouseLabelDTO;
-import org.springblade.modules.house.entity.UserHouseLabelEntity;
-import org.springblade.modules.house.vo.HouseLabelVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.house.dto.UserHouseLabelDTO;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
+import org.springblade.modules.house.vo.HouseholdLabelVO;
+
 import java.util.List;
 
 /**
- * 房屋-标签 Mapper 接口
+ * 住户-标签 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-28
@@ -35,11 +37,39 @@
 	 * 自定义分页
 	 *
 	 * @param page
-	 * @param houseLabel
+	 * @param householdLabel
 	 * @return
 	 */
-	List<HouseLabelVO> selectHouseLabelPage(IPage page, HouseLabelVO houseLabel);
+	List<HouseholdLabelVO> selectHouseLabelPage(IPage page, HouseholdLabelVO householdLabel);
 
+	List<Integer> getUserLabelList(UserHouseLabelDTO userHouseLabelDTO);
 
-    List<Integer> getUserLabelList(UserHouseLabelDTO userHouseLabelDTO);
+	List<HouseholdLabelVO> statisticalLabels(IPage page, @Param("householdLabel") HouseholdLabelVO householdLabel);
+
+	/**
+	 * 组织部
+	 * @param page
+	 * @param householdLabel
+	 * @return
+	 */
+	List<HouseholdLabelVO> orgStatisticalLabels(IPage page, @Param("householdLabel") HouseholdLabelVO householdLabel);
+
+	/**
+	 * 统战人员
+	 * @param page
+	 * @param householdLabel
+	 * @return
+	 */
+	List<HouseholdLabelVO> unitedFrontStatisticalLabels(IPage page, @Param("householdLabel") HouseholdLabelVO householdLabel);
+
+	List<HouseholdLabelVO> getCommunityStatisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel);
+
+	/**
+	 * 查询对应的label集合信息
+	 * @param labelName
+	 * @return
+	 */
+    List<UserHouseLabelEntity> getLabelList(@Param("labelNames") String labelName);
+
+	List<HouseholdLabelVO> followStatisticalLabels(IPage page, @Param("householdLabel") HouseholdLabelVO householdLabel);
 }

--
Gitblit v1.9.3