From d94384184b45bcdccee59c3b84ea20da9daad831 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Sun, 18 Nov 2018 16:10:03 +0800 Subject: 修复升级任务--dc升级成功但是会显示失败的问题 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/nms/server/service/CommonService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/nms/server/service/CommonService.java b/src/com/nms/server/service/CommonService.java index 3cbd47e..d915b3a 100644 --- a/src/com/nms/server/service/CommonService.java +++ b/src/com/nms/server/service/CommonService.java @@ -1450,7 +1450,7 @@ public class CommonService { " on para.mission_id=t.mission_id" + " where t.mission_type = 6" + // " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ "*24*3600 second)"; - " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ " second)"; + " and greatest(t.create_time,ifnull(para.start_time,t.create_time))" + timeStandard + " )" +*/ // " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ "*24*3600 second))"+ - " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ " second))"+ + " and greatest(t.create_time,ifnull(para.start_time,t.create_time))"+timeStandard; - " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>"+timeStandard; + " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<"+timeStandard; task6SucSql = "select info.ip,info.mission_id as taskIds" + " from (" + " select distinct node.node_ip as ip,rlt.mission_id as mission_id" + @@ -1493,7 +1493,7 @@ public class CommonService { " on para.mission_id=t.mission_id" + " where t.mission_type = 6" + // " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>" + timeStandard + - " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>" + timeStandard + + " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<" + timeStandard + " )" + " )info " ; } -- cgit v1.2.3