From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/taskPlaceRectification/service/ITaskPlaceRectificationService.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/service/ITaskPlaceRectificationService.java b/src/main/java/org/springblade/modules/taskPlaceRectification/service/ITaskPlaceRectificationService.java
index de4abfe..da3d268 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/service/ITaskPlaceRectificationService.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/service/ITaskPlaceRectificationService.java
@@ -16,14 +16,13 @@
  */
 package org.springblade.modules.taskPlaceRectification.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-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.PlaceRectificationsExcel;
 import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
 import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
-import org.springblade.core.mp.base.BaseService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
 
 import java.util.List;
@@ -68,4 +67,8 @@
 	Object rectificationStatistics(TaskPlaceRectificationVO taskPlaceRectification);
 
 	List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationsVO taskPlaceRectificationVO);
+
+	void importPlaceRectifications(List<PlaceRectificationsExcel> data, Boolean isCovered);
+
+    Integer getCount(String neiCode, int i);
 }

--
Gitblit v1.9.3