linwe
2024-06-12 776314c0d4ccb9a07d15c98253b8f33d5e1a666d
社区街道查询优化
6 files modified
44 ■■■■■ changed files
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -119,6 +119,8 @@
        jhr.*,
        jh.address as houseName,
        b.tenantName,
        br.town_name as townStreetName,
        br.name as neiName,
        b.phone,
        concat(jh.district_name," ",jh.building," ",unit," ",room) as address,
        case when TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )>= 8 then 1
@@ -128,6 +130,7 @@
        FROM jczz_house_rental jhr
        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 blade_region br on br.code = jg.community_code
        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
        LEFT JOIN (
            SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone_number as phone
@@ -143,6 +146,12 @@
            ) a ON a.id = jht.id and a.housing_rental_id is not null
        ) b ON b.housing_rental_id = jhr.id
        WHERE jhr.is_deleted = 0
        <if test="vo.townStreetName!=null and vo.townStreetName!=''">
            and br.town_name like concat('%',#{vo.townStreetName},'%')
        </if>
        <if test="vo.neiName!=null and vo.neiName!=''">
            and br.name like concat('%',#{vo.neiName},'%')
        </if>
        <if test="vo.auditStatus != null and vo.auditStatus != ''">
            <if test="vo.auditStatus ==1">
                AND jhr.audit_status  = 1
src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
@@ -67,5 +67,15 @@
     */
    private String communityCode;
    /**
     * 街道名称
     */
    private String townStreetName;
    /**
     * 社区名称
     */
    private String neiName;
}
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -27,6 +27,8 @@
        jpp.confirm_flag,
        jpp.confirm_time,
        jpp.confirm_notion,
        br.town_name as townStreetName,
        br.name as neiName,
        jc.category_name
        FROM
        jczz_place_practitioner jpp
@@ -34,7 +36,14 @@
        LEFT JOIN jczz_place_poi_label jppl on jppl.place_id = jp.id and type = 3
        LEFT JOIN jczz_category jc on jc.category_no = jppl.poi_code
        LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
        left join blade_region br on br.code = jpag.community_code
        <where>
            <if test="placePractitioner.townStreetName!=null and placePractitioner.townStreetName!=''">
                and br.town_name like concat('%',#{placePractitioner.townStreetName},'%')
            </if>
            <if test="placePractitioner.neiName!=null and placePractitioner.neiName!=''">
                and br.name like concat('%',#{placePractitioner.neiName},'%')
            </if>
            <if test="placePractitioner.id != null ">and jpp.id = #{placePractitioner.id}</if>
            <if test="placePractitioner.placeId != null ">and jpp.place_id = #{placePractitioner.placeId}</if>
            <if test="placePractitioner.name != null  and placePractitioner.name != ''">and jpp.name like concat('%',
src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java
@@ -55,4 +55,14 @@
     */
    private String roleName;
    /**
     * 街道名称
     */
    private String townStreetName;
    /**
     * 社区名称
     */
    private String neiName;
}
src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java
@@ -130,4 +130,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField(value = "update_time",fill = FieldFill.UPDATE)
    private Date updateTime;
    @ApiModelProperty(value = "处理描述", example = "")
    @TableField("handle_remark")
    private String handleRemark;
}
src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java
@@ -164,7 +164,7 @@
                taskPlaceSelfCheck.setRectificationFlag(3);
            } else {
                taskPlaceSelfCheck.setStatus(1);
                taskPlaceSelfCheck.setRectificationFlag(4);
                taskPlaceSelfCheck.setRectificationFlag(1);
            }
            restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SCHOOL_CHECK_NOTICE, 1,
                "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_FOUR, taskPlaceSelfCheck.getStatus());