From 163e802e5e7287842f7b01f40b870e998ff48395 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 24 一月 2024 18:50:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 bc529ac..b277691 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -219,6 +219,7 @@
INNER JOIN ba_district country ON ge.countyId = country.id
INNER JOIN ba_district town ON ge.townId = town.id
INNER JOIN ba_district village ON ge.villageId = village.id
+ INNER JOIN pr_controller con ON con.intakeId = ge.id
, (SELECT @i:=0) AS itable
<where>
ge.deleted = 0
@@ -245,6 +246,10 @@
divi.`name` AS divideName,
blo.`name` AS blockName,
ge.operateDt As operateDt,
+ (CASE
+ WHEN ge.id NOT IN(SELECT intakeId FROM pr_controller where deleted = 0) THEN "鏈粦瀹�"
+ WHEN ge.id IN(SELECT intakeId FROM pr_controller where deleted = 0) THEN "宸茬粦瀹�"
+ END) AS isBind,
CONCAT(country.`name`, town.`name`, village.`name`) AS address
FROM pr_intake ge
INNER JOIN pr_divide divi ON ge.divideId = divi.id
@@ -252,6 +257,7 @@
INNER JOIN ba_district country ON ge.countyId = country.id
INNER JOIN ba_district town ON ge.townId = town.id
INNER JOIN ba_district village ON ge.villageId = village.id
+ INNER JOIN pr_controller con ON con.intakeId = ge.id
, (SELECT @i:=0) AS itable
<where>
ge.deleted = 0
@@ -309,4 +315,13 @@
where region.id = #{regionId,jdbcType=BIGINT}
</select>
+ <!--鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙ｅ垪琛�-->
+ <select id="getNoBindingIntakes" resultType="java.util.HashMap">
+ SELECT
+ CAST(inta.id AS char)AS intakeId,
+ name AS intakeName
+ FROM pr_intake inta
+ WHERE id NOT IN(SELECT intakeId FROM pr_controller) AND deleted = 0
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0