code11/6

main_new_version.php

@@ -84,7 +84,7 @@ switch ($action) {
         $sqlWhere = " " . $sqlWhere;
         //online_order_status_date_new 与本地的区分，发布上去这去掉new
         $list = common::excuteListSql("select * from public.online_order_status_date('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text) "
-                        . "r (c bigint, e integer, b integer, d text)");
+                        . "r (c bigint, e integer, b integer, d text)");               
         $key = "[";
         $value = "[";
         $totalValue = 0;
@@ -208,7 +208,7 @@ switch ($action) {
             //如果页面查询的是ALL 这个20  40  45都查询出来。否则值查询都对应的size,其他的不查询
             if(strtolower($container_type_param) == "all"){
                 $list = common::excuteListSql("select * from public.online_order_status_date('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text) "
-                                . "r (c bigint, e integer, b integer, d 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('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text) "

utils/common.class.php

@@ -1281,7 +1281,7 @@ class common {
         // where 1=1 and COALESCE(shippr_uncode)<>'' $sqlWhere group by shippr_uncode order by num desc limit 10";
         $shippr_uncode_10_sql ="with aa as  (select count(shippr_uncode) as num,shippr_uncode,
                                 (array_agg(shipper_city))[1] AS shipper_city from online_ocean  
-                        where 1=1 and COALESCE(shippr_uncode)<>'' and $sqlWhere group by shippr_uncode order by num desc limit 10)
+                        where 1=1 and COALESCE(shippr_uncode)<>'' $sqlWhere group by shippr_uncode order by num desc limit 10)
             select   aa.*,dd.* from  aa  
             left join LATERAL ( select lon as lng, lat as lat,
                 '' as label, '' as infor, 3 as sort,
@@ -1297,7 +1297,7 @@ class common {
                         left join LATERAL ( select lon as lng, lat as lat,
                             '' as label, '' as infor, 3 as sort,
                             null::timestamp without time zone as stime,''::text as ptype 
-                        from vessel.vt_unlocode where lon<>0 and lat<>0 and lon is not null and lat is not null and uncode=aa.shippr_uncode ) dd on true";
+                        from vessel.vt_unlocode where lon<>0 and lat<>0 and lon is not null and lat is not null and uncode=aa.fport_of_loading_un ) dd on true";
             $shippr_uncode_10 = common::excuteListSql($shippr_uncode_10_sql);
         }
         //$toporiginType = "fport_of_loading_un";
@@ -1324,7 +1324,7 @@ class common {
                 left join LATERAL ( select lon as lng, lat as lat,
                     '' as label, '' as infor, 3 as sort,
                     null::timestamp without time zone as stime,''::text as ptype 
-                from vessel.vt_unlocode where lon<>0 and lat<>0 and lon is not null and lat is not null and uncode=aa.consignee_uncode ) dd on true";
+                from vessel.vt_unlocode where lon<>0 and lat<>0 and lon is not null and lat is not null and uncode=aa.mport_of_discharge_un ) dd on true";
             $consignee_uncode_10 = common::excuteListSql($consignee_uncode_10_sql);
         }