From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbDykeInvestigationService.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbDykeInvestigationService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbDykeInvestigationService.java
index f2dcdb8..ea5b94d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbDykeInvestigationService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbDykeInvestigationService.java
@@ -5,11 +5,12 @@
 import cn.gistack.sm.sjztmd.statisticsVO.StatisticsBar;
 import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
 import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
-import cn.gistack.sm.sjztmd.vo.TbDykeInvestigationParam;
-import cn.gistack.sm.sjztmd.vo.TbResGeneralInvestigationParam;
+import cn.gistack.sm.sjztmd.vo.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.tool.api.R;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -21,6 +22,13 @@
 public interface ITbDykeInvestigationService extends IService<TbDykeInvestigation> {
 
 	/**
+	 *
+	 * @param page
+	 * @return
+	 */
+     List<String> downZip(IPage<ImageAndVideoVO> page,String type) throws IOException;
+
+    /**
 	 * 自定义保存或者修改对象方法
 	 * @param entity
 	 * @return
@@ -43,4 +51,6 @@
 	StatisticsPie statisticsPie(StatisticsParams statisticsParams);
 
     List<StatisticsBar> statisticsBar(StatisticsParams statisticsParams);
+
+	List<DyketionVO> downloadZipCopy(IPage<TbResDykeVO> page, String type,TbResDykeVO tbResDykeVO);
 }

--
Gitblit v1.9.3