From d7e498f5e1f13e37df52ebd08c98e8a833b9c450 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 02 Feb 2024 14:36:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
index 649c88e..e4574f1 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -33,17 +33,39 @@
*/
public interface PlaceMapper extends BaseMapper<PlaceEntity> {
+
+ /**
+ * 九小场所档案
+ *
+ * @param page
+ * @param place
+ * @param houseCodeList
+ * @param regionChildCodesList
+ * @param isAdministrator
+ * @return
+ */
+ List<PlaceVO> selectNinePlacePage(IPage page,
+ @Param("place") PlaceVO place,
+ @Param("houseCodeList") List<String> houseCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
+
+
/**
* 自定义分页
*
* @param page
* @param place
* @param houseCodeList
+ * @param regionChildCodesList
+ * @param isAdministrator
* @return
*/
List<PlaceVO> selectPlacePage(IPage page,
@Param("place") PlaceVO place,
- @Param("houseCodeList") List<String> houseCodeList);
+ @Param("houseCodeList") List<String> houseCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 查询场所集合信息
@@ -110,10 +132,11 @@
List<PlaceEntity> placeAndRelHandle();
/**
- * 根据标签编号集合查询对应的场所
+ * 根据编号集合查询对应的场所（按颜色区分近多少天没有发过任务的场所）4部分数据（三种颜色对应的+从来没有发过的）
* @param stringList
+ * @param tableName
* @return
*/
List<PlaceVO> getPlaceListByParam(@Param("list") List<String> stringList,
- @Param("color") String color);
+ @Param("tableName") String tableName);
}
--
Gitblit v1.9.3