From e9de6064cc94d6bc63685c5e62046ff810b96dab Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Sat, 05 Jul 2025 17:17:52 +0800
Subject: [PATCH] Merge branch 'gzdyh_prod'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml
index 41c8515..a9a6712 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml
@@ -1368,6 +1368,10 @@
level = 3
and parent_id = #{terms.queArea}
</if>
+ <if test="terms.queRoad != null and terms.queRoad !=''">
+ level = 4
+ and parent_id = #{terms.queRoad}
+ </if>
ORDER BY level ASC,create_time ASC
</select>
@@ -1451,6 +1455,9 @@
and t4.handle_result = 3
and t4.node_id in ('ZJ_DFP', 'QJ_DFP', 'SJ_DFP', 'DFP', 'QJ_DSL', 'SJ_DSL', 'DSL', 'ZJ_DSL')
</if>
+ <if test="terms.unitGrade != null and terms.unitGrade !=''">
+ and t1.unit_grade = #{terms.unitGrade}
+ </if>
<include refid="statisticsCirculation-wherePart"/>
</select>
@@ -1497,6 +1504,9 @@
and t4.handle_result = 3
and t4.node_id in ('ZJ_DFP', 'QJ_DFP', 'SJ_DFP', 'DFP', 'QJ_DSL', 'SJ_DSL', 'DSL', 'ZJ_DSL')
</if>
+ <if test="terms.unitGrade != null and terms.unitGrade !=''">
+ and t1.unit_grade = #{terms.unitGrade}
+ </if>
<include refid="statisticsCirculation-wherePart"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
--
Gitblit v1.8.0