From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 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..d886be7 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,19 @@
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;
+
+import static java.time.LocalDate.now;
/**
* @title 包裹控制层
@@ -94,4 +100,29 @@
}
+ /**
+ * 导出包裹数据表格
+ * @param conditionVo 查询条件
+ * @param response
+ */
+ @GetMapping("/export-parcel")
+ public void exportParcel(ConditionVo conditionVo, HttpServletResponse response){
+ System.out.println("parStart = " + now());
+ List<ParcelExcel> list = parcelService.exportParcel(conditionVo);
+ System.out.println("parEnd = " + now());
+ 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);
+ ExcelUtil.export(response, "违禁品数据" + DateUtil.time(), "违禁品数据表", parcelKindExcelList, ParcelKindExcel.class);
+ }
+
+
}
--
Gitblit v1.9.3