From 6dacac48ebb596797dfd8e5bf3a803ed0b583643 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 17:11:31 +0800
Subject: [PATCH] 取水口综合信息-统计数据逻辑处理模块完善
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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 b7aa29e..fd8a25f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -125,10 +125,28 @@
<!--@mbg.generated-->
select
count(*)
- from ug_rtu_controller
+ from ug_rtu_controller ugCon
+ 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 task_id = #{taskId,jdbcType=BIGINT}
+ AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name = #{intakeNum,jdbcType=VARCHAR}
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+ </if>
+ <if test="state != null and state == 1">
+ AND ugCon.ug_state = 1
+ </if>
+ <if test="state != null and state == 0">
+ AND ugCon.ug_state != 1
+ </if>
+ <if test="fail != null">
+ AND ugCon.ug_state = #{fail,jdbcType=INTEGER}
</if>
</where>
</select>
@@ -136,20 +154,37 @@
<select id="selectControllerUpgradeResults" resultType="com.dy.pipIrrGlobal.voUg.VoUgResult">
<!--@mbg.generated-->
select
- ctb.id as id,
- inTb.name as intakeNum,
- ctb.rtu_addr as rtuAddr,
- ctb.is_over as isOver,
- ctb.ug_state as ugState,
- ctb.over_dt as overDt
- from ug_rtu_controller ctb
- inner join pr_intake inTb on ctb.task_id = inTb.id
+ ugCon.id as id,
+ inta.name as intakeNum,
+ ugCon.rtu_addr as rtuAddr,
+ ugCon.is_over as isOver,
+ ugCon.ug_state as ugState,
+ ugCon.over_dt as overDt
+ from ug_rtu_controller ugCon
+ 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 ctb.task_id = #{taskId,jdbcType=BIGINT}
+ AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name = #{intakeNum,jdbcType=VARCHAR}
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+ </if>
+ <if test="state != null and state == 1">
+ AND ugCon.ug_state = 1
+ </if>
+ <if test="state != null and state == 0">
+ AND ugCon.ug_state != 1
+ </if>
+ <if test="fail != null">
+ AND ugCon.ug_state = #{fail,jdbcType=INTEGER}
</if>
</where>
- ORDER BY ctb.id ASC
+ ORDER BY ugCon.id ASC
<trim prefix="limit " >
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
--
Gitblit v1.8.0