白蚁提防地段普查列表、详情接口增加季节筛选

aix

2024-09-25 4d489f3832008121e40bc6dcb49daab99828298c

白蚁提防地段普查列表、详情接口增加季节筛选

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

@@ -79,22 +79,56 @@
        ifnull(tmp.totalDangerDw,0) totalDangerDw,
        (
        select sum(tdud."danger_length") from sjzt_md."tb_dyke_unit_danger" tdud
        left join "SJZT_MD"."tb_dyke_investigation_state" tdis on (tdud."dyke_id" = tdis."dyke_guid")
        left join "SJZT_MD"."tb_dyke_investigation_state" tdis
            on (
                tdud."dyke_id" = tdis."dyke_guid"
                <if test="vo.tbYear !=null and vo.tbYear !=''">
                    AND tdis."tb_year" = #{vo.tbYear}
                </if>
                <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
                    AND tdis."tb_quarter" = #{vo.tbQuarter}
                </if>
                )
        where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 1 and tdis."check_state" > 1
        ) as firstLength,
        (
        select sum(tdud."danger_length") from sjzt_md."tb_dyke_unit_danger" tdud
        left join "SJZT_MD"."tb_dyke_investigation_state" tdis on (tdud."dyke_id" = tdis."dyke_guid")
        left join "SJZT_MD"."tb_dyke_investigation_state" tdis
            on (
                tdud."dyke_id" = tdis."dyke_guid"
                <if test="vo.tbYear !=null and vo.tbYear !=''">
                    AND tdis."tb_year" = #{vo.tbYear}
                </if>
                <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
                    AND tdis."tb_quarter" = #{vo.tbQuarter}
                </if>
                )
        where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 2 and tdis."check_state" > 1
        ) as secondLength,
        (
        select sum(tdud."danger_length") from sjzt_md."tb_dyke_unit_danger" tdud
        left join "SJZT_MD"."tb_dyke_investigation_state" tdis on (tdud."dyke_id" = tdis."dyke_guid")
        left join "SJZT_MD"."tb_dyke_investigation_state" tdis
            on (
                tdud."dyke_id" = tdis."dyke_guid"
                <if test="vo.tbYear !=null and vo.tbYear !=''">
                    AND tdis."tb_year" = #{vo.tbYear}
                </if>
                <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
                    AND tdis."tb_quarter" = #{vo.tbQuarter}
                </if>
                )
        where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 3 and tdis."check_state" > 1
        ) as thirdLength

        from sjzt_md."tb_res_dyke" trd
        left join "SJZT_MD"."tb_dyke_investigation_state" tdis on trd."guid" = tdis."dyke_guid"
        <if test="vo.tbYear !=null and vo.tbYear !=''">
            AND tdis."tb_year" = #{vo.tbYear}
        </if>
        <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
            AND tdis."tb_quarter" = #{vo.tbQuarter}
        </if>

        left join YWXT."att_ad_base" aa on aa."guid" = trd."ad_code"
        left join YWXT."att_ad_base" ab on ab."ad_code" = aa."p_ad_code"
        left join YWXT."att_ad_base" ac on ac."ad_code" = ab."p_ad_code"
@@ -132,6 +166,9 @@
        <if test="vo.tbYear !=null and vo.tbYear !=''">
            AND tdi."tb_year" = #{vo.tbYear}
        </if>
        <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
            AND tdi."tb_quarter" = #{vo.tbQuarter}
        </if>
        group by tdi."tb_state_id",tdi."dyke_guid",tdi."unit"
        )TEMP1
        )temp2 group by

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

@@ -15,6 +15,7 @@
    private String tbState;//填报状态

    private Integer tbYear;//填报年度
    private String tbQuarter;//填报年度

    //危害长度
    private double totalDangerLength;