From b587d9d7a7325b4f20d9683f5d40ef072dd3079e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 20 Apr 2021 18:33:49 +0800
Subject: [PATCH] 健康码报表导出接口修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 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 19bbe5b..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 包裹控制层
@@ -64,6 +68,58 @@
return R.data(parcelService.getParcelPic(imgUrl));
}
+ /**
+ * 获取包裹明细分页数据，远程调用api获取数据
+ * @param conditionVo 请求参数对象
+ * @param response
+ * @return
+ */
+ @GetMapping("/getParcelDetailPage")
+ public R getParcelDetailPage(ConditionVo conditionVo,HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(parcelService.getParcelDetailPage(conditionVo));
+ }
+
+
+ /**
+ * 获取包裹违禁品明细分页数据，远程调用api获取数据
+ * @param conditionVo 请求参数对象
+ * @param response
+ * @return
+ */
+ @GetMapping("/getParcelkindDetailPage")
+ public R getParcelkindDetailPage(ConditionVo conditionVo,HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(parcelService.getParcelkindDetailPage(conditionVo));
+ }
+
+
+ /**
+ * 导出包裹数据表格
+ * @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