From 77dd7d19bb13f19acd273ba92dfd2b866a229c5e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 16 Jul 2022 16:20:07 +0800
Subject: [PATCH] 库存

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |   30 +++++++++++++++++++++++-------
 1 files changed, 23 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..59977ec 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,28 @@
     </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 st
+    left join sys_land sl on sl.id = st.land_id
+    WHERE 1 = 1
+        AND st.STATUS = '0'
+        AND st.create_time like concat('%',#{task.year},'%')
+        AND sl.farm_id = #{task.farmId}
+    UNION ALL
+    SELECT count( * ) AS count FROM sys_task st
+    left join sys_land sl on sl.id = st.land_id
+    WHERE
+        1 = 1
+        AND ( st.STATUS = '1' OR st.STATUS = '2' )
+        AND  st.create_time like concat('%',#{task.year},'%')
+        AND sl.farm_id = #{task.farmId}
+    UNION ALL
+    SELECT count( * ) AS count FROM sys_task st
+    left join sys_land sl on sl.id = st.land_id
+    WHERE
+        1 = 1
+        AND ( st.STATUS = '1' OR st.STATUS = '2' )
+        AND  st.create_time like concat('%',#{task.year},'%')
+        AND now() > st.time
+        AND sl.farm_id = #{task.farmId}
     </select>
 </mapper>

--
Gitblit v1.9.3