diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java index 89b0403..c1b8cee 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java @@ -100,4 +100,10 @@ public class AlarmFindRequest implements Serializable { */ @ApiModelProperty(value = "紧急系数最大值") private Double aiNumMax; + + /** + * 前端选择框 1查询ai120Id不为空的 2查询ai120Id为空的 + */ + @ApiModelProperty(value = "前端选择框 1查询ai120Id不为空的 2查询ai120Id为空的") + private Integer selectIsNull; } diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java index 6155452..fd50611 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java @@ -112,5 +112,11 @@ public class EventPageRequest implements Serializable { private String alarmUnitTelephone; + + /** + * 前端选择框 1查询ai110Id不为空的 2查询ai110Id为空的 + */ + @ApiModelProperty(value = "前端选择框 1查询ai110Id不为空的 2查询ai110Id为空的") + private Integer selectIsNull; } diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml index 1c023ab..6e2350e 100644 --- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml +++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml @@ -165,6 +165,12 @@ <if test="req.aiNumMax != null "> and ai_num <= #{req.aiNumMax} </if> + <if test="req.selectIsNull == 1 "> + and ai_120_id is not null and ai_120_id != '' + </if> + <if test="req.selectIsNull == 2 "> + and ai_120_id is null or ai_120_id = '' + </if> </where> order by update_time desc </select> diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml index 94a6081..484d39e 100644 --- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml +++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml @@ -105,6 +105,12 @@ <if test="event.alarmUnitTelephone != null and event.alarmUnitTelephone !=''"> AND alarm_unit_telephone LIKE CONCAT('%', #{event.alarmUnitTelephone}, '%') </if> + <if test="req.selectIsNull == 1 "> + and ai_110_id is not null and ai_110_id != '' + </if> + <if test="req.selectIsNull == 2 "> + and ai_110_id is null or ai_110_id = '' + </if> </where> order by event_date_time desc </select>