From 1d829b91fcfa295ecc3e32dd7c105fe372789065 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Sep 2022 17:44:01 +0800
Subject: [PATCH] 农事记录content添加品种名称，大屏查询未删除数据，农产品投入
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 98244f2..60a03c4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -181,13 +181,16 @@
</select>
<select id="countTaskNum" resultType="java.util.HashMap">
+ <!--已完成 -->
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}
+ AND st.is_deleted = 0
UNION ALL
+ <!--未完成 -->
SELECT count( * ) AS count FROM sys_task st
left join sys_land sl on sl.id = st.land_id
WHERE
@@ -195,14 +198,28 @@
AND ( st.STATUS = '1' OR st.STATUS = '2' )
AND st.create_time like concat('%',#{task.year},'%')
AND sl.farm_id = #{task.farmId}
+ AND st.is_deleted = 0
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 = '0'
+ AND st.create_time like concat('%',#{task.year},'%')
+ AND st.update_time > DATE_ADD(st.time,INTERVAL 1 DAY)
+ AND sl.farm_id = #{task.farmId}
+ AND st.is_deleted = 0
+ 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 st.create_time like concat('%',#{task.year},'%')
AND now() > st.time
AND sl.farm_id = #{task.farmId}
+ AND st.is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3