From b6673e839cde1597511e56b154e2fe02ee54ed63 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 26 Sep 2024 12:01:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
index 0c992fd..e756dae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
@@ -5,16 +5,22 @@
<select id="listDykeUnitDanger" resultType="cn.gistack.sm.sjztmd.vo.TbDykeUnitDangerVO">
select tdi.*,ifnull(tdud."danger_level",0) dangerLevel,tdud."id" from (
select
- "dyke_guid" dykeGuid,"unit",count(*) dangerNum,wm_concat(distinct "signs_of_termite_activity") hdjxs,
+ "dyke_guid" dykeGuid,"unit",count(*) dangerNum,wm_concat(distinct "signs_of_termite_activity") hdjxs,max("tb_year") as "tb_year",max("tb_quarter") as "tb_quarter",
sum("danger_length") as dangerLength
from sjzt_md."tb_dyke_investigation"
where "hazard_rating" = '有危害'
<if test="params.dykeGuid != null and params.dykeGuid != ''">
and "dyke_guid" = #{params.dykeGuid}
</if>
+ <if test="params.tbYear != null and params.tbYear != ''">
+ and "tb_year" = #{params.tbYear}
+ </if>
+ <if test="params.tbQuarter != null and params.tbQuarter != ''">
+ and "tb_quarter" = #{params.tbQuarter}
+ </if>
group by "dyke_guid","unit"
) tdi
- left join sjzt_md."tb_dyke_unit_danger" tdud on (tdi.dykeGuid = tdud."dyke_id" and tdi."unit" = tdud."unit")
+ left join sjzt_md."tb_dyke_unit_danger" tdud on (tdi.dykeGuid = tdud."dyke_id" and tdi."unit" = tdud."unit" and tdi."tb_year" = tdud."tb_year" and tdi."tb_quarter" = tdud."tb_quarter")
</select>
</mapper>
--
Gitblit v1.9.3