From 781dc4e9816753672dfe2c2af75e499f1f9bb576 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 十月 2025 15:19:40 +0800
Subject: [PATCH] 诊所报表
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index cdd01ec..754c6ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -278,6 +278,16 @@
// 查询销售前十占比
List<SupplierSalesStatisticsGoodsTypeVO> supplierSalesStatisticsGoodsTypeVOS = erpProcurementService.supplierSalesStatisticsGoodsType(crmSupplier.getId(), startTime, endTime);
+ // 判断集合是否大于9
+ if(supplierSalesStatisticsGoodsTypeVOS.size() > 9){
+ // 其余的添加到其他
+ List<SupplierSalesStatisticsGoodsTypeVO> otherList = supplierSalesStatisticsGoodsTypeVOS.subList(9, supplierSalesStatisticsGoodsTypeVOS.size());
+ SupplierSalesStatisticsGoodsTypeVO other = new SupplierSalesStatisticsGoodsTypeVO();
+ other.setTypeName("其他");
+ other.setGoodsCount(otherList.stream().mapToInt(SupplierSalesStatisticsGoodsTypeVO::getGoodsCount).sum());
+ supplierSalesStatisticsGoodsTypeVOS.add(other);
+ supplierSalesStatisticsGoodsTypeVOS = supplierSalesStatisticsGoodsTypeVOS.subList(0, 9);
+ }
supplierSalesStatisticsVO.setSupplierSalesStatisticsGoodsTypeVOS(supplierSalesStatisticsGoodsTypeVOS);
// 查询30天销售统计
List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountVOS;
@@ -420,6 +430,16 @@
// 查询销售前十占比
List<ClinicSalesStatisticsGoodsTypeVO> clinicSalesStatisticsGoodsTypeVOS = sysOrderService.supplierSalesStatisticsGoodsType(crmClinic.getId(), startTime, endTime);
+ // 判断集合是否大于9
+ if(clinicSalesStatisticsGoodsTypeVOS.size() > 9){
+ // 其余的添加到其他
+ List<ClinicSalesStatisticsGoodsTypeVO> otherList = clinicSalesStatisticsGoodsTypeVOS.subList(9, clinicSalesStatisticsGoodsTypeVOS.size());
+ ClinicSalesStatisticsGoodsTypeVO other = new ClinicSalesStatisticsGoodsTypeVO();
+ other.setTypeName("其他");
+ other.setGoodsCount(otherList.stream().mapToInt(ClinicSalesStatisticsGoodsTypeVO::getGoodsCount).sum());
+ clinicSalesStatisticsGoodsTypeVOS.add(other);
+ clinicSalesStatisticsGoodsTypeVOS = clinicSalesStatisticsGoodsTypeVOS.subList(0, 9);
+ }
clinicSalesStatisticsVO.setClinicSalesStatisticsGoodsTypeVOS(clinicSalesStatisticsGoodsTypeVOS);
// 查询30天销售统计
List<ClinicSalesStatisticsGoodsCountVO> clinicSalesStatisticsGoodsCountVOS;
@@ -503,6 +523,12 @@
public static void main(String[] args) {
System.out.println(LocalDate.now().minusMonths(6));
+ List<Integer> list = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
+ list.add(i);
+ }
+ System.out.println(list.subList(2,list.size()));
+ System.out.println(list.subList(0,2 ));
}
}
--
Gitblit v1.7.1