xieb
2024-06-25 94b2c9db484f97cb84ead85bd4e5268d9c823ed2
行政区划过滤
2 files modified
8 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java 6 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
@@ -66,7 +66,7 @@
            and sar.create_time <= #{alarmRecord.endTime}
        </if>
        <if test="alarmRecord.adCode!=null and alarmRecord.adCode!=''">
            and  a."interior_ad_guid" like concat('%',#{alarmRecord.adCode},'%')
            and  concat(a."interior_ad_guid",b."guid",c."guid",d."guid") like concat('%',#{alarmRecord.adCode},'%')
        </if>
        <if test="alarmRecord.alarmLevel != null and alarmRecord.alarmLevel !=''">
            and sar1.alarm_level = #{alarmRecord.alarmLevel}
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
@@ -49,9 +49,9 @@
     */
    @Override
    public Object selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord) {
        if (!Strings.isBlank(alarmRecord.getAdCode())){
            alarmRecord.setAdCode(alarmRecord.getAdCode().replaceAll("0+$", ""));
        }
//        if (!Strings.isBlank(alarmRecord.getAdCode())){
//            alarmRecord.setAdCode(alarmRecord.getAdCode().replaceAll("0+$", ""));
//        }
        if (null != alarmRecord.getIsExport()){
            return baseMapper.selectAlarmRecordPage(null,alarmRecord);
        }