From 4745238280ae22f373802470844c66cbcdbf4458 Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.com>
Date: 星期二, 22 十二月 2020 15:17:51 +0800
Subject: [PATCH] 新接口修改
---
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java
index fc13381..0ce5df5 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java
@@ -15,6 +15,7 @@
import io.swagger.annotations.ApiOperation;
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;
@@ -30,7 +31,8 @@
@Slf4j
@RestController
@Api(description = "棣栭〉鎺ュ彛")
-@RequestMapping("/api/index")
+@RequestMapping("/api2/index")
+@CrossOrigin("*")
public class IndexController {
@Autowired
private IOrgYanglaoService iOrgYanglaoService;
@@ -43,6 +45,10 @@
@GetMapping("/getSubsidyStatics")
@ApiOperation(value = "琛ヨ创缁熻")
public Result getSubsidyStatics(String areaId){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
double total = iSubsidyLogService.getTotalMoney(areaId,null);
List<Map<String,Object>> list = iSubsidyLogService.getTypeMoney(areaId);
list.forEach(e->{
@@ -57,8 +63,15 @@
@GetMapping("/getOrgFWStatics")
@ApiOperation(value = "鏈嶅姟鏈烘瀯缁熻")
public Result getOrgFWStatics(String areaId){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>();
- wrapper.eq("area_id",areaId);
+ if (StrUtil.isNotEmpty(areaId)){
+ wrapper.eq("area_id",areaId);
+ }
+
int total = iOrgFuwuService.list(wrapper).size();
List list = iOrderService.getTypeStatics(areaId);
@@ -70,6 +83,10 @@
@GetMapping("/getYlOrgYLStatics")
@ApiOperation(value = "鍏昏�佹満鏋勭粺璁�")
public Result getYlOrgStatics(String areaId){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
QueryWrapper<OrgYanglao> wrapper = new QueryWrapper<>();
if (StrUtil.isNotBlank(areaId)){
wrapper.eq("area_id",areaId);
@@ -116,6 +133,10 @@
@GetMapping("/getFuwuPersonStatics")
@ApiOperation(value = "鏈嶅姟瀵硅薄缁熻")
public Result getFuwuPersonStatics(String areaId){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
int total = iSubsidyLogService.getTotalNum(areaId,null);
List<Map<String,Object>> list = iSubsidyLogService.getTypeNum(areaId);
list.forEach(e->{
--
Gitblit v1.9.1