From fc96e4d7fc20dbec5d2d96c6e8c557c1cc3212d3 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 08 四月 2024 18:53:10 +0800
Subject: [PATCH] 修改密码错误登录bug

---
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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 32c9a5a..eff8933 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,8 @@
 package cn.exrick.xboot.your.mapper;
 
 import cn.exrick.xboot.your.entity.AddOil;
+import cn.exrick.xboot.your.entity.OrderStatusCount;
+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;
@@ -17,13 +19,15 @@
  * 璁㈠崟琛ㄦ暟鎹鐞嗗眰
  * @author whj
  */
+//@Repository
 public interface OrderTaskMapper extends BaseMapper<OrderTask> {
 
     @Select("SELECT sum(num) FROM t_order_task where area_id=#{arg0} and DATE_FORMAT(send_date,'%Y-%m-%d')=#{arg1}")
     Integer sum(String areaId, String format);
 
-    @Select("SELECT a.*,b.name as temp FROM t_order_task a LEFT JOIN t_customer b ON a.customer_id=b.id ${ew.customSqlSegment} ")
-    @Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR)})
+    @Select("SELECT a.*,b.name as temp,b.linker as temp2 FROM t_order_task a LEFT JOIN t_customer b ON a.customer_id=b.id ${ew.customSqlSegment} ")
+    @Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR),
+            @Result(column="temp2", property="code", jdbcType = JdbcType.VARCHAR)})
     List<OrderTask> list2(@Param(Constants.WRAPPER) QueryWrapper<OrderTask> wrapper2);
 
     @Select("SELECT sum(num) FROM t_order_task")
@@ -35,7 +39,7 @@
     @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 ,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")
+    @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 order by c.name asc")
     @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),
@@ -79,4 +83,12 @@
             @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);
+
+    @Select("SELECT o.*,c.name as customerName FROM t_order_task o LEFT JOIN t_customer c ON o.customer_id=c.id ${ew.customSqlSegment}")
+    IPage<OrderTask> page3(Page initMpPage,@Param(Constants.WRAPPER) QueryWrapper<OrderTask> wrapper);
+
+    List<OrderStatusCount> countStatus( OrderStatusCount orderStatusCount);
 }
\ No newline at end of file

--
Gitblit v1.9.1