住户管理bug修复+报警记录添加字段

lin

2024-03-18 fa4a77d9b52919f46733b6d30a6cf5136c8f6b05

住户管理bug修复+报警记录添加字段

 src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java

@@ -195,7 +195,7 @@
     * @return
     */
    @GetMapping("/getRegionStatisticalLabels")
    @ApiOperation(value = "统计标签", notes = "")
    @ApiOperation(value = "街道重点人员标签统计", notes = "")
    public R<IPage<HouseholdLabelVO>> statisticalLabels(HouseholdLabelVO householdLabel, Query query) {
        IPage<HouseholdLabelVO> pages = householdLabelService.statisticalLabels(Condition.getPage(query), householdLabel);
        return R.data(pages);
@@ -208,7 +208,7 @@
     * @return
     */
    @GetMapping("/getCommunityStatisticalLabels")
    @ApiOperation(value = "统计标签", notes = "")
    @ApiOperation(value = "社区重点人员标签统计", notes = "")
    public R<IPage<HouseholdLabelVO>> getCommunityStatisticalLabels(HouseholdLabelVO householdLabel, Query query) {
        IPage<HouseholdLabelVO> pages = householdLabelService.getCommunityStatisticalLabels(Condition.getPage(query), householdLabel);
        return R.data(pages);

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml

@@ -220,7 +220,7 @@
            <if test="household.name!=null and household.name !=''">
                and jh.name like concat('%',#{household.name},'%')
            </if>
            <if test="volunteerOrg != null  and volunteerOrg != ''">
            <if test="household.volunteerOrg != null  and household.volunteerOrg != ''">
                and jh.volunteer_org  like concat('%',#{household.volunteerOrg},'%')
            </if>
            <if test="household.houseCode!=null and household.houseCode !=''">

 src/main/java/org/springblade/modules/police/entity/PoliceAlarmRecordsEntity.java

@@ -137,4 +137,19 @@
    @TableField("public_incidents")
    private Integer publicIncidents;

    /** 1：待处置 2：已处置 */
    @ApiModelProperty(value = "1：待处置 2：已处置", example = "")
    @TableField("status")
    private Integer status;

    /** 经度 */
    @ApiModelProperty(value = "经度", example = "")
    @TableField("longitude")
    private String longitude;

    /** 纬度 */
    @ApiModelProperty(value = "纬度", example = "")
    @TableField("latitude")
    private String latitude;

}

 src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml

@@ -31,6 +31,9 @@
        <result property="alarmResponseTime"    column="alarm_response_time"    />
        <result property="alarmDescribe"    column="alarm_describe"    />
        <result property="publicIncidents"    column="public_incidents"    />
        <result property="status"    column="status"    />
        <result property="longitude"    column="longitude"    />
        <result property="latitude"    column="latitude"    />
    </resultMap>

    <sql id="selectPoliceAlarmRecords">
@@ -53,7 +56,10 @@
            jw_grid_code,
            alarm_response_time,
            alarm_describe,
            public_incidents
            public_incidents,
            status,
            longitude,
            latitude
        from
            jczz_police_alarm_records
    </sql>
@@ -67,25 +73,26 @@
<!--    <select id="selectPoliceAlarmRecordsList" parameterType="rg.springblade.modules.dto.PoliceAlarmRecordsDTO" resultMap="PoliceAlarmRecordsDTOResult">-->
<!--        <include refid="selectPoliceAlarmRecords"/>-->
<!--        <where>-->
<!--            <if test="id != null "> and id = #{id}</if>-->
<!--            <if test="houseCode != null  and houseCode != ''"> and house_code = #{houseCode}</if>-->
<!--            <if test="address != null  and address != ''"> and address = #{address}</if>-->
<!--            <if test="name != null  and name != ''"> and name = #{name}</if>-->
<!--            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>-->
<!--            <if test="alarmType != null  and alarmType != ''"> and alarm_type = #{alarmType}</if>-->
<!--            <if test="injuryFlag != null "> and injury_flag = #{injuryFlag}</if>-->
<!--            <if test="gridCode != null  and gridCode != ''"> and grid_code = #{gridCode}</if>-->
<!--            <if test="createTime != null "> and create_time = #{createTime}</if>-->
<!--            <if test="updateTime != null "> and update_time = #{updateTime}</if>-->
<!--            <if test="policeId != null "> and police_id = #{policeId}</if>-->
<!--            <if test="policeName != null  and policeName != ''"> and police_name = #{policeName}</if>-->
<!--            <if test="policePhone != null  and policePhone != ''"> and police_phone = #{policePhone}</if>-->
<!--            <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>-->
<!--            <if test="gender != null "> and gender = #{gender}</if>-->
<!--            <if test="jwGridCode != null  and jwGridCode != ''"> and jw_grid_code = #{jwGridCode}</if>-->
<!--            <if test="alarmResponseTime != null "> and alarm_response_time = #{alarmResponseTime}</if>-->
<!--            <if test="alarmDescribe != null  and alarmDescribe != ''"> and alarm_describe = #{alarmDescribe}</if>-->
<!--            <if test="publicIncidents != null "> and public_incidents = #{publicIncidents}</if>-->
<!--            <if test="id != null "> and id = #{id}</if>
        <if test="houseCode != null  and houseCode != ''"> and house_code = #{houseCode}</if>
        <if test="address != null  and address != ''"> and address = #{address}</if>
        <if test="name != null  and name != ''"> and name = #{name}</if>
        <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
        <if test="alarmType != null  and alarmType != ''"> and alarm_type = #{alarmType}</if>
        <if test="injuryFlag != null "> and injury_flag = #{injuryFlag}</if>
        <if test="gridCode != null  and gridCode != ''"> and grid_code = #{gridCode}</if>
        <if test="createTime != null "> and create_time = #{createTime}</if>
        <if test="updateTime != null "> and update_time = #{updateTime}</if>
        <if test="policeId != null "> and police_id = #{policeId}</if>
        <if test="policeName != null  and policeName != ''"> and police_name = #{policeName}</if>
        <if test="policePhone != null  and policePhone != ''"> and police_phone = #{policePhone}</if>
        <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
        <if test="gender != null "> and gender = #{gender}</if>
        <if test="jwGridCode != null  and jwGridCode != ''"> and jw_grid_code = #{jwGridCode}</if>
        <if test="alarmResponseTime != null "> and alarm_response_time = #{alarmResponseTime}</if>
        <if test="alarmDescribe != null  and alarmDescribe != ''"> and alarm_describe = #{alarmDescribe}</if>
        <if test="publicIncidents != null "> and public_incidents = #{publicIncidents}</if>
        <if test="status != null "> and status = #{status}</if>-->
<!--        </where>-->
<!--    </select>-->