From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index f043d33..981a16a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -14,7 +14,7 @@
<select id="selectAttResBaseGeneralInvestigation"
resultType="cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO">
-SELECT base.* from (
+ SELECT base.* from (
select
a.*,
b."check_state" AS tb_state,
@@ -58,6 +58,12 @@
left join ywxt."att_ad_base" city on county."p_ad_code" = city."ad_code"
left join ywxt."att_ad_base" province on city."p_ad_code" = province."ad_code"
left join "SJZT_MD"."tb_res_general_investigation_state" b on a."code" = b."res_guid"
+ <if test="attResBase.tbYear !=null and attResBase.tbYear !=''">
+ AND b."tb_year" = #{attResBase.tbYear}
+ </if>
+ <if test="attResBase.tbQuarter !=null and attResBase.tbQuarter !=''">
+ AND b."tb_quarter" = #{attResBase.tbQuarter}
+ </if>
left join
@@ -76,14 +82,14 @@
<if test="attResBase.tbYear !=null and attResBase.tbYear !=''">
AND TRGI."tb_year" = #{attResBase.tbYear}
</if>
+ <if test="attResBase.tbQuarter !=null and attResBase.tbQuarter !=''">
+ AND TRGI."tb_quarter" = #{attResBase.tbQuarter}
+ </if>
group by TRGI."tb_state_id",TRGI."res_guid"
) tmp on tmp."tb_state_id" = b."guid"
where 1 = 1
- <if test="attResBase.tbQuarter !=null and attResBase.tbQuarter !=''">
- AND b."tb_quarter" = #{attResBase.tbQuarter}
- </if>
<if test="attResBase.name !=null and attResBase.name !=''">
AND a."name" LIKE CONCAT('%',#{attResBase.name},'%')
</if>
@@ -165,7 +171,11 @@
left join "att_ad_base" county on town."p_ad_code" = county."ad_code"
left join "att_ad_base" city on county."p_ad_code" = city."ad_code"
left join "att_ad_base" province on city."p_ad_code" = province."ad_code"
- left join "att_res_rsb_norspi" arrn on arb."guid" = arrn."res_guid"
+ left join (
+ SELECT *,
+ ROW_NUMBER() OVER(PARTITION BY "res_guid" ORDER BY "res_guid") AS rn
+ from "att_res_rsb_norspi" arrn
+ ) arrn on arb."guid" = arrn."res_guid" AND arrn.rn = 1
WHERE arb."is_deleted"=0
<if test="obj.code != null and obj.code != '' ">
and (town."ad_code" = #{obj.code} or county."ad_code" = #{obj.code} or city."ad_code" = #{obj.code} or province."ad_code"
@@ -383,6 +393,22 @@
from sjzt_dw."dim_res_info_a"
</select>
+ <select id="getAttWmstBaseCount" resultType="java.lang.Integer">
+ select count(*) from sjzt_md."att_wmst_base"
+ </select>
+
+ <select id="getAttImagestBaseCount" resultType="java.lang.Integer">
+ select count(*) from sjzt_md."att_imagest_base"
+ </select>
+
+ <select id="getAttCdBaseCount" resultType="java.lang.Integer">
+ select count(*) from sjzt_md."att_cd_base"
+ </select>
+
+ <select id="getAttWyCdBaseCount" resultType="java.lang.Integer">
+ select count(*) from sjzt_md."att_wy_cd_base"
+ </select>
+
<update id="updateIsShowStatus">
UPDATE SJZT_MD."att_res_base" SET "is_show" = #{isShow}
--
Gitblit v1.9.3