From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
index 75aed39..cb4660d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
@@ -108,8 +108,7 @@
//创建对象，并封装数据
HealthcodeVO healthcodeVO = getHealthcodeVo(map);
//查询数据并返回数据
- List<HealthcodeExcel> excelList = ihealthcodeService.getHealthcodePie(healthcodeVO);
- return excelList;
+ return ihealthcodeService.getHealthcodePie(healthcodeVO);
}
/**
@@ -145,8 +144,7 @@
//创建对象，并封装数据
AnimalHeatVo animalHeatVo = getAnimalHeatVo(map);
//查询数据并返回数据
- List<AnimalHeatExcel> excelList = animalHeatService.exportAnimalHeat(animalHeatVo);
- return excelList;
+ return animalHeatService.exportAnimalHeat(animalHeatVo);
}
/**
@@ -160,9 +158,7 @@
//创建对象，并封装数据
AnimalHeatVo animalHeatVo = getAnimalHeatVo(map);
//查询数据并返回数据
- List<ReportReturnData> reportReturnData = animalHeatService.getAnimalHeatPie(animalHeatVo);
- System.out.println("reportReturnData = " + reportReturnData);
- return reportReturnData;
+ return animalHeatService.getAnimalHeatPie(animalHeatVo);
}
/**
@@ -198,10 +194,22 @@
//创建对象，并封装数据
ConditionVo conditionVo = getConditionVo(map);
//查询数据并返回数据
- List<ParcelExcel> excelList = parcelService.exportParcel(conditionVo);
- System.out.println("conditionVo = " + conditionVo);
- System.out.println("excelList = " + excelList);
- return excelList;
+ List<ParcelExcel> parcelExcels = parcelService.exportParcel(conditionVo);
+ return parcelExcels;
+ }
+
+ /**
+ * 获取包裹数据集合
+ * @param body map集合数据
+ * @return
+ */
+ @PostMapping("getParcelPie")
+ public List<ReportReturnData> getParcelPie(@RequestBody String body){
+ Map<String,Object> map = JSONObject.parseObject(body);
+ //创建对象，并封装数据
+ ConditionVo conditionVo = getConditionVo(map);
+ //查询数据并返回数据
+ return null;
}
/**
--
Gitblit v1.9.3