From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中，关阀报（83）中的RTU时钟改为关阀时间，但代码误注解掉了这行代码，修改之； 2、通信中间件测试web系统增加查询所在在线情况的命令下发。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 f1dcebb..cc13cf9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -156,7 +156,7 @@
Left join pr_intake pint on pint.id = rld.intake_id
<where>
<if test="intakeId != null and intakeId != '' ">
- and rash.intake_id = #{intakeId}
+ and rld.intake_id = #{intakeId}
</if>
<if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
@@ -184,7 +184,7 @@
Left join pr_intake pint on pint.id = rld.intake_id
<where>
<if test="intakeId != null and intakeId != '' ">
- and rash.intake_id = #{intakeId}
+ and rld.intake_id = #{intakeId}
</if>
<if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
@@ -197,9 +197,14 @@
</if>
</where>
ORDER BY rld.dt DESC , rld.loss_amount DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
- </if>
+<!-- <if test="pageCurr != null and pageSize != null">-->
+<!-- LIMIT {(pageCurr-1)*pageSize}, ${pageSize}-->
+<!-- </if>-->
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
<select id="statisticsByIntake" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics">
--
Gitblit v1.8.0