From 4d9483cecdeb9e13a7ea4475121351b02058a51b Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 08 Aug 2020 18:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 47 +++++++++++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 6 ++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 14 ++++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java | 19 +++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java | 9 ++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysHospitalMapper.java | 3 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 17 +++++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java | 10 ++-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java | 20 ++++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 24 ++++++++
10 files changed, 155 insertions(+), 14 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java
index 3abf32a..6b38cef 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java
@@ -68,7 +68,7 @@
/**
* 按指定类型统计合同数量
* @param params
- * datatype 1 按年
+ * datatype 1 按年
* 2 按月
* 3 按天
* 4 按周
@@ -77,4 +77,11 @@
* @return
*/
OrderChartVo productOrderChart(@Param("p") Map<String, Object> params);
+
+ /**
+ * 统计产品的使用数量
+ * @return ccount 是数量
+ * units 是产品名称
+ */
+ OrderChartVo proCountChart();
}
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 9d04b18..7489bcb 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
@@ -106,5 +106,11 @@
* @return
*/
OrderChartVo productOrderChart(@Param("p") Map<String, Object> params);
+ /**
+ * 统计产品的使用数量
+ * @return ccount 是数量
+ * units 是产品名称
+ */
+ OrderChartVo proCountChart();
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index 4eaa4e5..c3d4ead 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -146,6 +146,30 @@
public int oprationChart(int datatype) {
return baseMapper.oprationChart(datatype);
}
+ /**
+ * 按指定类型统计合同数量
+ * @param params
+ * datatype 1 按年
+ * 2 按月
+ * 3 按天
+ * 4 按周
+ * beginTime 查询时间段的开始时间
+ * endTime 结束时间
+ * @return
+ */
+ @Override
+ public OrderChartVo productOrderChart(Map<String, Object> params) {
+ return baseMapper.productOrderChart(params);
+ }
+ /**
+ * 统计产品的使用数量
+ * @return ccount 是数量
+ * units 是产品名称
+ */
+ @Override
+ public OrderChartVo proCountChart() {
+ return baseMapper.proCountChart();
+ }
/**
* 获取诊断列表
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index 0c4759b..e6fa3d0 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -232,4 +232,21 @@
</if>
</where>
</sql>
+ <select id="proCountChart" resultType="com.kidgrow.oprationcenter.vo.OrderChartVo">
+ SELECT
+ count( pro_id ) ccount,
+ pro_name units
+FROM
+ product_order_record
+WHERE
+ is_del = 0
+ AND enabled = 1
+ AND pro_id IN ( SELECT id FROM sys_product WHERE is_del = 0 AND enabled = 1 )
+GROUP BY
+ pro_id,
+ pro_name
+ORDER BY
+ procount DESC
+ LIMIT 10
+ </select>
</mapper>
\ No newline at end of file
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 908e93b..f7269a4 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
@@ -12,6 +12,7 @@
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderRecordService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
+import com.kidgrow.oprationcenter.vo.OrderChartVo;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
import com.kidgrow.oprationcenter.vo.UserProductData;
import com.kidgrow.usercenter.feign.SysUserService;
@@ -361,4 +362,50 @@
public ResultBody getTypeByUser(@LoginUser SysUser sysUser) {
return productOrderDetailService.getTypeByUser(sysUser);
}
+
+ /**
+ * 统计获取数据量
+ * @param datatype
+ * 0 试用审核量
+ * 1 套餐总量
+ * 2 未处理用户反馈
+ * 3 未处理数据需求
+ * @return
+ */
+ @ApiOperation(value = "统计获取数据量")
+ @GetMapping("/oprationChart")
+ public ResultBody oprationChart(int datatype) {
+ int counts=productOrderDetailService.oprationChart(datatype);
+ return ResultBody.ok().data(counts).msg("数据获取成功!") ;
+ }
+
+ /**
+ * 按指定类型统计合同数量
+ * @param params
+ * datatype 1 按年
+ * 2 按月
+ * 3 按天
+ * 4 按周
+ * beginTime 查询时间段的开始时间
+ * endTime 结束时间
+ * @return
+ */
+ @ApiOperation(value = "按指定类型统计合同数量")
+ @GetMapping("/productOrderChart")
+ public ResultBody productOrderChart(@RequestParam Map<String, Object> params) {
+ OrderChartVo orderChartVo=productOrderDetailService.productOrderChart(params);
+ return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
+ }
+
+ /**
+ * 统计产品的使用数量
+ * @return ccount 是数量
+ * units 是产品名称
+ */
+ @ApiOperation(value = "统计产品的使用数量")
+ @GetMapping("/proCountChart")
+ public ResultBody proCountChart() {
+ OrderChartVo orderChartVo=productOrderDetailService.proCountChart();
+ return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
+ }
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysHospitalMapper.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysHospitalMapper.java
index 03e48d1..53f6669 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysHospitalMapper.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysHospitalMapper.java
@@ -50,6 +50,9 @@
/**
* 统计医院数量
* @param datatype 医院类型
+ * 0 试用医院
+ * 1 正式医院
+ * 11 筛查医院
* @return
*/
int chartHospital(@Param("datatype") Integer datatype);
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java
index 43f20b9..5a917ab 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java
@@ -67,8 +67,12 @@
ResultBody updateLogo(@RequestBody Map<String, Object> params);
/**
- * 统计用户的基本数据
+ * 统计医院数量
+ * @param datatype 医院类型
+ * 0 试用医院
+ * 1 正式医院
+ * 11 筛查医院
* @return
- */
- ResultBody chartsUserDatas();
+ */
+ ResultBody chartHospital(Integer datatype);
}
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
index d40fa17..218a014 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
@@ -221,14 +221,18 @@
}
}
+
+ /**
+ * 统计医院数量
+ * @param datatype 医院类型
+ * 0 试用医院
+ * 1 正式医院
+ * 11 筛查医院
+ * @return
+ */
@Override
- public ResultBody chartsUserDatas() {
- //正式医院数据
- int hospitalCount=baseMapper.chartHospital(1);
- //试用医院数据
- int tempHospitalCount=baseMapper.chartHospital(0);
- //筛查医院
- int screenHospitalCount=baseMapper.chartHospital(11);
- return null;
+ public ResultBody chartHospital(Integer datatype) {
+ int hospitalCount=baseMapper.chartHospital(datatype);
+ return ResultBody.ok().data(hospitalCount).msg("获取数据成功");
}
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
index 8095b82..b0c46e4 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
@@ -143,10 +143,25 @@
/**
* 设为管理
*/
- @ApiOperation(value = "修改状态")
+ @ApiOperation(value = "设为管理员")
@PostMapping("setadmin")
public ResultBody setAdmin(@RequestBody Map<String, Object> params) {
return sysDoctorService.setAdminDoctor(params);
}
-
+ /**
+ * 统计医生的数量
+ * @param datatype 业务类型
+ * 0 自注册医生
+ * 1 签约医生
+ * 2 医答医生
+ * 3 C端医生
+ * 4 H端医生
+ * @return
+ */
+ @ApiOperation(value = "统计医生的数量")
+ @GetMapping("chartDoctor")
+ public ResultBody chartDoctor(int datatype) {
+ int counts= sysDoctorService.chartDoctor(datatype);
+ return ResultBody.ok().data(counts).msg("数据获取成功");
+ }
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index d0a6f42..3dc5e92 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -227,4 +227,18 @@
}
return sysHospitalService.updateEnabled(params);
}
+
+ /**
+ * 统计医院数量
+ * @param datatype 医院类型
+ * 0 试用医院
+ * 1 正式医院
+ * 11 筛查医院
+ * @return
+ */
+ @ApiOperation(value = "统计医院数量")
+ @GetMapping("/chartHospital")
+ public ResultBody chartHospital(Integer datatype) {
+ return sysHospitalService.chartHospital(datatype);
+ }
}
--
Gitblit v1.8.0