huanghongfa
2021-09-26 6a2ce599e8c7df56c28176526ee43c1e177b06b1
bug修复
2个文件已修改
5 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventManageDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventManageDTO.java
@@ -46,6 +46,8 @@
    @ApiModelProperty(value = "事件分类:1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1")
    // @NotNull(message = "事件分类不能为空")
    private Integer eventType;
    @ApiModelProperty(value = "事件类型")
    private String eventClazz;
    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
    private Integer dangerLevel;
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -480,6 +480,9 @@
            <if test="pageEventManageDTO.yellowCard!=null">
                AND e.yellow_card = #{pageEventManageDTO.yellowCard}
            </if>
            <if test="pageEventManageDTO.eventClazz != null and pageEventManageDTO.eventClazz != &quot;&quot;">
                AND e.event_clazz like concat('%',#{pageEventDTO.eventClazz},'%')
            </if>
            <if test="pageEventManageDTO.urgent!=null">
                AND e.urgent = #{pageEventManageDTO.urgent}
            </if>