From 6b0887d87b99c7d79ae14ed1000b257cc9053524 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 08 五月 2024 13:55:06 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 8470ae2..720841c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -227,12 +227,12 @@
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
- <if test="divideName != null and divideName != ''">
- AND divi.name LIKE CONCAT('%', #{divideName}, '%')
+ <if test = "divideId != null and divideId !=''">
+ AND divi.id = #{divideId}
</if>
- <if test="blockName != null and blockName != ''">
- AND blo.name LIKE CONCAT('%', #{blockName}, '%')
+ <if test = "blockId != null and blockId !=''">
+ AND blo.id = #{blockId}
</if>
<if test="isBinded == 0">
@@ -252,10 +252,17 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍙栨按鍙ｈ褰�-->
<select id="getIntakes" resultType="com.dy.pipIrrGlobal.voPr.VoIntake">
- SELECT CAST(ge.id AS char) AS id,
+ SELECT
+ CAST(ge.id AS char) AS intakeId,
ge.`name` AS intakeName,
+ CAST(divi.id AS char) AS divideId,
divi.`name` AS divideName,
+ CAST(blo.id AS char) AS blockId,
blo.`name` AS blockName,
+ ge.lng,
+ ge.lat,
+ ge.remarks,
+ ge.operator,
ge.operateDt As operateDt,
(CASE
WHEN ge.id NOT IN(SELECT intakeId FROM pr_controller where deleted = 0) THEN "鏈粦瀹�"
@@ -276,12 +283,12 @@
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
- <if test="divideName != null and divideName != ''">
- AND divi.name LIKE CONCAT('%', #{divideName}, '%')
+ <if test = "divideId != null and divideId !=''">
+ AND divi.id = #{divideId}
</if>
- <if test="blockName != null and blockName != ''">
- AND blo.name LIKE CONCAT('%', #{blockName}, '%')
+ <if test = "blockId != null and blockId !=''">
+ AND blo.id = #{blockId}
</if>
<if test="isBinded == 0">
--
Gitblit v1.8.0