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/FwjgController.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 efd88cb..d495f21 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
@@ -9,6 +9,7 @@
import cn.cetc54.platform.zhyl.entity.vo.FwnlAndOrderCount;
import cn.cetc54.platform.zhyl.entity.vo.OrderByExecute;
import cn.cetc54.platform.zhyl.service.*;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@@ -31,8 +32,6 @@
@Transactional
@CrossOrigin("*")
public class FwjgController {
- @Autowired
- private IAreaService iAreaService;
@Autowired
private IOrgFuwuService iOrgFuwuService;
@Autowired
@@ -73,6 +72,7 @@
QueryWrapper<FuwuDetails> wrapper = new QueryWrapper<>();
wrapper.isNull("pid");
List<FuwuDetails> list = iFuwuDetailsService.list(wrapper);
+
List<FwnlAndOrderCount> fwnlAndOrderCountList=new ArrayList<>();
for (FuwuDetails fuwuDetails : list) {
QueryWrapper<FuwuDetails> wrapper1 = new QueryWrapper<>();
@@ -80,7 +80,9 @@
List<FuwuDetails> list1 = iFuwuDetailsService.list(wrapper1);
for (FuwuDetails details : list1) {
QueryWrapper<Order> wrapper2 = new QueryWrapper<>();
- wrapper2.eq("area_id",areaId);
+ if (StrUtil.isNotBlank(areaId)){
+ wrapper2.eq("area_id",areaId);
+ }
wrapper2.eq("detail_id",details.getId());
int count = iOrderService.count(wrapper2);
details.setOrderNumber(count);
@@ -128,28 +130,42 @@
@RequestMapping(value = "/getFuwuDetailsOrderByOrderNumber", method = RequestMethod.GET)
@ApiOperation(value = "鏍规嵁鍖哄煙id鍜岃鍗曢噺鏌ヨ瀹為檯鏈嶅姟鎺掑悕鎯呭喌")
public Result<Object> getFuwuDetailsOrderByOrderNumber(String areaId){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("0")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
QueryWrapper<FuwuDetails> wrapper = new QueryWrapper<>();
wrapper.isNotNull("pid");
wrapper.eq("del_flag",0);
List<FuwuDetails> list = iFuwuDetailsService.list(wrapper);
for (FuwuDetails fuwuDetails : list) {
QueryWrapper<Order> wrapper3 = new QueryWrapper<>();
- wrapper3.eq("area_id",areaId);
+ if (StrUtil.isNotBlank(areaId)){
+ wrapper3.eq("area_id",areaId);
+ }
wrapper3.eq("detail_id",fuwuDetails.getId());
int count = iOrderService.count(wrapper3);
fuwuDetails.setOrderNumber(count);
}
List<FuwuDetails> collectList = list.stream().sorted(Comparator.comparing(FuwuDetails::getOrderNumber)).collect(Collectors.toList());
- return new ResultUtil<Object>().setData(collectList.subList(0,10));
+ List<FuwuDetails> resList = collectList.size()>10?collectList.subList(0,10):collectList;
+ return ResultUtil.data(resList);
}
@RequestMapping(value = "/getOrder", method = RequestMethod.GET)
@ApiOperation(value = "鎵ц涓鍗�")
public Result<Object> getOrder(String areaId){
+ if (StrUtil.isNotBlank(areaId)&&areaId.equals("0")){
+ //濡傛灉鏄叏甯� areaId璁剧疆鏈┖
+ areaId = null;
+ }
QueryWrapper<Order> wrapper = new QueryWrapper<>();
- wrapper.eq("area_id",areaId);
- wrapper.eq("state",0);
- wrapper.orderByAsc("creat_time");
+ if (StrUtil.isNotBlank(areaId)){
+ wrapper.eq("area_id",areaId);
+ }
+
+// wrapper.eq("state",0);
+ wrapper.orderByAsc("create_time");
List<Order> list = iOrderService.list(wrapper);
int count = iOrderService.count(wrapper);
List<OrderByExecute> orderByExecuteList=new ArrayList<>();
@@ -167,8 +183,4 @@
map.put("orderByExecuteList",orderByExecuteList);
return new ResultUtil<Object>().setData(map);
}
-
-
-
-
}
--
Gitblit v1.9.1