From 97da879dc16dffb2fbcc7447dee7db819049fa02 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 15 Oct 2022 11:35:16 +0800
Subject: [PATCH] 农资查询添加模糊查询
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 8d7fca4..b2b206a 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -36,9 +36,16 @@
<if test="task.taskUser!=null and task.taskUser!=''">
and t.task_user=#{task.taskUser}
</if>
+ <if test="task.status!=null and task.status!='' or task.status == 0 " >
+ and t.status=#{task.status}
+ </if>
<if test="task.farmId!=null and task.farmId!=''">
and l.farm_id = #{task.farmId}
</if>
+ <if test="task.User!=null and task.User!=''">
+ and t.create_user=#{task.User}
+ </if>
+ ORDER BY t.create_time DESC
</select>
<!--统计待处理任务数量-->
@@ -174,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
@@ -188,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 now() > st.time
+ AND st.create_time like concat('%',#{task.year},'%')
+ AND now() > DATE_ADD(st.time,INTERVAL 1 DAY)
AND sl.farm_id = #{task.farmId}
+ AND st.is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3