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/controller/TbResGeneralInvestigationController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
index cfe8237..579f42e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
@@ -11,6 +11,7 @@
 import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
 import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTable;
 import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
+import cn.gistack.sm.sjztmd.vo.ResGentionVO;
 import cn.gistack.sm.sjztmd.vo.TbResGeneralInvestigationParam;
 import cn.gistack.sm.sjztmd.wrapper.AttResBaseWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -146,6 +147,15 @@
 	}
 
 
+	@GetMapping("/downloadZipCopy")
+	@ApiOperation(value = "批量导出白蚁普查的图片视频zip文件")
+	public R downloadZipCopy(Query query,String type,AttResBaseGeneralInvestigationVO attResBase){
+
+		List<ResGentionVO> msg = tbResGeneralInvestigationService.downZipCopy(Condition.getPage(query),type,attResBase);
+
+		return  R.data(msg);
+	}
+
 
 	@GetMapping("/statisticsPie")
 	public R statisticsPie(StatisticsParams statisticsParams){

--
Gitblit v1.9.3