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 | 106 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 38 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 56b3be0..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,7 +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());
@@ -58,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);
}
@@ -68,7 +78,12 @@
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) {
+ month = new Month();
+ }
List<Integer> list = new ArrayList<>();
list.add(month.getJanuary());
list.add(month.getFebruary());
@@ -82,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);
}
@@ -94,18 +113,21 @@
Month month= iOrderTaskService.getSendNum(year);
List<Integer> list = new ArrayList<>();
- list.add(month.getJanuary());
- list.add(month.getFebruary());
- list.add(month.getMarch());
- list.add(month.getApril());
- list.add(month.getMay());
- list.add(month.getJune());
- list.add(month.getJuly());
- list.add(month.getAugust());
- list.add(month.getSeptember());
- list.add(month.getOctober());
- list.add(month.getNovember());
- list.add(month.getDecember());
+ if (month==null) {
+ month = new Month();
+ }
+ list.add(month.getJanuary()/10000);
+ list.add(month.getFebruary()/10000);
+ list.add(month.getMarch()/10000);
+ list.add(month.getApril()/10000);
+ list.add(month.getMay()/10000);
+ list.add(month.getJune()/10000);
+ list.add(month.getJuly()/10000);
+ list.add(month.getAugust()/10000);
+ list.add(month.getSeptember()/10000);
+ list.add(month.getOctober()/10000);
+ list.add(month.getNovember()/10000);
+ list.add(month.getDecember()/10000);
return new ResultUtil<Object>().setData(list);
}
@@ -121,24 +143,30 @@
List<Integer> list = new ArrayList<>();
- 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);
+ if (month==null) {
+ month = new Month();
+ }
+ if (month2==null){
+ month2=new Month();
+ }
+ 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);
}
@RequestMapping(value = "/getEventNum", method = RequestMethod.GET)
- @ApiOperation(value = "鑾峰彇鍟嗘埛骞冲潎閫佽揣鏁伴噺")
+ @ApiOperation(value = "瀹夊叏绠＄悊鐣岄潰鎺ュ彛")
public Result<Object> getEventNum(Integer type) {
Calendar cal = Calendar.getInstance();
int year = cal.get(Calendar.YEAR);
@@ -147,20 +175,22 @@
Month month= iEventLogService.getEventNum(year,type);
List<Integer> list = new ArrayList<>();
- if (month!=null){
- list.add(month.getJanuary());
- list.add(month.getFebruary());
- list.add(month.getMarch());
- list.add(month.getApril());
- list.add(month.getMay());
- list.add(month.getJune());
- list.add(month.getJuly());
- list.add(month.getAugust());
- list.add(month.getSeptember());
- list.add(month.getOctober());
- list.add(month.getNovember());
- list.add(month.getDecember());
+ if (month==null) {
+ month = new Month();
}
+ list.add(month.getJanuary());
+ list.add(month.getFebruary());
+ list.add(month.getMarch());
+ list.add(month.getApril());
+ list.add(month.getMay());
+ list.add(month.getJune());
+ list.add(month.getJuly());
+ list.add(month.getAugust());
+ list.add(month.getSeptember());
+ list.add(month.getOctober());
+ list.add(month.getNovember());
+ list.add(month.getDecember());
+
return new ResultUtil<Object>().setData(list);
}
--
Gitblit v1.9.1