From ce18a03a32cc849d5a7036d84f3da29da973e179 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 17:43:46 +0800
Subject: [PATCH] 白蚁普查水库列表增加行政区划过滤
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 4b4baa4..05592c9 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
@@ -12,7 +12,7 @@
</select>
<select id="selectAttResBaseGeneralInvestigation" resultType="cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO">
- select * from (
+ select a.* from (
select *,
case
when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and b."check_state" = 2) > 0 THEN '2'
@@ -23,19 +23,28 @@
from sjzt_md."att_res_base" a
- ) a WHERE "is_deleted"=0
+ ) a
+ left join "SJZT_MD"."att_ad_base" aab on aab."guid" = a."interior_ad_guid"
+ left join "SJZT_MD"."att_ad_base" aa on aab."p_ad_code" = aa."ad_code"
+ left join "SJZT_MD"."att_ad_base" ab on aa."p_ad_code" = ab."ad_code"
+ left join "SJZT_MD"."att_ad_base" ac on ab."p_ad_code" = ac."ad_code"
+
+ WHERE a."is_deleted"=0
<if test="attResBase.name !=null and attResBase.name !=''">
- AND "name" LIKE CONCAT('%',#{attResBase.name},'%')
+ AND a."name" LIKE CONCAT('%',#{attResBase.name},'%')
</if>
<if test="attResBase.code !=null and attResBase.code !=''">
- AND "code" LIKE CONCAT('%',#{attResBase.code},'%')
+ AND a."code" LIKE CONCAT('%',#{attResBase.code},'%')
</if>
<if test="attResBase.resRegCode !=null and attResBase.resRegCode !=''">
- AND "res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%')
+ AND a."res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%')
</if>
<if test="attResBase.tbState !=null and attResBase.tbState !=''">
- AND tb_state = #{attResBase.tbState}
+ AND a.tb_state = #{attResBase.tbState}
+ </if>
+ <if test="attResBase.adCode != null and attResBase.adCode != '' ">
+ and (aab."ad_code" = #{attResBase.adCode} or aa."ad_code" = #{attResBase.adCode} or ab."ad_code" = #{attResBase.adCode} or ac."ad_code" = #{attResBase.adCode})
</if>
</select>
--
Gitblit v1.9.3