From 81af4cff627b7ec1e125b90f4fd57392c6d70588 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期三, 10 四月 2024 11:28:03 +0800
Subject: [PATCH] 修改签收出错bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
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 935ceaf..1db91a0 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
@@ -1,6 +1,5 @@
package cn.exrick.xboot.your.mapper;
-import cn.exrick.xboot.your.entity.Area;
-import cn.exrick.xboot.your.vo.CarVo;
+import cn.exrick.xboot.your.vo.Month;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -27,7 +26,7 @@
IPage<Car> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<Car> wrapper);
@Select("SELECT c.*,u.nickname,a.`name` AS area_name FROM t_car c LEFT JOIN t_user AS u ON c.user_id=u.id LEFT JOIN t_area AS a ON a.user_id=u.id")
- List<Car> getAll2();
+ IPage<Car> getAll2(Page initMpPage);
@Select("SELECT\n" +
"\tc.*,(SUM(amount)) AS allAmount,SUM(money) AS allMoney,(MAX(mileage)) AS allMileage\n" +
@@ -43,4 +42,29 @@
"LEFT JOIN t_add_oil a ON c.id = a.car_id ${ew.customSqlSegment}")
List<Car> getCarInfo2(@Param(Constants.WRAPPER) QueryWrapper<Car> wrapper);
-}
\ No newline at end of file
+ @Select("select \n" +
+ "sum(case when create_time < '${year}-02' then 1 else 0 end) as january,\n" +
+ "sum(case when create_time < '${year}-03' then 1 else 0 end) as february,\n" +
+ "sum(case when create_time < '${year}-04' then 1 else 0 end) as march,\n" +
+ "sum(case when create_time < '${year}-05' then 1 else 0 end) as april,\n" +
+ "sum(case when create_time < '${year}-06' then 1 else 0 end) as may,\n" +
+ "sum(case when create_time < '${year}-07' then 1 else 0 end) as june,\n" +
+ "sum(case when create_time < '${year}-08' then 1 else 0 end) as july,\n" +
+ "sum(case when create_time < '${year}-09' then 1 else 0 end) as august,\n" +
+ "sum(case when create_time < '${year}-10' then 1 else 0 end) as september,\n" +
+ "sum(case when create_time < '${year}-11' then 1 else 0 end) as october,\n" +
+ "sum(case when create_time < '${year}-12' then 1 else 0 end) as november,\n" +
+ "sum(case when create_time < '${year}-13' then 1 else 0 end) as december\n" +
+ "from t_car")
+ Month getCarCount(@Param("year")Integer year);
+
+ @Select("SELECT\n" +
+ "\t( MAX( amount ) - MIN( amount ) ) AS amount,\n" +
+ "\tSUM( money ) AS money,\n" +
+ "\t( MAX( mileage ) - MIN( mileage ) ) AS mileage, \n" +
+ "\tSUM(amount) AS allAmount,SUM(money) AS allMoney,(MAX(mileage)) AS allMileage \n"+
+ "FROM\n" +
+ "\t t_add_oil a\n" +
+ "\t WHERE a.car_id = #{carId}")
+ Car getCarInfoByCarId(@Param("carId")String carId);
+}
--
Gitblit v1.9.1