From 9c1d7ce35cc8c7dc81e0b259fb3b52211aa2f1bf Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期三, 09 二月 2022 13:55:11 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
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 f29b9c2..096edbb 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
@@ -1,6 +1,7 @@
package cn.exrick.xboot.your.mapper;
import cn.exrick.xboot.your.entity.AddOil;
+import cn.exrick.xboot.your.entity.Suggest;
import cn.exrick.xboot.your.vo.Month;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -35,12 +36,13 @@
@Select("SELECT count(id) FROM t_order_task where likes=1")
int countLike();
- @Select("select b.car_no as carNo1,c.name as name1,d.name as name2,count(a.area_section_id) as num1,sum(case when a.status=0 then 1 else 0 end) as num2 from t_order_task a LEFT JOIN t_car b on a.car_id=b.id LEFT JOIN t_area c on a.area_id=c.id LEFT JOIN t_area_ection d on a.area_section_id=d.id where DATE_FORMAT(a.send_date,'%Y-%m-%d')=#{date} GROUP BY a.area_section_id,b.car_no,c.name,d.name")
+ @Select("select b.car_no as carNo1,c.name as name1,d.name as name2,count(a.area_section_id) as num1,sum(case when a.status=0 then 1 else 0 end) as num2 ,sum(case when a.status=1 then 1 else 0 end) as num3 from t_order_task a LEFT JOIN t_car b on a.car_id=b.id LEFT JOIN t_area c on a.area_id=c.id LEFT JOIN t_area_ection d on a.area_section_id=d.id where DATE_FORMAT(a.send_date,'%Y-%m-%d')=#{date} GROUP BY a.area_section_id,b.car_no,c.name,d.name")
@Results({@Result(column="carNo1", property="carNo", jdbcType = JdbcType.VARCHAR),
@Result(column="name1", property="areaName", jdbcType = JdbcType.VARCHAR),
@Result(column="name2", property="areaSectionName", jdbcType = JdbcType.VARCHAR),
@Result(column="num1", property="num", jdbcType = JdbcType.INTEGER),
- @Result(column="num2", property="level", jdbcType = JdbcType.INTEGER)})
+ @Result(column="num2", property="level", jdbcType = JdbcType.INTEGER),
+ @Result(column="num3", property="seq", jdbcType = JdbcType.INTEGER)})
List<OrderTask> list3(String date);
@Select("select sum(time) as time2,send_date from t_order_task where date_sub(curdate(), interval 1 month) <= date(send_date) and area_section_id=#{arg0} GROUP BY send_date")
@@ -71,4 +73,14 @@
@Result(column="num2", property="num", jdbcType = JdbcType.INTEGER),
@Result(column="num3", property="level", jdbcType = JdbcType.INTEGER)})
List<OrderTask> groupByTime(String areaId, String selectId);
+
+ @Select("SELECT a.*,b.name as temp,c.name as temp2,b.lng as temp3,b.lat as temp4 FROM t_order_task a LEFT JOIN t_customer b ON a.customer_id=b.id LEFT JOIN t_customer_receive c ON a.customer_receive_id=c.id ${ew.customSqlSegment} ")
+ @Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR),
+ @Result(column="temp2", property="code", jdbcType = JdbcType.VARCHAR),
+ @Result(column="temp3", property="areaName", jdbcType = JdbcType.VARCHAR),
+ @Result(column="temp4", property="areaSectionName", jdbcType = JdbcType.VARCHAR)})
+ List<OrderTask> list4(@Param(Constants.WRAPPER) QueryWrapper<OrderTask> wrapper2);
+
+ @Select("SELECT o.*,c.name as customerName FROM t_order_task o LEFT JOIN t_customer c ON o.customer_id=c.id")
+ IPage<OrderTask> page2(Page initMpPage);
}
\ No newline at end of file
--
Gitblit v1.9.1