From 3818974122e7b80e0fe04fd5709a853bac831caa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 20:18:01 +0800
Subject: [PATCH] 代码提交

---
 xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java
index 943a12c..1070011 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java
@@ -117,6 +117,9 @@
         if (!StringUtils.hasLength(homeDto.getTime())){
             homeDto.setTime("1");
         }
+        if (homeDto.getTimeType()==null){
+            homeDto.setTimeType(5);
+        }
 
         List<Order> data6 = remoteOrderService.getOrderList(homeDto.getStatus(), homeDto.getTimeType(), homeDto.getTime()).getData();
         homeVO.setOrderCount(data6.size()+"");
@@ -367,10 +370,6 @@
     @ApiOperation(value = "首页统计-导出",tags = "管理后台-首页统计")
     public void homeStatisticsExport() {
         HomeVO homeVO = new HomeVO();
-//        homeVO.setOrderMoney();
-//        homeVO.setOrderCount();
-//        homeVO.setOrderList();
-//        homeVO.setOrderTimeList();
         // 查询用户总数、非会员数、月卡会员数、季卡会员数、年卡会员数
         String data = remoteAppUserService.getUserCount().getData();
         if (data!=null){
@@ -412,6 +411,17 @@
 
         HomeExport homeExport = new HomeExport();
         BeanUtils.copyProperties(homeVO, homeExport);
+        if (data1!=null){
+            String[] split = data1.split(",");
+            homeVO.setCourseCount(split[0]);
+            homeVO.setCourseFree(split[1]);
+            homeVO.setCourseVip(split[2]);
+            homeVO.setCoursePay(split[3]);
+            homeVO.setCourseOffOnline(split[4]);
+            Integer i = Integer.valueOf(homeExport.getCourseCount());
+            Integer i1 = Integer.valueOf(split[4]);
+            homeExport.setCourseCount((i-i1)+"");
+        }
         List<HomeExport> homeExports = new ArrayList<>();
         homeExports.add(homeExport);
         Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), HomeExport.class, homeExports);

--
Gitblit v1.7.1