From 841c8fec5cda842161bd8e8d28bf6deb83ae806c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:31:16 +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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 c4b2f4f..968d7d7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -50,13 +50,16 @@
ge.`operator`,
ge.operateDt,
blo.`name` AS blockName,
- CONCAT(country.`name`, town.`name`, village.`name`) AS address
+ CONCAT(country.`name`, town.`name`, village.`name`) AS address,
+ con.rtuAddr,
+ con.protocol
FROM pr_intake ge
INNER JOIN pr_divide divi ON ge.divideId = divi.id
INNER JOIN ba_block blo ON divi.blockId = blo.id
LEFT JOIN ba_district country ON ge.countyId = country.id
LEFT JOIN ba_district town ON ge.townId = town.id
LEFT JOIN ba_district village ON ge.villageId = village.id
+ INNER JOIN pr_controller con ON con.intakeId = ge.id
where ge.id = #{id,jdbcType=BIGINT}
AND ge.deleted = 0
AND divi.deleted = 0
@@ -378,7 +381,7 @@
AND bindNumTb.num = #{bindNumber}
</if>
</where>
- ORDER BY ge.operateDt DESC
+ ORDER BY ge.divideId DESC, ge.id DESC
<trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
@@ -774,8 +777,8 @@
FROM pr_intake tb
<where>
tb.deleted = 0
- <if test="intakeName != null and intakeName != ''">
- AND tb.name LIKE CONCAT('%', #{intakeName})
+ <if test="intakeNum != null and intakeNum != ''">
+ AND tb.name LIKE CONCAT('%', #{intakeNum})
</if>
</where>
</select>
@@ -790,8 +793,8 @@
INNER JOIN pr_controller con ON con.intakeId = inta.id
<where>
inta.deleted = 0
- <if test="intakeName != null and intakeName != ''">
- AND inta.name LIKE CONCAT('%', #{intakeName})
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name LIKE CONCAT('%', #{intakeNum})
</if>
</where>
ORDER BY inta.id DESC
--
Gitblit v1.8.0