From 41f99a843fb2c0424426e006f29c1e78192eae01 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 06 十二月 2023 08:37:55 +0800
Subject: [PATCH] zjh 2023/12/06--1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index a3a5d06..56dfb05 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.hosp.vodomain.LineChartsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -81,6 +82,30 @@
List<TjOrder> getOrderList1();
+// @Select("select aa.date,\n" +
+// " sum(if(c.tj_type='鍥㈤槦', ifnull(c.coun,0),0)) as tdcoun,\n" +
+// " sum(if(c.tj_type='涓汉', ifnull(c.coun,0),0)) as grcoun,\n" +
+// " sum(if(c.tj_type='鎶ュ憡', ifnull(c.coun,0),0)) as bgcoun \n" +
+// " from (\n" +
+// " SELECT date_sub(CURDATE(),interval @i:=@i+1 day) as date\n" +
+// " from (select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
+// " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
+// " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
+// " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
+// " select 1 union all select 1) as a,\n" +
+// " (select @i:= -1) b) aa \n" +
+// " left join (\n" +
+// " select date_format(create_time, '%Y-%m-%d') dat, tj_type, count(*) coun\n" +
+// " from tj_order where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
+// " group by date_format(create_time, '%Y-%m-%d'),tj_type\n" +
+// " union\n" +
+// " select date_format(report_time, '%Y-%m-%d') dat, '鎶ュ憡' tj_type, count(*) coun\n" +
+// " from tj_order where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
+// " group by date_format(report_time, '%Y-%m-%d')\n" +
+// " ) c on c.dat =aa.date\n" +
+// "group by aa.date")
+// List<Map<Object, Object>> getLine();
+
@Select("select aa.date,\n" +
" sum(if(c.tj_type='鍥㈤槦', ifnull(c.coun,0),0)) as tdcoun,\n" +
" sum(if(c.tj_type='涓汉', ifnull(c.coun,0),0)) as grcoun,\n" +
@@ -103,7 +128,7 @@
" group by date_format(report_time, '%Y-%m-%d')\n" +
" ) c on c.dat =aa.date\n" +
"group by aa.date")
- List<Map<Object, Object>> getLine();
+ List<LineChartsVo> getLine();
@Select("SELECT * FROM tj_order WHERE tj_number RLIKE #{tjNum} AND deleted='0' ORDER BY create_time DESC")
@@ -150,4 +175,14 @@
@Select("SELECT * FROM tj_order WHERE deleted='0' and user_id = #{userId} AND !ISNULL(finish_time) " +
"and !ISNULL(confirm_time) ")
List<TjOrder> getCsTjOrderListByCusId1(Long userId);
+
+
+ @Select("SELECT GROUP_CONCAT( DISTINCT b.pro_name SEPARATOR ';' ) aa FROM tj_order_remark a" +
+ " LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.deleted=0 AND a.tj_number= #{tjNum} AND a.type !=2")
+ String getHistoryTjOrderProByTjNum(String tjNum);
+
+
+ @Select("SELECT * FROM tj_order WHERE deleted='0' and user_id =#{userId}" +
+ " AND !ISNULL(finish_time) ORDER BY create_time DESC LIMIT 1")
+ TjOrder getLastTjOrderListByCusId(Long userId);
}
--
Gitblit v1.8.0