From 958ddfcec71043b6b800feaac521e7b22bb15e97 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 09:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
index 8e77fa9..7e75e53 100644
--- a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
+++ b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
@@ -12,6 +12,8 @@
import org.springblade.report.service.ReportFileService;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -86,7 +88,6 @@
public List<HealthcodeExcel> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
//将map转换为json对象
String s = JSON.toJSONString(map);
- System.out.println("s = " + s);
if (null!=beanName){
return reportClient.getHealthcodeList(s);
}
@@ -152,7 +153,8 @@
//将map转换为json对象
String body = JSON.toJSONString(map);
if (null!=beanName){
- return reportClient.getParcelList(body);
+ List<ParcelExcel> parcelList = reportClient.getParcelList(body);
+ return parcelList;
}
return null;
}
--
Gitblit v1.9.3