code

main_new_version.php

@@ -103,7 +103,7 @@ switch ($action) {
             if(_getLoginName() == "chud" || _getLoginName() == "IT.Andywu" || _getLoginName() == "ra.admin"){
                 $children[] = array("index" =>$index.'-1',"label" =>"Operation Log","path"=>"/Operationlog");  
             }
-            $children[] = array("index" =>$index.'-2',"label" =>"System Settings","path"=>"/SystemSettings");
+            //$children[] = array("index" =>$index.'-2',"label" =>"System Settings","path"=>"/SystemSettings");
             $systemManagement["children"] = $children;
             $menuList[] = $systemManagement;
         }

service/tools.class.php

@@ -289,7 +289,7 @@ class tools {
         if ($operate == "monitoring_rules_init"){
             $ret = array();
             //Milestone Update的页面配置数据
-            $milestones = common::excuteListSql("select * from customer_service_milestone_sno order by type, sno");
+            $milestones = common::excuteListSql("select * from public.customer_service_milestone_sno order by type, sno");
             $oceanMilestone = array();
             $airMilestone = array();
             foreach($milestones as $milestone){
@@ -583,7 +583,7 @@ class tools {
         //Milestone Update的结构处理,处理init page load
         if($rule_name == "Milestone_Update"){
             //Milestone Update的页面配置数据
-            $milestones = common::excuteListSql("select * from customer_service_milestone_sno order by type, sno");
+            $milestones = common::excuteListSql("select * from public.customer_service_milestone_sno order by type, sno");
             $oceanMilestone = array();
             $airMilestone = array();
             foreach($milestones as $milestone){
@@ -719,7 +719,7 @@ class tools {
 
         if ($rules_type == "Milestone_Update"){
             //提交的description 的转换code
-            $milestones = common::excuteListSql("select * from customer_service_milestone_sno order by type, sno");
+            $milestones = common::excuteListSql("select * from public.customer_service_milestone_sno order by type, sno");
             $oceanMilestone = array();
             $airMilestone = array();
             foreach($milestones as $milestone){
@@ -975,9 +975,7 @@ class tools {
                     case when COALESCE(ni.frequency_type,'') = 'Daily'
                             then to_char(timezone(ni.daily_time_zone, ni.insert_date),'Mon DD, YYYY')
                         when COALESCE(ni.frequency_type,'') = 'Weekly' 
-                            then (select to_char(timezone(ni.weekly_time_zone, ni.insert_date) - (week - 1 || 'day')::INTERVAL,'Mon DD, YYYY')|| ' - ' || to_char(timezone(ni.weekly_time_zone, ni.insert_date) + (7-week || 'day')::INTERVAL,'Mon DD, YYYY')
-			                            from (select   case when EXTRACT(dow FROM timezone(ni.weekly_time_zone, ni.insert_date)) = 0 then 7 
-					                                else  EXTRACT(dow FROM timezone(ni.weekly_time_zone, ni.insert_date)) end as week) as a) 
+                            then to_char(date_trunc('week', ni.insert_date),'Mon DD, YYYY')|| ' - ' ||to_char((date_trunc('week', ni.insert_date) + INTERVAL '6 days'),'Mon DD, YYYY')
                         else '' 
                     end  as insert_date_format,