linwe
2024-06-18 9f1bbc41aa1ac91f1d7e7deeb85476796e95709c
警情处置+二手交易
3 files modified
14 ■■■■ changed files
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml 7 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
@@ -10,7 +10,8 @@
    <select id="selectPoliceAlarmRecordsPage" resultMap="policeAlarmRecordsResultMap">
        select
        jpar.*,
        bdb.dict_value as alarmTypeName
        bdb.dict_value as alarmTypeName,
        jpag.pcs_name
        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
@@ -26,6 +27,10 @@
            <if test="vo.policeName != null and vo.policeName != ''">
                and jpar.police_name like concat('%',#{vo.policeName},'%')
            </if>
            <if test="vo.pcsName != null and vo.pcsName != ''">
                and jpag.pcs_name like concat('%',#{vo.pcsName},'%')
            </if>
            <if test="vo.startTime != null and vo.startTime != ''">
                and date_format(jpar.create_time,'%Y-%m-%d') &gt;= #{vo.startTime}
            </if>
src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java
@@ -16,6 +16,7 @@
 */
package org.springblade.modules.police.vo;
import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -61,4 +62,7 @@
     */
    private String endTime;
    @ApiModelProperty(value = "派出所名称", example = "")
    private String pcsName;
}
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
@@ -71,7 +71,8 @@
        List<String> regionChildCodesList = commonParamSet.getRegionChildCodesList();
        Integer isAdministrator = commonParamSet.getIsAdministrator();
        List<String> gridCodeList = commonParamSet.getGridCodeList();
        return page.setRecords(baseMapper.selectTaskLabelReportingEventPage(page, taskLabelReportingEvent,regionChildCodesList,isAdministrator,gridCodeList));
        List<TaskLabelReportingEventVO> taskLabelReportingEventVOS = baseMapper.selectTaskLabelReportingEventPage(page, taskLabelReportingEvent, regionChildCodesList, isAdministrator, gridCodeList);
        return page.setRecords(taskLabelReportingEventVOS);
    }
    @Override