From ee2262faf471f901f33144703ce1e5de6dc5ac90 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 05 八月 2024 18:11:49 +0800
Subject: [PATCH] zjh 2024/08/02-1

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 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 624d55e..b42e88c 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
@@ -109,27 +109,31 @@
 //    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" +
-            "      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")
+            "                  sum(if(c.tj_type='1', ifnull(c.coun,0),0)) as tdcoun,\n" +
+            "                  sum(if(c.tj_type='2', ifnull(c.coun,0),0)) as grcoun,\n" +
+            "                  sum(if(c.tj_type='3', 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 deleted=0 AND tj_type=2 AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
+            "                  group by date_format(create_time, '%Y-%m-%d')\t\n" +
+            "\t\t\t\tunion\n" +
+            "                  select date_format(create_time, '%Y-%m-%d') dat,tj_type, count(*) coun\n" +
+            "                  from tj_order where deleted=0 AND tj_type=1 AND  DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
+            "                  group by date_format(create_time, '%Y-%m-%d')\t\t\t\t\t\n" +
+            "\t\t\t\tunion\n" +
+            "                  select date_format(create_time, '%Y-%m-%d') dat, 3 tj_type, count(*) coun\n" +
+            "                  from tj_order where deleted=0 AND !ISNULL(report_time) AND  DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
+            "                  group by date_format(create_time, '%Y-%m-%d')\n" +
+            "                  ) c on c.dat =aa.date\n" +
+            "            group by aa.date")
     List<LineChartsVo> getLine();
 
 

--
Gitblit v1.8.0