zhongrj
2024-03-19 9f6332a751676891cb910f2b6fd50833cbc865c7
报警单查询修改
4 files modified
100 ■■■■■ changed files
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java 9 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml 73 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/police/service/impl/PoliceAlarmRecordsServiceImpl.java 8 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
@@ -36,9 +36,16 @@
     *
     * @param page
     * @param policeAlarmRecords
     * @param isAdministrator
     * @param regionChildCodesList
     * @param gridCodeList
     * @return
     */
    List<PoliceAlarmRecordsVO> selectPoliceAlarmRecordsPage(IPage page, @Param("vo") PoliceAlarmRecordsVO policeAlarmRecords);
    List<PoliceAlarmRecordsVO> selectPoliceAlarmRecordsPage(IPage page,
                                                            @Param("vo") PoliceAlarmRecordsVO policeAlarmRecords,
                                                            @Param("isAdministrator") Integer isAdministrator,
                                                            @Param("regionChildCodesList") List<String> regionChildCodesList,
                                                            @Param("vo") List<String> gridCodeList);
}
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
@@ -3,14 +3,81 @@
<mapper namespace="org.springblade.modules.police.mapper.PoliceAlarmRecordsMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="policeAlarmRecordsResultMap" type="org.springblade.modules.police.entity.PoliceAlarmRecordsEntity">
    <resultMap id="policeAlarmRecordsResultMap" type="org.springblade.modules.police.vo.PoliceAlarmRecordsVO">
    </resultMap>
    <select id="selectPoliceAlarmRecordsPage" resultMap="policeAlarmRecordsResultMap">
        select * from jczz_police_alarm_records
        select jpar.* from jczz_police_alarm_records jpar
        LEFT JOIN jczz_grid jg on jg.grid_code = jpar.grid_code and jg.is_deleted = 0
        LEFT JOIN jczz_police_affairs_grid jpag on jpar.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="vo.status != null ">and status = #{vo.status}</if>
            <if test="vo.status != null ">
                and jpar.status = #{vo.status}
            </if>
            <if test="vo.alarmDescribe != null and vo.alarmDescribe != ''">
                and jpar.alarm_describe like concat('%',#{vo.alarmDescribe},'%')
            </if>
            <if test="vo.policeName != null and vo.policeName != ''">
                and jpar.police_name like concat('%',#{vo.policeName},'%')
            </if>
            <if test="isAdministrator==2">
                <choose>
                    <when test="vo.roleName != null and vo.roleName != ''">
                        <if test="vo.roleName=='wgy'">
                            <choose>
                                <when test="gridCodeList !=null and gridCodeList.size()>0">
                                    and jg.grid_code in
                                    <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                                        #{code}
                                    </foreach>
                                </when>
                                <otherwise>
                                    and jg.grid_code in ('')
                                </otherwise>
                            </choose>
                        </if>
                        <if test="vo.roleName=='mj'">
                            <choose>
                                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                                    and jpag.community_code in
                                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                                        #{code}
                                    </foreach>
                                </when>
                                <otherwise>
                                    and jpag.community_code in ('')
                                </otherwise>
                            </choose>
                        </if>
                    </when>
                    <otherwise>
                        <choose>
                            <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                                and
                                (
                                jg.grid_code in
                                <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                                    #{code}
                                </foreach>
                                or
                                jpag.community_code in
                                <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                                    #{code}
                                </foreach>
                                )
                            </when>
                            <otherwise>
                                and
                                (
                                jg.grid_code in ('') or jpag.community_code in in ('')
                                )
                            </otherwise>
                        </choose>
                    </otherwise>
                </choose>
            </if>
           and  is_deleted = 0
        </where>
    </select>
src/main/java/org/springblade/modules/police/service/impl/PoliceAlarmRecordsServiceImpl.java
@@ -17,6 +17,7 @@
package org.springblade.modules.police.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.param.CommonParamSet;
import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
import org.springblade.modules.police.vo.PoliceAlarmRecordsVO;
import org.springblade.modules.police.mapper.PoliceAlarmRecordsMapper;
@@ -35,7 +36,12 @@
    @Override
    public IPage<PoliceAlarmRecordsVO> selectPoliceAlarmRecordsPage(IPage<PoliceAlarmRecordsVO> page, PoliceAlarmRecordsVO policeAlarmRecords) {
        return page.setRecords(baseMapper.selectPoliceAlarmRecordsPage(page, policeAlarmRecords));
        CommonParamSet commonParamSet = new CommonParamSet<>().invoke(PoliceAlarmRecordsVO.class, policeAlarmRecords);
        return page.setRecords(baseMapper.selectPoliceAlarmRecordsPage(page, policeAlarmRecords,
            commonParamSet.getIsAdministrator(),
            commonParamSet.getRegionChildCodesList(),
            commonParamSet.getGridCodeList()
            ));
    }
src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java
@@ -31,4 +31,14 @@
public class PoliceAlarmRecordsVO extends PoliceAlarmRecordsEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 社区编号
     */
    private String communityCode;
    /**
     * 角色名称
     */
    private String roleName;
}