From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作,种植记录查询新增,地块,溯源码查询修改

---
 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