From b143bd5b7970a27c310de83bf0cf28dee6298307 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 19 二月 2025 11:13: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/UgRtuControllerMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
index 9c12100..fd8a25f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -126,7 +126,9 @@
select
count(*)
from ug_rtu_controller ugCon
- inner join pr_intake inta ON inta.id = ugCon.task_id
+ inner join ug_rtu_task ugTask on ugCon.task_id = ugTask.id
+ inner join pr_controller con on ugCon.controller_id = con.id
+ inner join pr_intake inta on con.intakeId = inta.id
<where>
<if test="taskId != null">
AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
@@ -159,7 +161,9 @@
ugCon.ug_state as ugState,
ugCon.over_dt as overDt
from ug_rtu_controller ugCon
- inner join pr_intake inta on ugCon.task_id = inta.id
+ inner join ug_rtu_task ugTask on ugCon.task_id = ugTask.id
+ inner join pr_controller con on ugCon.controller_id = con.id
+ inner join pr_intake inta on con.intakeId = inta.id
<where>
<if test="taskId != null">
AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
--
Gitblit v1.8.0