From eb5a6e5a54efa997971beffc909bcadc06dc8886 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 21 四月 2025 10:45:16 +0800 Subject: [PATCH] 1、江海测试系统设备类型默认为阀; 2、完善通信中间件测试消息推送代码; 3、增加队列数据结构注释; 4、121服务器相关的初始化配置文件bug修改; 5、其他注释完善。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 11 +++++++---- 1 files changed, 7 insertions(+), 4 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 f70b447..db01039 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml @@ -181,6 +181,9 @@ <if test="intakeName != null and intakeName != ''"> and pint.name like CONCAT('%', #{intakeName,jdbcType=VARCHAR}, '%') </if> + <if test="lossAmountGreaterOrEqual != null "> + and rldl.loss_amount >= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE} + </if> <if test="startDt != null"> and rldl.dt >= #{startDt,jdbcType=DATE} </if> @@ -208,6 +211,9 @@ <if test="intakeName != null and intakeName != ''"> and pint.name like CONCAT('%', #{intakeName,jdbcType=VARCHAR}, '%') </if> + <if test="lossAmountGreaterOrEqual != null "> + and rldl.loss_amount >= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE} + </if> <if test="startDt != null"> and rldl.dt >= #{startDt,jdbcType=DATE} </if> @@ -215,10 +221,7 @@ and rldl.dt <= #{endDt,jdbcType=DATE} </if> </where> - ORDER BY rldl.dt DESC, rldl.loss_amount DESC - <!-- <if test="pageCurr != null and pageSize != null">--> - <!-- LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}--> - <!-- </if>--> + ORDER BY rldl.dt_last 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