水库普查行政区划返回值修改

guoshilong

2024-03-25 75068a27ff35b277b4913840f1403589dd0c53b5

水库普查行政区划返回值修改

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml

@@ -24,12 +24,34 @@
        (CASE WHEN tmp.totalDangerNum>0 THEN 1 ELSE 2 END) as hasDanger,
        tmp.totalDangerNum,
        tmp.termiteNum,
        tmp.otherNum
        tmp.otherNum,

        case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
        case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
        case when town."ad_grad" = 3 THEN town."ad_code"
        when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
        case when town."ad_grad" = 3 THEN town."ad_name"
        when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
        case when town."ad_grad" = 2 THEN town."ad_code"
        when county."ad_grad" = 2 THEN county."ad_code"
        ELSE city."ad_code" END AS cityCode,
        case when town."ad_grad" = 2 THEN town."ad_name"
        when county."ad_grad" = 2 THEN county."ad_name"
        ELSE city."ad_name" END AS cityName,
        case when town."ad_grad" = 1 THEN town."ad_code"
        when county."ad_grad" = 1 THEN county."ad_code"
        when city."ad_grad" = 1 THEN city."ad_code"
        ELSE province."ad_code" END AS provinceCode,
        case when town."ad_grad" = 1 THEN town."ad_name"
        when county."ad_grad" = 1 THEN county."ad_name"
        when city."ad_grad" = 1 THEN city."ad_name"
        ELSE province."ad_name" END AS provinceName

        from sjzt_md."att_res_base" a
        left join ywxt."att_ad_base" aab on aab."guid" = a."interior_ad_guid"
        left join ywxt."att_ad_base" aa on aab."p_ad_code" = aa."ad_code"
        left join ywxt."att_ad_base" ab on aa."p_ad_code" = ab."ad_code"
        left join ywxt."att_ad_base" ac on ab."p_ad_code" = ac."ad_code"
        left join ywxt."att_ad_base" town on town."guid" = a."interior_ad_guid"
        left join ywxt."att_ad_base" county on town."p_ad_code" = county."ad_code"
        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"

        left join
@@ -71,8 +93,8 @@
            )
        </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})
            and (province."ad_code" = #{attResBase.adCode} or city."ad_code" = #{attResBase.adCode} or county."ad_code" =
            #{attResBase.adCode} or town."ad_code" = #{attResBase.adCode})
        </if>
        <if test="attResBase.engScal != null and attResBase.engScal != ''">
            and a."eng_scal" = #{attResBase.engScal}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java

@@ -48,4 +48,14 @@

    private String tbStateId;


    private String provinceCode;
    private String provinceName;
    private String cityCode;
    private String cityName;
    private String countyCode;
    private String countyName;
    private String townCode;
    private String townName;

}