From 4dd54a206d8c08823d640dfbc26dcd3e56b3898b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 03 八月 2024 11:35:53 +0800
Subject: [PATCH] 1、完善代码； 2、增加查询系统CPU、内存、JVM、系统、磁盘等信息的工具类。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
index cf6a6ca..f3dfb90 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -168,6 +168,9 @@
       <if test="intakeName != null">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="intakeId != null">
+        and rldl.intake_id = #{intakeId}
+      </if>
       <if test="startDt != null">
         and rldl.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
@@ -193,6 +196,9 @@
       <if test="intakeName != null">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="intakeId != null">
+        and rldl.intake_id = #{intakeId}
+      </if>
       <if test="startDt != null">
         and rldl.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
@@ -200,7 +206,7 @@
         and rldl.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
-    ORDER BY rldl.id DESC
+    ORDER BY rld.dt DESC , rld.loss_amount DESC
     <if test="pageCurr != null and pageSize != null">
       LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
     </if>

--
Gitblit v1.8.0