From 6398ac4a3b9cf7d9f36756307aa1448e1e215e0c Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Wed, 25 Nov 2020 09:12:42 +0800 Subject: [PATCH] 添加taocan 的功能,继续完善 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java index f02a54b..cff6d71 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java @@ -30,9 +30,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -440,4 +438,26 @@ List<OrderChartVo> orderChartVo=productOrderDetailService.proCountChart(); return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ; } + + /** + * 获取软件服务周期 和 读片总量 + * + */ + @ApiOperation(value = "获取软件服务周期") + @GetMapping("/getContractBeginEndTimeAndNum") + public ResultBody getContractBeginEndTimeAndNum(@RequestParam("departmentId") Long departmentId) { + Map<String,Object> map = new HashMap<>(); + map.put("department_id",departmentId); + map.put("enabled",true); + map.put("is_del",false); + List<ProductOrder> productOrders = productOrderService.listByMap(map); + IntSummaryStatistics intSummaryStatistics = productOrders.stream().mapToInt((x) -> x.getContractNum()).summaryStatistics(); + Date minDate = productOrders.stream().map(e -> e.getContractBeginTime()).min((e1, e2) -> e1.compareTo(e2)).get(); + Date manDate = productOrders.stream().map(e -> e.getContractEndTime()).max((e1, e2) -> e1.compareTo(e2)).get(); + map = new HashMap<>(); + map.put("count",intSummaryStatistics.getSum()); + map.put("beginTime",minDate); + map.put("endTime",manDate); + return ResultBody.ok().data(map); + } } -- Gitblit v1.8.0