From 8881c4be7a0d86de2341b489f3ad9e997cb6deb5 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期四, 06 一月 2022 16:01:30 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java | 93 +++++++++++++---------
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java | 26 +++---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java | 24 +++---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/Month.java | 24 +++---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java | 24 +++---
5 files changed, 104 insertions(+), 87 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..095b26f 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
@@ -45,6 +45,9 @@
QueryWrapper<Car> wrapper = new QueryWrapper<>();
Month month= iCarService.getCarCount(year);
+ if (month==null) {
+ month = new Month();
+ }
List<Integer> list = new ArrayList<>();
list.add(month.getJanuary());
list.add(month.getFebruary());
@@ -69,6 +72,9 @@
QueryWrapper<Car> wrapper = new QueryWrapper<>();
Month month= iCustomerService.getCustomerCount(year);
+ if (month==null) {
+ month = new Month();
+ }
List<Integer> list = new ArrayList<>();
list.add(month.getJanuary());
list.add(month.getFebruary());
@@ -94,18 +100,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 +130,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())/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);
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 +162,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);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java
index 3cf96f0..5fdb0bf 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java
@@ -43,18 +43,18 @@
List<Car> getCarInfo2(@Param(Constants.WRAPPER) QueryWrapper<Car> wrapper);
@Select("select \n" +
- "sum(case when month(create_time) < 2 && year(create_time) <= #{year} then 1 else 0 end) as january,\n" +
- "sum(case when month(create_time) < 3 && year(create_time) <= #{year} then 1 else 0 end) as february,\n" +
- "sum(case when month(create_time) < 4 && year(create_time) <= #{year} then 1 else 0 end) as march,\n" +
- "sum(case when month(create_time) < 5 && year(create_time) <= #{year} then 1 else 0 end) as april,\n" +
- "sum(case when month(create_time) < 6 && year(create_time) <= #{year} then 1 else 0 end) as may,\n" +
- "sum(case when month(create_time) < 7 && year(create_time) <= #{year} then 1 else 0 end) as june,\n" +
- "sum(case when month(create_time) < 8 && year(create_time) <= #{year} then 1 else 0 end) as july,\n" +
- "sum(case when month(create_time) < 9 && year(create_time) <= #{year} then 1 else 0 end) as august,\n" +
- "sum(case when month(create_time) < 10 && year(create_time) <= #{year} then 1 else 0 end) as september,\n" +
- "sum(case when month(create_time) < 11 && year(create_time) <= #{year} then 1 else 0 end) as october,\n" +
- "sum(case when month(create_time) < 12 && year(create_time) <= #{year} then 1 else 0 end) as november,\n" +
- "sum(case when month(create_time) < 13 && year(create_time) <= #{year} then 1 else 0 end) as december\n" +
+ "sum(case when create_time <= '${year}-01' then 1 else 0 end) as january,\n" +
+ "sum(case when create_time <= '${year}-02' then 1 else 0 end) as february,\n" +
+ "sum(case when create_time <= '${year}-03' then 1 else 0 end) as march,\n" +
+ "sum(case when create_time <= '${year}-04' then 1 else 0 end) as april,\n" +
+ "sum(case when create_time <= '${year}-05' then 1 else 0 end) as may,\n" +
+ "sum(case when create_time <= '${year}-06' then 1 else 0 end) as june,\n" +
+ "sum(case when create_time <= '${year}-07' then 1 else 0 end) as july,\n" +
+ "sum(case when create_time <= '${year}-08' then 1 else 0 end) as august,\n" +
+ "sum(case when create_time <= '${year}-09' then 1 else 0 end) as september,\n" +
+ "sum(case when create_time <= '${year}-10' then 1 else 0 end) as october,\n" +
+ "sum(case when create_time <= '${year}-11' then 1 else 0 end) as november,\n" +
+ "sum(case when create_time <= '${year}-12' then 1 else 0 end) as december\n" +
"from t_car")
Month getCarCount(@Param("year")Integer year);
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
index ab89e39..24a4d60 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
@@ -16,18 +16,18 @@
int count();
@Select("select \n" +
- "sum(case when month(create_time) < 2 && year(create_time) <= #{year} then 1 else 0 end) as january,\n" +
- "sum(case when month(create_time) < 3 && year(create_time) <= #{year} then 1 else 0 end) as february,\n" +
- "sum(case when month(create_time) < 4 && year(create_time) <= #{year} then 1 else 0 end) as march,\n" +
- "sum(case when month(create_time) < 5 && year(create_time) <= #{year} then 1 else 0 end) as april,\n" +
- "sum(case when month(create_time) < 6 && year(create_time) <= #{year} then 1 else 0 end) as may,\n" +
- "sum(case when month(create_time) < 7 && year(create_time) <= #{year} then 1 else 0 end) as june,\n" +
- "sum(case when month(create_time) < 8 && year(create_time) <= #{year} then 1 else 0 end) as july,\n" +
- "sum(case when month(create_time) < 9 && year(create_time) <= #{year} then 1 else 0 end) as august,\n" +
- "sum(case when month(create_time) < 10 && year(create_time) <= #{year} then 1 else 0 end) as september,\n" +
- "sum(case when month(create_time) < 11 && year(create_time) <= #{year} then 1 else 0 end) as october,\n" +
- "sum(case when month(create_time) < 12 && year(create_time) <= #{year} then 1 else 0 end) as november,\n" +
- "sum(case when month(create_time) < 13 && year(create_time) <= #{year} then 1 else 0 end) as december\n" +
+ "sum(case when create_time < '${year}-01' then 1 else 0 end) as january,\n" +
+ "sum(case when create_time < '${year}-02' then 1 else 0 end) as february,\n" +
+ "sum(case when create_time < '${year}-03' then 1 else 0 end) as march,\n" +
+ "sum(case when create_time < '${year}-04' then 1 else 0 end) as april,\n" +
+ "sum(case when create_time < '${year}-05' then 1 else 0 end) as may,\n" +
+ "sum(case when create_time < '${year}-06' then 1 else 0 end) as june,\n" +
+ "sum(case when create_time < '${year}-07' then 1 else 0 end) as july,\n" +
+ "sum(case when create_time < '${year}-08' then 1 else 0 end) as august,\n" +
+ "sum(case when create_time < '${year}-09' then 1 else 0 end) as september,\n" +
+ "sum(case when create_time < '${year}-10' then 1 else 0 end) as october,\n" +
+ "sum(case when create_time < '${year}-11' then 1 else 0 end) as november,\n" +
+ "sum(case when create_time < '${year}-12' then 1 else 0 end) as december\n" +
"from t_customer")
Month getCustomerCount(@Param("year")Integer year);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
index f233c88..e009160 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
@@ -48,19 +48,19 @@
List<OrderTask> sumTime(String id);
@Select("select \n" +
- "sum(case month(t.send_date) when '1' then d.num else 0 end) as january,\n" +
- "sum(case month(t.send_date) when '2' then d.num else 0 end) as february,\n" +
- "sum(case month(t.send_date) when '3' then d.num else 0 end) as march,\n" +
- "sum(case month(t.send_date) when '4' then d.num else 0 end) as april,\n" +
- "sum(case month(t.send_date) when '5' then d.num else 0 end) as may,\n" +
- "sum(case month(t.send_date) when '6' then d.num else 0 end) as june,\n" +
- "sum(case month(t.send_date) when '7' then d.num else 0 end) as july,\n" +
- "sum(case month(t.send_date) when '8' then d.num else 0 end) as august,\n" +
- "sum(case month(t.send_date) when '9' then d.num else 0 end) as september,\n" +
- "sum(case month(t.send_date) when '10' then d.num else 0 end) as october,\n" +
- "sum(case month(t.send_date) when '11' then d.num else 0 end) as november,\n" +
- "sum(case month(t.send_date) when '12' then d.num else 0 end) as december\n" +
- "from t_order_task t LEFT JOIN t_order_detail d ON t.id=d.order_id\n" +
+ "sum(case month(t.send_date) when '1' then t.num else 0 end) as january,\n" +
+ "sum(case month(t.send_date) when '2' then t.num else 0 end) as february,\n" +
+ "sum(case month(t.send_date) when '3' then t.num else 0 end) as march,\n" +
+ "sum(case month(t.send_date) when '4' then t.num else 0 end) as april,\n" +
+ "sum(case month(t.send_date) when '5' then t.num else 0 end) as may,\n" +
+ "sum(case month(t.send_date) when '6' then t.num else 0 end) as june,\n" +
+ "sum(case month(t.send_date) when '7' then t.num else 0 end) as july,\n" +
+ "sum(case month(t.send_date) when '8' then t.num else 0 end) as august,\n" +
+ "sum(case month(t.send_date) when '9' then t.num else 0 end) as september,\n" +
+ "sum(case month(t.send_date) when '10' then t.num else 0 end) as october,\n" +
+ "sum(case month(t.send_date) when '11' then t.num else 0 end) as november,\n" +
+ "sum(case month(t.send_date) when '12' then t.num else 0 end) as december\n" +
+ "from t_order_task t\n" +
"where year(t.send_date)=#{year}")
Month getSendNum(@Param("year")int year);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/Month.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/Month.java
index 5e216d5..0cd18c5 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/Month.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/Month.java
@@ -6,28 +6,28 @@
public class Month {
//涓�鏈�
- private Integer january;
+ private int january;
//浜屾湀
- private Integer february;
+ private int february;
//涓夋湀
- private Integer march;
+ private int march;
//鍥涙湀
- private Integer april;
+ private int april;
//浜旀湀
- private Integer may;
+ private int may;
//鍏湀
- private Integer june;
+ private int june;
//涓冩湀
- private Integer july;
+ private int july;
//鍏湀
- private Integer august;
+ private int august;
//涔濇湀
- private Integer september;
+ private int september;
//鍗佹湀
- private Integer october;
+ private int october;
//鍗佷竴鏈�
- private Integer november;
+ private int november;
//鍗佷簩鏈�
- private Integer december;
+ private int december;
}
--
Gitblit v1.9.1