From 59380c11771d47459b8db5425bc21293823ada74 Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.com>
Date: 星期日, 13 十二月 2020 10:26:00 +0800
Subject: [PATCH] areaId参数的转换
---
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java
index d495f21..86d24d0 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java
@@ -45,19 +45,35 @@
@RequestMapping(value = "/getCountByAreaId", method = RequestMethod.GET)
@ApiOperation(value = "鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夋満鏋勫拰浜哄憳鏁伴噺浠ュ強璁㈠崟鎬绘暟")
public Result<Object> getCountByAreaId(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 orgFuwuCount = iOrgFuwuService.count(wrapper);
+
QueryWrapper<FuwuPerson> wrapper1 = new QueryWrapper<>();
- wrapper1.eq("area_id",areaId);
+ if (StrUtil.isNotEmpty(areaId)){
+ wrapper1.eq("area_id",areaId);
+ }
int fuwuPersonCount = iFuwuPersonService.count(wrapper1);
+
QueryWrapper<Order> wrapper2 = new QueryWrapper<>();
- wrapper2.eq("area_id",areaId);
+ if (StrUtil.isNotEmpty(areaId)){
+ wrapper2.eq("area_id",areaId);
+ }
int orderCount = iOrderService.count(wrapper2);
+
QueryWrapper<Order> wrapper3 = new QueryWrapper<>();
- wrapper2.eq("area_id",areaId);
- wrapper2.eq("state",0);
+ if (StrUtil.isNotEmpty(areaId)){
+ wrapper3.eq("area_id",areaId);
+ }
+ wrapper3.eq("state",0);
int orderCount2 = iOrderService.count(wrapper3);
+
FwjgCount fwjgCount=new FwjgCount();
fwjgCount.setFwjgCount(orgFuwuCount);
fwjgCount.setFwPersonCount(fuwuPersonCount);
@@ -69,6 +85,10 @@
@RequestMapping(value = "/getFwnlByAreaId", method = RequestMethod.GET)
@ApiOperation(value = "鏍规嵁鍖哄煙id鑾峰彇鍖哄煙涓嬫墍鏈夊疄闄呮湇鍔′互鍙婃湇鍔¤鍗曟暟")
public Result<Object> getFwnlByAreaId(String areaId){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
QueryWrapper<FuwuDetails> wrapper = new QueryWrapper<>();
wrapper.isNull("pid");
List<FuwuDetails> list = iFuwuDetailsService.list(wrapper);
@@ -98,8 +118,14 @@
@RequestMapping(value = "/getFwjgOrderByOrderNumber", method = RequestMethod.GET)
@ApiOperation(value = "鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ鏈嶅姟鏈烘瀯鎺掑悕鎯呭喌")
public Result<Object> getFwjgOrderByOrderNumber(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);
+ }
List<OrgFuwu> list = iOrgFuwuService.list(wrapper);
for (OrgFuwu orgFuwu : list) {
QueryWrapper<FuwuDetails> wrapper1 = new QueryWrapper<>();
@@ -130,7 +156,7 @@
@RequestMapping(value = "/getFuwuDetailsOrderByOrderNumber", method = RequestMethod.GET)
@ApiOperation(value = "鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ瀹為檯鏈嶅姟鎺掑悕鎯呭喌")
public Result<Object> getFuwuDetailsOrderByOrderNumber(String areaId){
- if (StrUtil.isNotBlank(areaId)&&areaId.equals("0")){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
//濡傛灉鏄叏甯� areaId璁剧疆鏈┖
areaId = null;
}
@@ -155,7 +181,7 @@
@RequestMapping(value = "/getOrder", method = RequestMethod.GET)
@ApiOperation(value = "鎵ц涓鍗�")
public Result<Object> getOrder(String areaId){
- if (StrUtil.isNotBlank(areaId)&&areaId.equals("0")){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
//濡傛灉鏄叏甯� areaId璁剧疆鏈┖
areaId = null;
}
--
Gitblit v1.9.1