From f95e2a385d4cbd07501b512079d7da6aae253a41 Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.com>
Date: 星期日, 13 十二月 2020 10:01:13 +0800
Subject: [PATCH] 服务机构页面
---
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java
index 6c8a2fe..914a739 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java
@@ -5,13 +5,17 @@
import cn.cetc54.platform.zhyl.service.ISubsidyLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -21,7 +25,8 @@
@Slf4j
@RestController
@Api(description = "琛ヨ创椤甸潰鎺ュ彛")
-@RequestMapping("/api/subsidy")
+@RequestMapping("/api2/subsidy")
+@CrossOrigin("*")
public class SubsidyAPIController {
@Autowired
private ISubsidyLogService iSubsidyLogService;
@@ -41,10 +46,43 @@
@ApiOperation(value = "骞村害鏈堝害缁熻鏁版嵁")
public Result getStatistics(String areaId,Integer type){
Map<String,Object> resMap = new HashMap<>();
- resMap.put("monthStatistics",iSubsidyLogService.getMonthTotal(areaId,type));
- resMap.put("yearStatistics",iSubsidyLogService.getYearTotal(areaId,type));
+ List<Map<String,Object>> monthList = iSubsidyLogService.getMonthTotal(areaId,type);
+ List<Map<String,Object>> yearList = iSubsidyLogService.getYearTotal(areaId,type);
+
+ List<String> month = new ArrayList<>();
+ List<Double> mSum = new ArrayList<>();
+ monthList.forEach(e->{
+ String d = (String) e.get("time");
+ double s = (double) e.get("sum");
+ month.add(0,d.split("-")[1]);
+ mSum.add(0,s);
+ });
+ StatisticsVo mS = new StatisticsVo();
+ mS.setTime(month);
+ mS.setSum(mSum);
+
+ List<String> year = new ArrayList<>();
+ List<Double> ySum = new ArrayList<>();
+ yearList.forEach(e->{
+ String d = (String) e.get("time");
+ double s = (double) e.get("sum");
+ year.add(0,d);
+ ySum.add(0,s);
+ });
+ StatisticsVo yS = new StatisticsVo();
+ yS.setTime(year);
+ yS.setSum(ySum);
+
+
+ resMap.put("monthStatistics",mS);
+ resMap.put("yearStatistics",yS);
return ResultUtil.data(resMap);
}
+ @Data
+ class StatisticsVo{
+ Object time;
+ Object sum;
+ }
}
--
Gitblit v1.9.1