From a4ff2b571be305e2641c9dd67797f4102e795ebb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 25 Apr 2021 10:47:56 +0800
Subject: [PATCH] 1.App警情反馈接口调整 2.租户接口新增

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
index 37ce46c..919a34d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
@@ -1,13 +1,17 @@
 package org.springblade.jfpt.parcel.controller;
 
 import lombok.AllArgsConstructor;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.jfpt.parcel.service.ParcelService;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
+import org.springblade.common.entity.ParcelExcel;
+import org.springblade.common.entity.ParcelKindExcel;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @title 包裹控制层
@@ -94,4 +98,28 @@
 	}
 
 
+	/**
+	 * 导出包裹数据表格
+	 * @param conditionVo 查询条件
+	 * @param response
+	 */
+	@GetMapping("/export-parcel")
+	public void exportParcel(ConditionVo conditionVo, HttpServletResponse response){
+		List<ParcelExcel> list = parcelService.exportParcel(conditionVo);
+		ExcelUtil.export(response, "包裹数据" + DateUtil.time(), "包裹数据表", list, ParcelExcel.class);
+	}
+
+	/**
+	 * 导出违禁品数据表格
+	 * @param conditionVo 查询条件
+	 * @param response
+	 */
+	@GetMapping("/export-parcelKind")
+	public void exportParcelKind(ConditionVo conditionVo, HttpServletResponse response){
+		List<ParcelKindExcel> parcelKindExcelList = parcelService.exportParcelKind(conditionVo);
+		System.out.println("parcelKindExcelList = " + parcelKindExcelList);
+		ExcelUtil.export(response, "违禁品数据" + DateUtil.time(), "违禁品数据表", parcelKindExcelList, ParcelKindExcel.class);
+	}
+
+
 }

--
Gitblit v1.9.3