From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 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 b8040be..b2b206a 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -45,6 +45,7 @@
<if test="task.User!=null and task.User!=''">
and t.create_user=#{task.User}
</if>
+ ORDER BY t.create_time DESC
</select>
<!--统计待处理任务数量-->
@@ -180,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
@@ -194,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