aix
2024-06-26 a1adce7f9977fdd045ecba01ca25193757169af6
提防填报长度
2 files modified
45 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml 42 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTable.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml
@@ -432,6 +432,30 @@
        and trgis."check_state" = 3
        )checkResNum,
        (
            SELECT COUNT(*) FROM
            (
                select trgis.*,trgi.dangerNum from SJZT_MD."tb_res_general_investigation_state" trgis
                left join (
                    select * from (
                        select "tb_state_id",count(*) dangerNum from SJZT_MD."tb_res_general_investigation"
                        where "hazard_rating" = '有危害' group by "tb_state_id"
                    )
                ) trgi on trgi."tb_state_id" = trgis."guid"
            ) trgis
            left join SJZT_MD."tb_res_general_investigation" trgi on trgi."tb_state_id" = trgis."res_guid" and trgi."hazard_rating" = '有危害'
            LEFT JOIN sjzt_MD."att_res_base" ARB ON ARB."code" = trgis."res_guid"
            LEFT JOIN YWXT."att_ad_base" town ON town."ad_code" = arb."interior_ad_guid"
            LEFT JOIN YWXT."att_ad_base" county ON county."ad_code" = town."p_ad_code"
            LEFT JOIN YWXT."att_ad_base" city ON city."ad_code" = county."p_ad_code"
            LEFT JOIN YWXT."att_ad_base" province ON province."ad_code" = city."p_ad_code"
            where 1=1
            and (town."ad_code" = aab."guid" or county."ad_code" = aab."guid" or city."ad_code" = aab."guid" or province."ad_code" = aab."guid")
            <if test="params.tbYear != null and params.tbYear !=''">
                and trgis."tb_year" = #{params.tbYear}
            </if>
            and trgis."check_state" = 3 and trgis.dangerNum is not null
        )resMayiNum,
        (
        SELECT COUNT(*)
        FROM SJZT_MD."tb_res_dyke" trd
        LEFT JOIN YWXT."att_ad_base" county ON county."ad_code" = trd."ad_code"
@@ -469,6 +493,24 @@
        and (tdis."check_state" = 2 or tdis."check_state" = 3)
        )checkDykeNum,
        IFNULL(
            (
                SELECT SUM(CASE WHEN trd."dyke_length" THEN trd."dyke_length" ELSE 0 END) FROM (
                SELECT TRD.* FROM SJZT_MD."tb_dyke_investigation_state" tdis
                LEFT JOIN SJZT_MD."tb_res_dyke" trd on (trd."guid" = tdis."dyke_guid")
                <where>
                    <if test="params.tbYear != null and params.tbYear !=''">
                        and tdis."tb_year" = #{params.tbYear}
                    </if>
                    and tdis."check_state" = 2
                </where>
                ) trd
                LEFT JOIN ywxt."att_ad_base" county on county."ad_code" = trd."ad_code"
                LEFT JOIN ywxt."att_ad_base" city on city."ad_code" = county."p_ad_code"
                LEFT JOIN ywxt."att_ad_base" province on province."ad_code" = city."p_ad_code"
                where (county."ad_code" = aab."guid" or city."ad_code" = aab."guid" or province."ad_code" = aab."guid")
            ),0
        ) AS tbDykeLength,
        IFNULL(
        (
        SELECT
        SUM(CASE WHEN trd."dyke_length" THEN trd."dyke_length" ELSE 0 END)
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTable.java
@@ -20,6 +20,7 @@
        private int unInvestigationResNum;
        //已校核座数
        private int checkResNum;
        private int resMayiNum;
        //堤防座数
        private int dykeNum;
@@ -35,5 +36,7 @@
        //堤防危害长度
        private double dangerTotalLength;
        //堤防填报长度(根据审核通过状态的提防长度)
        private double tbDykeLength;
}