zhongrj
2024-03-20 d54b03d01788503c4acfb78b3c291d489319ddc3
出租屋查询数量修改(数据过滤)
3 files modified
39 ■■■■■ changed files
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java 4 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml 22 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
@@ -60,7 +60,9 @@
     * @return
     */
    List<HouseRentalStatistics> getStatistics(@Param("vo") HouseRentalTenantVO houseRental,
                                              @Param("list") List<String> list);
                                              @Param("gridCodeList") List<String> gridCodeList,
                                              @Param("regionChildCodesList") List<String> regionChildCodesList,
                                              @Param("isAdministrator") Integer isAdministrator);
    /**
     * 导出租赁信息
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -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>
    <!--导出租赁信息-->
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -317,15 +317,12 @@
     */
    @Override
    public Object getStatistics(HouseRentalTenantVO houseRental) {
        List<String> list = new ArrayList<>();
        if (null != houseRental.getRoleName() && !houseRental.getRoleName().equals("")) {
            if (houseRental.getRoleName().equals("网格员")) {
                // 查询对应的房屋地址code
                list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
            }
        }
        CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(HouseRentalTenantVO.class, houseRental);
        // 查询
        List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental, list);
        List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental,
            commonParamSet.getGridCodeList(),
            commonParamSet.getRegionChildCodesList(),
            commonParamSet.getIsAdministrator());
        // 返回
        return statistics;
    }