diff options
| author | tanghao <default@DESKTOP-7FEGRP2> | 2019-02-12 10:51:10 +0800 |
|---|---|---|
| committer | tanghao <default@DESKTOP-7FEGRP2> | 2019-02-12 10:51:10 +0800 |
| commit | 74cf857876f3f50c28ff874f8a68082eab13fe6a (patch) | |
| tree | 1b4eb95c755aa14277eab5963f4d770048af62c8 /src | |
| parent | 9b39c65447fc174d9c4bec51ea290b4eb2b9a811 (diff) | |
| parent | b29885d8eb43989cf0391694c163c9461f0b2a15 (diff) | |
Merge branch 'dev' of https://git.mesalab.cn/nms/nmsweb.git into dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/nis/nms/web/actions/detection/DetectionWarningAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nis/nms/web/actions/detection/DetectionWarningAction.java b/src/nis/nms/web/actions/detection/DetectionWarningAction.java index 9574043..93dbaa5 100644 --- a/src/nis/nms/web/actions/detection/DetectionWarningAction.java +++ b/src/nis/nms/web/actions/detection/DetectionWarningAction.java @@ -499,7 +499,7 @@ public class DetectionWarningAction extends BaseAction { + " diw.PERFORMACE_DATA performacedate,\n" + " nt.ipn ipn\n"
+ " from (select seq_id, detection_set_info_id, max(data_check_time) dct\n"
+ " from detection_info_warning\n" + " where valid = 1\n"
- + " and data_check_time >= (sysdate - 2/24)\n"
+ + (dct == null || "".equals(dct)? " and data_check_time >= (sysdate - 2/24)\n":" and data_check_time >= to_date('" + dct + "','yyyy-mm-dd')\n")
+ " group by seq_id, detection_set_info_id) dnew\n" + " left join detection_info_warning diw\n"
+ " on dnew.seq_id = diw.seq_id\n"
+ " and dnew.detection_set_info_id = diw.detection_set_info_id\n"
|