From 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 13 Jul 2022 15:23:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 09704bd..f720add 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -174,12 +174,30 @@
</select>
<select id="countTaskNum" resultType="java.util.HashMap">
- SELECT
- date_format( time , '%Y-%m' ) AS y,
- count( * ) AS count
- FROM
- sys_task
- WHERE 1=1 and YEAR (time)=#{year}
- GROUP BY y;
+ SELECT
+ count( * ) AS count
+ FROM
+ sys_task
+ WHERE
+ 1 = 1
+ AND STATUS = '0'
+ AND create_time like concat('%',#{year},'%') UNION ALL
+ SELECT
+ count( * ) AS count
+ FROM
+ sys_task
+ WHERE
+ 1 = 1
+ AND ( STATUS = '1' OR STATUS = '2' )
+ AND create_time like concat('%',#{year},'%') UNION ALL
+ SELECT
+ count( * ) AS count
+ FROM
+ sys_task
+ WHERE
+ 1 = 1
+ AND ( STATUS = '1' OR STATUS = '2' )
+ AND create_time like concat('%',#{year},'%')
+ AND now( ) > time
</select>
</mapper>
--
Gitblit v1.9.3