From eb856c050d5c20c69ba490046f597b1f993a06da Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Tue, 25 Aug 2020 15:53:58 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 f7269a4..fc51ad2 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
@@ -92,6 +92,22 @@
}
return productOrderDetailService.all(params);
}
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping("alldetail")
+ public PageResult alldetail(@RequestParam Map<String, Object> params) {
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
+ }
+ return productOrderDetailService.departmentProductDetail(params);
+ }
/**
* 列表
@@ -393,7 +409,7 @@
@ApiOperation(value = "按指定类型统计合同数量")
@GetMapping("/productOrderChart")
public ResultBody productOrderChart(@RequestParam Map<String, Object> params) {
- OrderChartVo orderChartVo=productOrderDetailService.productOrderChart(params);
+ List<OrderChartVo> orderChartVo=productOrderDetailService.productOrderChart(params);
return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
}
@@ -405,7 +421,7 @@
@ApiOperation(value = "统计产品的使用数量")
@GetMapping("/proCountChart")
public ResultBody proCountChart() {
- OrderChartVo orderChartVo=productOrderDetailService.proCountChart();
+ List<OrderChartVo> orderChartVo=productOrderDetailService.proCountChart();
return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
}
}
--
Gitblit v1.8.0