From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java b/src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java
index 78d77a3..1428a82 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java
@@ -2,8 +2,12 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.disputeRecord.entity.DisputeRecordEntity;
+import org.springblade.modules.disputeRecord.excel.DisputeRecordExcel;
+import org.springblade.modules.disputeRecord.excel.ExportDisputeRecordExcel;
 import org.springblade.modules.disputeRecord.vo.DisputeRecordVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
 
 /**
  * 矛盾纠纷记录表 服务类
@@ -36,4 +40,22 @@
 	 * @return
 	 */
 	DisputeRecordVO getDetail(DisputeRecordVO disputeRecord);
+
+	/**
+	 * 矛盾纠纷事件数据导入类
+	 * @author Chill
+	 */
+	String importDisputeRecord(List<DisputeRecordExcel> data, Boolean isCovered);
+
+	/**
+	 * 导出矛盾纠纷记录表
+	 * @param disputeRecord
+	 * @return
+	 */
+	List<ExportDisputeRecordExcel> exportDisputeRecordList(DisputeRecordVO disputeRecord);
+
+	/**
+	 * e呼即办数据临时转换到矛盾纠纷
+	 */
+    void eCallToDis();
 }

--
Gitblit v1.9.3