From 23f4636aeeee1d5fc76fe15804fec3cc0d67c482 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Wed, 9 Apr 2025 17:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=A1=88=E4=BB=B6=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=80=BC#573?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyt/controller/SzCaseController.java      | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java b/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
index cac9cdb..8bde33b 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
@@ -218,36 +218,46 @@ public class SzCaseController extends AbstractCommonFileController{
     public R<List<SzCaseStatisticsVo>> statisticsNum(@Schema(name = "年份") @PathVariable("year") Integer year) {
         LambdaQueryChainWrapper<SzCase> query = service.lambdaQuery();
 
-            query.ge(SzCase::getCreateTime, DateUtil.beginOfYearToDate(year));
+            query.ge(SzCase::getCaseDate, DateUtil.beginOfYearToDate(year));
 
-            query.le(SzCase::getCreateTime, DateUtil.endOfYearToDate(year));
+            query.le(SzCase::getCaseDate, DateUtil.endOfYearToDate(year));
 
         List<SzCaseStatisticsVo> vos = Lists.newArrayList();
 
         List<SzCase> list = query.list();
 
         Calendar calendar = Calendar.getInstance();
-        int currYear = calendar.get(Calendar.YEAR);
-        int month = calendar.get(Calendar.MONTH) + 1;
-        if(year.intValue() != currYear){
-            calendar.set(Calendar.YEAR,year);
-            month = 12;
-        }
-        final int finalMonth = month;
-        for (int i = 1; i <= finalMonth; i++) {
-            int finalI = i;
-            long count = 0;
-            if(CollectionUtils.isNotEmpty(list)){
-                count = list.stream()
-                        .filter(item ->
-                        {
-                            calendar.setTime(item.getCaseDate());
-                            return finalMonth == finalI;
-                        })
-                        .count();
-            }
-            vos.add(new SzCaseStatisticsVo(i,null,Integer.valueOf(String.valueOf(count))));
+        for (int i = 0; i < 12; i++) {
+            int month = i;
+            long cnt = list.stream().filter(item -> {
+                calendar.setTime(item.getCaseDate());
+                return month == calendar.get(Calendar.MONTH);
+            }).count();
+            vos.add(new SzCaseStatisticsVo(month + 1,null,Integer.valueOf(String.valueOf(cnt))));
         }
+//
+//        Calendar calendar = Calendar.getInstance();
+//        int currYear = calendar.get(Calendar.YEAR);
+//        int month = calendar.get(Calendar.MONTH) + 1;
+//        if(year.intValue() != currYear){
+//            calendar.set(Calendar.YEAR,year);
+//            month = 12;
+//        }
+//        final int finalMonth = month;
+//        for (int i = 1; i <= finalMonth; i++) {
+//            int finalI = i;
+//            long count = 0;
+//            if(CollectionUtils.isNotEmpty(list)){
+//                count = list.stream()
+//                        .filter(item ->
+//                        {
+//                            calendar.setTime(item.getCaseDate());
+//                            return finalMonth == finalI;
+//                        })
+//                        .count();
+//            }
+//            vos.add(new SzCaseStatisticsVo(i,null,Integer.valueOf(String.valueOf(count))));
+//        }
 
         return R.ok(vos);
     }