From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml
index a7a2928..2eadc3b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml
@@ -11,10 +11,10 @@
SELECT
COUNT(*) totalNum,
- SUM(CASE WHEN (tdis."check_state" = 1 or tdis."check_state" = 2) THEN 1 ELSE 0 END) as finishNum
+ SUM(CASE WHEN (tdis."check_state" = 3) THEN 1 ELSE 0 END) as finishNum
from
SJZT_MD."tb_res_dyke" trd
- LEFT JOIN SJZT_MD."tb_dyke_investigation_state" tdis ON tdis."dyke_guid" = trd."guid" AND (tdis."check_state" = 1 or tdis."check_state" = 2)
+ LEFT JOIN SJZT_MD."tb_dyke_investigation_state" tdis ON tdis."dyke_guid" = trd."guid" AND (tdis."check_state" = 3)
<if test="params.tbYear != null and params.tbYear !=''">
AND tdis."tb_year" = #{params.tbYear}
</if>
@@ -250,7 +250,7 @@
SELECT
TEMP1."tb_state_id",
TEMP1."unit",
- TEMP1.dangerLength/temp1.num as dangerLength
+ TEMP1.dangerLength as dangerLength
FROM (
SELECT
tdi."tb_state_id",
@@ -263,11 +263,11 @@
<if test="params.tbYear!=null and params.tbYear!=''">
AND tdi."tb_year" = #{params.tbYear}
</if>
- and tdi."investigation_variety" = '白蚁'
+-- and tdi."investigation_variety" = '白蚁'
group by tdi."tb_state_id",tdi."dyke_guid",tdi."unit"
)TEMP1
) tdi on tdi."tb_state_id" = tdis."guid"
- where (tdis."check_state" = 1 or tdis."check_state" = 2)
+ where (tdis."check_state" = 3)
) trd
LEFT JOIN YWXT."att_ad_base" county ON county."ad_code" = trd."ad_code"
LEFT JOIN YWXT."att_ad_base" city ON city."ad_code" = county."p_ad_code"
@@ -288,4 +288,20 @@
</if>
</if>
</select>
+
+ <select id="getIamgeAndVideoUrl" resultType="cn.gistack.sm.sjztmd.vo.ImageAndVideoVO">
+ select "dyke_name" as dykeName, "image_urls" as imagesUrl ,"video_urls" as videosUrl from sjzt_md."tb_dyke_investigation"
+ </select>
+ <select id="getIamgeAndVideoUrlcopy" resultType="cn.gistack.sm.sjztmd.vo.DyketionVO">
+ select dyke."tb_year" tbYear,dyke."dyke_guid" code, dyke."dyke_name" dname,dyke."image_urls" imagesUrl,dyke."video_urls" videoUrls,LPAD(CAST(ROW_NUMBER() OVER (PARTITION BY dyke."dyke_guid"
+ ORDER BY
+ dyke."create_time" DESC)AS VARCHAR(3)),3,'0') AS rn,
+ ad."ad_name" adname,
+ ad."p_ad_name" padname
+ from sjzt_md."tb_dyke_investigation" dyke
+ left join sjzt_md."tb_dyke_investigation_state" dykes on dyke."dyke_guid" = dykes."dyke_guid"
+ left join sjzt_md."tb_res_dyke" tf on dyke."dyke_guid" = tf."guid"
+ left join YWXT."att_ad_base" ad on tf."ad_code" =ad."guid"
+ where dykes."check_state" = '3' ;
+ </select>
</mapper>
--
Gitblit v1.9.3