From 7242faec9cf2574a845e7ce28923f03121c15ff0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十一月 2024 08:59:17 +0800
Subject: [PATCH] 1、Rtu模拟器编码实现不启动web服务； 2、修改ym:ugTaskSendUrl配置为测试下发远程升级任务； 3、优化代码。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
index 0c1693a..915a04f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
@@ -173,11 +173,11 @@
from rm_intake_amount_day_last riadl
Left join pr_intake pint on pint.id = riadl.intake_id
<where>
- <if test="intakeName != null">
- and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
+ <if test="intakeId != null and intakeId != '' ">
+ and rash.intake_id = #{intakeId}
</if>
- <if test="intakeId != null">
- and riadl.intake_id = #{intakeId}
+ <if test="intakeName != null and intakeName != '' ">
+ and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="startDt != null">
and riadl.dt >= #{startDt,jdbcType=DATE}
@@ -202,11 +202,11 @@
from rm_intake_amount_day_last riadl
Left join pr_intake pint on pint.id = riadl.intake_id
<where>
- <if test="intakeName != null">
- and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
+ <if test="intakeId != null and intakeId != '' ">
+ and rash.intake_id = #{intakeId}
</if>
- <if test="intakeId != null">
- and riadl.intake_id = #{intakeId}
+ <if test="intakeName != null and intakeName != '' ">
+ and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="startDt != null">
and riadl.dt >= #{startDt,jdbcType=DATE}
--
Gitblit v1.8.0