From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 fc4fdfd..393e48d 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -36,8 +36,8 @@
<if test="task.taskUser!=null and task.taskUser!=''">
and t.task_user=#{task.taskUser}
</if>
- <if test="task.User!=null and task.User!=''">
- and t.create_user=#{task.User}
+ <if test="task.farmId!=null and task.farmId!=''">
+ and l.farm_id = #{task.farmId}
</if>
</select>
@@ -172,4 +172,30 @@
sys_task
WHERE 1=1 and YEAR (create_time)=#{time};
</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}
+ 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