From 7abdd3ba7fa34c059f3c867e366d1a2137ae702f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 14 Jul 2022 17:08:24 +0800
Subject: [PATCH] kuc管理

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 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 814ab86..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,30 +174,28 @@
     </select>
 
     <select id="countTaskNum" resultType="java.util.HashMap">
-    SELECT
-        count( * ) AS count
-    FROM
-        sys_task
+    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 STATUS = '0'
-        AND MONTH ( time ) = '7' UNION ALL
-    SELECT
-        count( * ) AS count
-    FROM
-        sys_task
+        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 ( STATUS = '1' OR STATUS = '2' )
-        AND MONTH ( time ) = '7' UNION ALL
-    SELECT
-        count( * ) AS count
-    FROM
-        sys_task
-    WHERE
-        1 = 1
-        AND ( STATUS = '1' OR STATUS = '2' )
-        AND MONTH ( time ) = '7'
-        AND now( ) > time
+        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