From ee0f57d1de5174c9290373ec38b3032ce8f4bc74 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 11 Mar 2024 17:44:59 +0800
Subject: [PATCH] 水库白蚁普查pc端状态调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 60 ++++++++++++++++++++++++++----------------------------------
1 files changed, 26 insertions(+), 34 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 e020a71..24de5f4 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
@@ -13,44 +13,36 @@
<select id="selectAttResBaseGeneralInvestigation"
resultType="cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO">
- 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'
- when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and
- b."check_state" = 1) > 0 THEN '1'
- when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and
- b."check_state" = 0) > 0 THEN '0'
- ELSE '-1'
- END AS tb_state
-
-
- from sjzt_md."att_res_base" a
- ) a
+ select a.*,b."check_state" AS tb_state,b."tb_year",b."tb_quarter" from sjzt_md."att_res_base" 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 a."name" LIKE CONCAT('%',#{attResBase.name},'%')
- </if>
- <if test="attResBase.code !=null and attResBase.code !=''">
- AND a."code" LIKE CONCAT('%',#{attResBase.code},'%')
- </if>
- <if test="attResBase.resRegCode !=null and attResBase.resRegCode !=''">
- AND a."res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%')
- </if>
- <if test="attResBase.tbState !=null and 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>
+ left join "SJZT_MD"."tb_res_general_investigation_state" b on a."code" = b."res_guid"
+ <where>
+ <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>
+ <if test="attResBase.name !=null and attResBase.name !=''">
+ AND a."name" LIKE CONCAT('%',#{attResBase.name},'%')
+ </if>
+ <if test="attResBase.code !=null and attResBase.code !=''">
+ AND a."code" LIKE CONCAT('%',#{attResBase.code},'%')
+ </if>
+ <if test="attResBase.resRegCode !=null and attResBase.resRegCode !=''">
+ AND a."res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%')
+ </if>
+ <if test="attResBase.tbState !=null and 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>
+ </where>
</select>
<select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
--
Gitblit v1.9.3