区域查询修改，报事报修，取保候审查询修改

zhongrj

2024-03-23 1fe70307e66bd1a2b591d4b350183e2038341580

区域查询修改，报事报修，取保候审查询修改

 src/main/java/org/springblade/common/utils/RoleUtil.java

@@ -16,4 +16,16 @@
        }
        return false;
    }

    /**
     * 判断是否网格人员
     *
     * @return
     */
    public static boolean isWgy(String userRole) {
        if (userRole.contains("wgy")) {
            return true;
        }
        return false;
    }
}

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -62,6 +62,7 @@
import java.util.List;
import java.util.Map;

import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;

/**
@@ -198,6 +199,7 @@
    @ApiOperation(value = "修改", notes = "传入User")
    public R update(@Valid @RequestBody User user) {
        CacheUtil.clear(USER_CACHE);
        CacheUtil.clear(SYS_CACHE);
        return R.status(userService.updateUser(user));
    }


 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml

@@ -232,7 +232,7 @@
        SELECT
        code,parent_code,name,ancestors,region_level,sort
        FROM blade_region
        where ancestors like concat('%',#{regionCode},'%')
        where (ancestors like concat('%',#{regionCode},'%') or code = #{regionCode})
        union all
        (
        SELECT
@@ -244,7 +244,7 @@
        jg.sort
        FROM blade_region br
        right join jczz_grid jg on jg.community_code = br.village_code and jg.is_deleted = 0
        where br.ancestors like concat('%',#{regionCode},'%')
        where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode})
        )
    </select>


 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml

@@ -463,11 +463,12 @@
        </where>
    </select>

    <!--取保候审人员查询-->
    <select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
        SELECT
        IFNULL( jda.address_name, jp.location ) AS address_name,
        jtbre.apply_name,
        jgr.district_code aoiCode,
        jh.district_code aoiCode,
        jda.region_code,
        jg.community_code neiCode,
        jc.street_code streetCode,
@@ -493,9 +494,9 @@
        FROM
        jczz_task jt
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
        LEFT JOIN jczz_place jp ON jt.house_code = jp.house_code and jp.is_deleted = 0
        LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code
        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
        LEFT JOIN jczz_house jh ON jt.house_code = jh.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
        LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0
        LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id and jtbre.is_deleted = 0
        LEFT JOIN blade_user bu on bu.id = jtbre.check_user_id and bu.is_deleted = 0
@@ -545,7 +546,7 @@
            </if>

            <if test="task.districtName != null and task.districtName != null">
                and jgr.district_name like concat('%', #{task.districtName}, '%')
                and jh.district_name like concat('%', #{task.districtName}, '%')
            </if>

            <if test="task.frequency != null and task.frequency != ''">

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml

@@ -232,7 +232,7 @@
                    or jtrfr.confirm_user_id = #{vo.confirmUserId}
                </if>
            </if>
            <!-- 网格员及其他 -->
            <!-- 其他 -->
            <if test="vo.roleType ==null">
                <choose>
                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
@@ -249,7 +249,9 @@
                        )
                    </when>
                </choose>

            </if>
            <!-- 网格员 -->
            <if test="vo.roleName =='wgy'">
                <choose>
                    <when test="gridCodeList !=null and gridCodeList.size()>0">
                        and (
@@ -257,7 +259,7 @@
                        <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                            #{code}
                        </foreach>
                            or
                        or
                        jp.grid_code in
                        <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                            #{code}
@@ -272,7 +274,6 @@
                <if test="vo.confirmUserId != null ">
                    or jtrfr.confirm_user_id = #{vo.confirmUserId}
                </if>

            </if>
        </if>
        ORDER BY jtrfr.create_time DESC

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -73,7 +73,10 @@
    public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
        // 公共参数设置
        CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class, taskReportForRepairs);
        taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
        String userRole = AuthUtil.getUserRole();
        if (RoleUtil.isProperty(userRole) || RoleUtil.isWgy(userRole)){
            taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
        }
        if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
            if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
                taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
@@ -82,7 +85,6 @@
                taskReportForRepairs.setRoleType("inhabitant");
            }
        }
        String userRole = AuthUtil.getUserRole();
        List<String> aoiCodeList = new ArrayList<>();
        if (RoleUtil.isProperty(userRole)) {
            taskReportForRepairs.setRoleType("wy");