From 7c9e1e552d171b96e8ec890ba0df5f7abbde1c7d Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 24 九月 2024 15:49:00 +0800
Subject: [PATCH] 优化代码 条件获取流浪控制器接口结果排序优化

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index e852f5b..f724ab8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -447,6 +447,9 @@
             <if test="intakeNum != null and intakeNum != ''">
                 AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
             </if>
+            <if test="clientName != null and clientName != ''">
+                AND oh.client_name LIKE CONCAT('%', #{clientName}, '%')
+            </if>
             <if test="rtuAddr != null and rtuAddr != ''">
                 AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
             </if>
@@ -510,6 +513,9 @@
             </if>
             <if test="intakeNum != null and intakeNum != ''">
                 AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
+            </if>
+            <if test="clientName != null and clientName != ''">
+                AND oh.client_name LIKE CONCAT('%', #{clientName}, '%')
             </if>
             <if test="rtuAddr != null and rtuAddr != ''">
                 AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
@@ -1063,6 +1069,7 @@
             INNER JOIN pr_intake inta ON inta.id = och.intake_id
         <where>
             AND och.cl_ic_card_no IS NOT NULL AND och.client_id IS NOT NULL
+            AND och.cl_this_money> 0
             <if test = "clientName != null and clientName !=''">
                 AND cli.name like CONCAT('%',#{clientName},'%')
             </if>
@@ -1094,6 +1101,7 @@
             INNER JOIN pr_intake inta ON inta.id = och.intake_id
         <where>
             AND och.cl_ic_card_no IS NOT NULL AND och.client_id IS NOT NULL
+            AND och.cl_this_money> 0
             <if test = "clientName != null and clientName !=''">
                 AND cli.name like CONCAT('%',#{clientName},'%')
             </if>

--
Gitblit v1.8.0