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/FwjgController.java | 37 +++++++++----------------------------
1 files changed, 9 insertions(+), 28 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 86d24d0..4797f6f 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
@@ -1,8 +1,6 @@
package cn.cetc54.platform.zhyl.api;
-import cn.cetc54.platform.core.common.utils.PageUtil;
import cn.cetc54.platform.core.common.utils.ResultUtil;
-import cn.cetc54.platform.core.common.vo.PageVo;
import cn.cetc54.platform.core.common.vo.Result;
import cn.cetc54.platform.zhyl.entity.*;
import cn.cetc54.platform.zhyl.entity.vo.FwjgCount;
@@ -11,7 +9,6 @@
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;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -128,29 +125,11 @@
}
List<OrgFuwu> list = iOrgFuwuService.list(wrapper);
for (OrgFuwu orgFuwu : list) {
- QueryWrapper<FuwuDetails> wrapper1 = new QueryWrapper<>();
- wrapper1.isNull("pid");
- wrapper1.eq("org_fw_id",orgFuwu.getId());
- List<FuwuDetails> list1 = iFuwuDetailsService.list(wrapper1);
- int orgFuwuCount=0;
- for (FuwuDetails fuwuDetails : list1) {
- QueryWrapper<FuwuDetails> wrapper2 = new QueryWrapper<>();
- wrapper2.eq("pid",fuwuDetails.getId());
- List<FuwuDetails> list2 = iFuwuDetailsService.list(wrapper2);
- int fuwuDetailsCount=0;
- for (FuwuDetails details : list2) {
- QueryWrapper<Order> wrapper3 = new QueryWrapper<>();
- wrapper3.eq("area_id",areaId);
- wrapper3.eq("detail_id",details.getId());
- int count = iOrderService.count(wrapper3);
- fuwuDetailsCount+=count;
- }
- orgFuwuCount+=fuwuDetailsCount;
- }
- orgFuwu.setOrderNumber(orgFuwuCount);
+ orgFuwu.setOrderNumber(iOrderService.getOrderNum(orgFuwu.getId()));
}
- List<OrgFuwu> collectList = list.stream().sorted(Comparator.comparing(OrgFuwu::getOrderNumber)).collect(Collectors.toList());
- return new ResultUtil<Object>().setData(collectList.subList(0,10));
+ List<OrgFuwu> collectList = list.stream().sorted(Comparator.comparing(OrgFuwu::getOrderNumber).reversed()).collect(Collectors.toList());
+ List<OrgFuwu> resList = collectList.size()>10?collectList.subList(0,10):collectList;
+ return new ResultUtil<Object>().setData(resList);
}
@RequestMapping(value = "/getFuwuDetailsOrderByOrderNumber", method = RequestMethod.GET)
@@ -173,7 +152,7 @@
int count = iOrderService.count(wrapper3);
fuwuDetails.setOrderNumber(count);
}
- List<FuwuDetails> collectList = list.stream().sorted(Comparator.comparing(FuwuDetails::getOrderNumber)).collect(Collectors.toList());
+ List<FuwuDetails> collectList = list.stream().sorted(Comparator.comparing(FuwuDetails::getOrderNumber).reversed()).collect(Collectors.toList());
List<FuwuDetails> resList = collectList.size()>10?collectList.subList(0,10):collectList;
return ResultUtil.data(resList);
}
@@ -190,8 +169,10 @@
wrapper.eq("area_id",areaId);
}
-// wrapper.eq("state",0);
- wrapper.orderByAsc("create_time");
+ wrapper.eq("state",0);
+
+ wrapper.orderByDesc("create_time");
+ wrapper.last(" limit 10");
List<Order> list = iOrderService.list(wrapper);
int count = iOrderService.count(wrapper);
List<OrderByExecute> orderByExecuteList=new ArrayList<>();
--
Gitblit v1.9.1