linwei
2024-02-07 aae9bc1ebc7f65cebaec65ac7128f79ca6c827d1
代码优化
5 files modified
34 ■■■■■ changed files
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml 16 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/vo/TaskVO.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml 8 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -103,7 +103,6 @@
        bu.real_name as username,bu.phone as phone,
        br.town_name as townStreetName,br.name as neiName,
        jpe.confirm_flag confirmFlag,
        jg.grid_name as gridName,
        bus.`name` AS policeName,
        bus.phone AS policePhone,
        IFNULL(jda.address_name,jp.location) addressName,
@@ -111,9 +110,8 @@
        from jczz_place jp
        left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
        left join jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
        left join jczz_grid jg on jg.grid_code = jp.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 jp.jw_grid_code= jpag.jw_grid_code
        left join blade_region br on br.code = jpag.community_code
        LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
        LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
        left join (
@@ -435,17 +433,15 @@
        bu.real_name as username,bu.phone as phone,
        br.town_name as townStreetName,br.name as neiName,
        jpe.confirm_flag confirmFlag,
        jg.grid_name as gridName,
        bus.`name` AS policeName,
        bus.phone AS policePhone,
        jda.address_name,
        IFNULL(jda.address_name,jp.location) addressName,
        jpag.pcs_name deptName
        from jczz_place jp
        left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
        left join jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
        left join jczz_grid jg on jg.grid_code = jp.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 jp.jw_grid_code= jpag.jw_grid_code
        left join blade_region br on br.code = jpag.community_code
        LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
        LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
        left join (
@@ -472,7 +468,7 @@
            and br.town_name like concat('%',#{place.townStreetName},'%')
        </if>
        <if test="place.deptName!=null and place.deptName!=''">
            and bd.dept_name like concat('%',#{place.deptName},'%')
            and jpag.pcs_name like concat('%',#{place.deptName},'%')
        </if>
        <if test="place.policeName!=null and place.policeName!=''">
@@ -483,6 +479,10 @@
            and jp.nine_type = #{place.nineType}
        </if>
        <if test="place.isFront!=null and place.isFront!=''">
            and jp.is_front = #{place.isFront}
        </if>
        <if test="place.neiName!=null and place.neiName!=''">
            and br.name like concat('%',#{place.neiName},'%')
        </if>
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -29,6 +29,8 @@
        br.town_code streetCode,
        jp.principal as realName,
        jp.principal_phone as phone,
        jp.nine_type ,
        jp.front_type ,
        jt.id,
        jt.NAME,
        jt.type,
src/main/java/org/springblade/modules/task/vo/TaskVO.java
@@ -66,4 +66,8 @@
     */
    private String roleName;
    private String nineType;
    private String frontType;
}
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -397,7 +397,6 @@
    <select id="export"
            resultMap="TaskPlaceRectificationExcelResult">
        SELECT
        jtpr.id,
        jtpr.place_check_id,
@@ -516,7 +515,7 @@
                            #{code}
                        </foreach>
                        or
                        jpag.community_code in
                        br.village_code in
                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                            #{code}
                        </foreach>
@@ -525,14 +524,13 @@
                    <otherwise>
                        and
                        (
                        jg.grid_code in ('') or jpag.community_code in ('')
                        jg.grid_code in ('') or br.village_code in ('')
                        )
                    </otherwise>
                </choose>
            </if>
        </where>
        order by jtpr.create_time desc
    </select>
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -167,8 +167,8 @@
    @Override
    public List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationsVO taskPlaceRectificationVO) {
        // todo
        List<String> regionChildCodesList = new ArrayList<>();//SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
        Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2;
        List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
        Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
        List<TaskPlaceRectificationExcel> export = baseMapper.export(taskPlaceRectificationVO, regionChildCodesList, isAdministrator);
        IDictBizService bean = SpringUtils.getBean(IDictBizService.class);
        List<DictBiz> nineType = bean.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));