From c4b55548c5726e7b02ba8aca00bd3d926dfab777 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 25 Sep 2024 15:46:58 +0800
Subject: [PATCH] 白蚁提防水库普查列表、详情接口增加季节筛选
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 b3b2aa1..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>
--
Gitblit v1.9.3