code

main_new_version.php

@@ -142,7 +142,7 @@ switch ($action) {
         $sqlWhere = common::check_input($sqlWhere);
         $sqlWhere = " " . $sqlWhere;
 
-        $list = common::excuteListSql("select * from public.online_order_status_date_new_r1_r2('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text,'$data_type'::text) "
+        $list = common::excuteListSql("select * from public.online_order_status_date_new_r1_r2('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text,'$date_type'::text) "
                             . "r (c bigint, e integer, b integer, d text)");               
         $key = "[";
         $value = "[";
@@ -241,7 +241,7 @@ switch ($action) {
     case 'main_report_container_bar':
         //新UI 要ALL  20  40  45 四份数据同时查询，且是柱状图，所以与r3 r4查询分开
         $container_type_arr = array("20","40","45");
-        $container_type_param = $_REQUEST["container_type"];
+        $container_type_param = "all";
         $ContainerCounSeries = array();
 
         foreach($container_type_arr as $_container_type){
@@ -267,11 +267,11 @@ switch ($action) {
             $sqlWhere = " " . $sqlWhere;
             //如果页面查询的是ALL 这个20  40  45都查询出来。否则值查询都对应的size,其他的不查询
             if(strtolower($container_type_param) == "all"){
-                $list = common::excuteListSql("select * from public.online_order_status_date_new_r1_r2('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text, '$data_type'::text) "
+                $list = common::excuteListSql("select * from public.online_order_status_date_new_r1_r2('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text, '$date_type'::text) "
                                 . "r (c bigint, e integer, b integer, d text)");               
             }else{
                 if($container_type_param == $_container_type){
-                    $list = common::excuteListSql("select * from public.online_order_status_date_new_r1_r2('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text, '$data_type'::text) "
+                    $list = common::excuteListSql("select * from public.online_order_status_date_new_r1_r2('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text, '$date_type'::text) "
                                 . "r (c bigint, e integer, b integer, d text)");
                 }
             }