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/service/impl/ParcelServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
index 4be1cbe..0fbfe87 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -3,20 +3,16 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.common.utils.JacksonUtils;
-import io.swagger.models.auth.In;
import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
import org.springblade.jfpt.animalheat.util.ImageUtil;
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.util.*;
import org.springblade.jfpt.parcel.vo.ConditionVo;
-import org.springblade.jfpt.parcel.vo.ParcelExcel;
-import org.springblade.jfpt.parcel.vo.ParcelKindExcel;
+import org.springblade.common.entity.ParcelExcel;
+import org.springblade.common.entity.ParcelKindExcel;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import javax.validation.constraints.NotBlank;
-import java.lang.reflect.Array;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -688,6 +684,7 @@
*/
@Override
public List<ParcelExcel> exportParcel(ConditionVo conditionVo) {
+ System.out.println("conditionVo = " + conditionVo);
ArrayList<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
//设置页码数
conditionVo.setCurrentPage(1);
@@ -725,7 +722,6 @@
*/
@Override
public List<ParcelKindExcel> exportParcelKind(ConditionVo conditionVo) {
- System.out.println("conditionVo = " + conditionVo);
List<List<ParcelKindExcel>> parcelKindExcelList = new ArrayList<>();
List<ParcelKindExcel> list = new ArrayList<>();
if(null!=conditionVo.getTimeDesc() && conditionVo.getTimeDesc()!="" && !conditionVo.getTimeDesc().equals("undefined") ){
@@ -784,7 +780,8 @@
}
}
//合并集合并返回
- return parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
+ List<ParcelKindExcel> parcelKindExcels = parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
+ return parcelKindExcels;
}
}
return null;
--
Gitblit v1.9.3