From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
index e0a2612..8388f12 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
@@ -18,11 +18,14 @@
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
+import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import java.util.List;
import java.util.Map;
@@ -58,10 +61,21 @@
* @param taskPlaceRectificationDTO 场所整改任务表
* @return 场所整改任务表集合
*/
- public List<TaskPlaceRectificationVO> selectTaskPlaceRectificationList(IPage page,
+ List<TaskPlaceRectificationVO> selectTaskPlaceRectificationList(IPage page,
@Param("taskPalce") TaskPlaceRectificationDTO taskPlaceRectificationDTO,
@Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("nineTypeList") List<String> nineTypeList);
- List<Map<String, Integer>> getNineTypeStatistics(List<String> regionChildCodesList, Integer isAdministrator);
+ List<Map<String, Object>> getNineTypeStatistics(String code,
+ List<String> regionChildCodesList,
+ Integer isAdministrator,
+ TaskPlaceRectificationVO taskPlaceRectification);
+
+ List<TaskPlaceRectificationExcel> export(@Param("taskPalce") TaskPlaceRectificationsVO taskPlaceRectification,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("nineTypeList") List<String> nineTypeList);
}
--
Gitblit v1.9.3