code

utils/common.class.php

@@ -1334,14 +1334,14 @@ class common {
             $shipment_mode = $_shipment_mode;
             $co2e = array();
             if ($type == "co2e_orgin"){
-                $co2e_shippr_sql_union = utils::_getSql($station_str,$type,$shipment_mode);
+                $co2e_shippr_sql_union = utils::_getSql($station_str,$type,$shipment_mode,$sqlWhere);
                 if(!empty($co2e_shippr_sql_union)){
                     $co2e = common::excuteListSql($co2e_shippr_sql_union);
                 }
                 $download_name = "CO2e Emission by Origin (Top 10)";
             }
             if ($type == "co2e_destination"){
-                $co2e_consignee_union = utils::_getSql($station_str,$type,$shipment_mode);
+                $co2e_consignee_union = utils::_getSql($station_str,$type,$shipment_mode,$sqlWhere);
                 if(!empty($co2e_consignee_union)){
                     $co2e = common::excuteListSql($co2e_consignee_union);
                 }

utils/utils.class.php

@@ -569,14 +569,14 @@ class utils {
         return $flag;
     }
 
-    public static function _getSql($ids, $type,$shipment_mode) {
+    public static function _getSql($ids, $type,$shipment_mode,$sqlWhere) {
         $ids_arr = explode(',', $ids);
         $sql = "";
         if($type == "co2e_orgin"){
-            $str = "SUM(COALESCE(carbon_emission,0)::numeric(12,10)) as catnum ";
+            $str = "SUM(COALESCE(carbon_emission,0)) as catnum ";
             $filed = "shippr_uncode";
         } else {
-            $str = "SUM(COALESCE(carbon_emission,0)::numeric(12,10)) as catnum ";
+            $str = "SUM(COALESCE(carbon_emission,0)) as catnum ";
             $filed = "consignee_uncode";
         }
 
@@ -585,10 +585,11 @@ class utils {
         if($shipment_mode == "air" || $shipment_mode == "road"){
             $shipment_mode_where = " 1<>1 ";
         }
+        $shipment_mode_where .= $sqlWhere;
         foreach ($ids_arr as $value) {
             if (!empty($value)) {
                 if (empty($sql)) {
-                    $sql .= "SELECT $str FROM online_ocean  where $shipment_mode_where and $filed = '$value'";
+                    $sql .= "SELECT $str FROM online_ocean  where $shipment_mode_where  and $filed = '$value'";
                 } else {
                     $sql .= " union all SELECT $str from online_ocean  where $shipment_mode_where and $filed = '$value'";
                 }