From dbb4ac17ff70578662af99c6b1772b5c0641d005 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 18:48:23 +0800
Subject: [PATCH] 1、基于Timer实现定时执行的任务，并在满足条件下结束定时任务，为此实现抽象类TimerTaskJob类，并在UpgradeManager类中应用； 2、TreadJob类由TimerTaskJob替换，弃用TreadJob类。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index cc13cf9..c295ea9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -161,6 +161,9 @@
<if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="lossAmountGreaterOrEqual != null ">
+ and rld.loss_amount >= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+ </if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -189,6 +192,9 @@
<if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="lossAmountGreaterOrEqual != null ">
+ and rld.loss_amount >= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+ </if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -196,10 +202,7 @@
and rld.dt <= #{endDt,jdbcType=DATE}
</if>
</where>
- ORDER BY rld.dt DESC , rld.loss_amount DESC
-<!-- <if test="pageCurr != null and pageSize != null">-->
-<!-- LIMIT {(pageCurr-1)*pageSize}, ${pageSize}-->
-<!-- </if>-->
+ ORDER BY rld.id DESC
<trim prefix="limit " >
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
--
Gitblit v1.8.0