From a0c41029992f7dc390c125247e84d0bfac972706 Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.com>
Date: 星期日, 13 十二月 2020 14:23:26 +0800
Subject: [PATCH] 养老机构页面
---
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 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 66699d5..b72ff7d 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
@@ -3,8 +3,10 @@
import cn.cetc54.platform.core.common.utils.ResultUtil;
import cn.cetc54.platform.core.common.vo.Result;
import cn.cetc54.platform.zhyl.service.ISubsidyLogService;
+import cn.hutool.core.util.StrUtil;
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;
@@ -12,7 +14,9 @@
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;
/**
@@ -30,6 +34,10 @@
@GetMapping("/getTotalStatistics")
@ApiOperation(value = "鑾峰彇鎬荤粺璁℃暟鎹�")
public Result getTotalStatistics(String areaId,Integer type){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
int totalPersonNum = iSubsidyLogService.getTotalNum(areaId,type);//鑾峰彇琛ヨ创鐨勬�讳汉鏁�
double totalMoney = iSubsidyLogService.getTotalMoney(areaId,type);//鑾峰彇鎬婚噾棰�
@@ -42,11 +50,48 @@
@GetMapping("/getStatistics")
@ApiOperation(value = "骞村害鏈堝害缁熻鏁版嵁")
public Result getStatistics(String areaId,Integer type){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
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