Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml

@@ -104,7 +104,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>
@@ -237,13 +237,15 @@
        GROUP BY housing_rental_id
        ) jht
        ON jht.housing_rental_id = jhr.id
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
        JOIN jczz_house jh ON jh.house_code = jhr.house_code and jh.is_deleted = 0
        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
        WHERE jhr.is_deleted = 0
        AND TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )>= 8
        <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
            AND jhr.audit_status = #{vo.auditStatus}
        </if>
        <include refid="filterHouseGrid"/>
        <include refid="filterData"/>

        UNION ALL

@@ -256,13 +258,15 @@
        GROUP BY housing_rental_id
        ) jht
        ON jht.housing_rental_id = jhr.id
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
        JOIN jczz_house jh ON jh.house_code = jhr.house_code and jh.is_deleted = 0
        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
        WHERE jhr.is_deleted = 0
        AND 4 &lt;= TIMESTAMPDIFF( MONTH, rental_time, due_time ) AND TIMESTAMPDIFF( MONTH, rental_time, due_time )&lt;=8
        <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
            AND jhr.audit_status = #{vo.auditStatus}
        </if>
        <include refid="filterHouseGrid"/>
        <include refid="filterData"/>

        UNION ALL

@@ -275,13 +279,15 @@
        GROUP BY housing_rental_id
        ) jht
        ON jht.housing_rental_id = jhr.id
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
        JOIN jczz_house jh ON jh.house_code = jhr.house_code and jh.is_deleted = 0
        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
        WHERE jhr.is_deleted = 0
        AND TIMESTAMPDIFF( MONTH, rental_time, due_time )&lt;4
        <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
                AND jhr.audit_status  = #{vo.auditStatus}
            </if>
            <include refid="filterHouseGrid"/>
            AND jhr.audit_status  = #{vo.auditStatus}
        </if>
        <include refid="filterData"/>
    </select>

    <!--导出租赁信息-->