From d9da603305a2b94bde78483fa8777a43ee352548 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期二, 18 一月 2022 08:22:49 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java
index 095b26f..d251fff 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java
@@ -44,10 +44,13 @@
int year = cal.get(Calendar.YEAR);
QueryWrapper<Car> wrapper = new QueryWrapper<>();
+ int m = cal.get(Calendar.MONTH) + 1;
+
Month month= iCarService.getCarCount(year);
if (month==null) {
month = new Month();
}
+
List<Integer> list = new ArrayList<>();
list.add(month.getJanuary());
list.add(month.getFebruary());
@@ -61,6 +64,10 @@
list.add(month.getOctober());
list.add(month.getNovember());
list.add(month.getDecember());
+
+ for (int i=m;i<12;i++){
+ list.set(i,0);
+ }
return new ResultUtil<Object>().setData(list);
}
@@ -70,6 +77,8 @@
Calendar cal = Calendar.getInstance();
int year = cal.get(Calendar.YEAR);
QueryWrapper<Car> wrapper = new QueryWrapper<>();
+
+ int m = cal.get(Calendar.MONTH) + 1;
Month month= iCustomerService.getCustomerCount(year);
if (month==null) {
@@ -88,6 +97,10 @@
list.add(month.getOctober());
list.add(month.getNovember());
list.add(month.getDecember());
+
+ for (int i=m;i<12;i++){
+ list.set(i,0);
+ }
return new ResultUtil<Object>().setData(list);
}
@@ -136,18 +149,18 @@
if (month2==null){
month2=new Month();
}
- list.add(month.getJanuary()!=0 ? (month2.getJanuary()/month.getJanuary())/10000 : 0);
- list.add(month.getFebruary()!=0 ? (month2.getFebruary()/month.getFebruary())/10000 : 0);
- list.add(month.getMarch()!=0 ? (month2.getMarch()/month.getMarch())/10000 : 0);
- list.add(month.getApril()!=0 ? (month2.getApril()/month.getApril())/10000 : 0);
- list.add(month.getMay()!=0 ? (month2.getMay()/month.getMay())/10000 : 0);
- list.add(month.getJune()!=0 ? (month2.getJune()/month.getJune())/10000 : 0);
- list.add(month.getJuly()!=0 ? (month2.getJuly()/month.getJuly())/10000 : 0);
- list.add(month.getAugust()!=0 ? (month2.getAugust()/month.getAugust())/10000 : 0);
- list.add(month.getSeptember()!=0 ? (month2.getSeptember()/month.getSeptember())/10000 : 0);
- list.add(month.getOctober()!=0 ? (month2.getOctober()/month.getOctober())/10000 : 0);
- list.add(month.getNovember()!=0 ? (month2.getNovember()/month.getNovember())/10000 : 0);
- list.add(month.getDecember()!=0 ? (month2.getDecember()/month.getDecember())/10000 : 0);
+ list.add(month.getJanuary()!=0 ? (month2.getJanuary()/month.getJanuary()) : 0);
+ list.add(month.getFebruary()!=0 ? (month2.getFebruary()/month.getFebruary()) : 0);
+ list.add(month.getMarch()!=0 ? (month2.getMarch()/month.getMarch()) : 0);
+ list.add(month.getApril()!=0 ? (month2.getApril()/month.getApril()) : 0);
+ list.add(month.getMay()!=0 ? (month2.getMay()/month.getMay()) : 0);
+ list.add(month.getJune()!=0 ? (month2.getJune()/month.getJune()) : 0);
+ list.add(month.getJuly()!=0 ? (month2.getJuly()/month.getJuly()) : 0);
+ list.add(month.getAugust()!=0 ? (month2.getAugust()/month.getAugust()) : 0);
+ list.add(month.getSeptember()!=0 ? (month2.getSeptember()/month.getSeptember()) : 0);
+ list.add(month.getOctober()!=0 ? (month2.getOctober()/month.getOctober()) : 0);
+ list.add(month.getNovember()!=0 ? (month2.getNovember()/month.getNovember()) : 0);
+ list.add(month.getDecember()!=0 ? (month2.getDecember()/month.getDecember()) : 0);
return new ResultUtil<Object>().setData(list);
}
--
Gitblit v1.9.1