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-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java index a340b86..3c69c13 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java @@ -6,7 +6,6 @@ import com.kidgrow.common.service.ISuperService; import com.kidgrow.oprationcenter.model.ProductOrderDetail; import com.kidgrow.oprationcenter.vo.*; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -105,12 +104,18 @@ * endTime 结束时间 * @return */ - List<OrderChartVo> productOrderChart(@Param("p") Map<String, Object> params); + List<OrderChartVo> productOrderChart(Map<String, Object> params); /** * 统计产品的使用数量 * @return ccount 是数量 * units 是产品名称 */ List<OrderChartVo> proCountChart(); + /** + *获取该科室下的所有的套餐信息 + * @param params + * @return + */ + PageResult<ProductOrderDetail> departmentProductDetail(Map<String, Object> params); } -- Gitblit v1.8.0