|
|
@@ -850,13 +850,13 @@ class ocean_order {
|
|
|
$transport_mode = array($transport_mode);
|
|
|
}
|
|
|
if((utils::count($transport_mode) == 1 && strtolower($transport_mode[0]) == 'all')){
|
|
|
- $transport_mode = array("sea","air","road");
|
|
|
+ $transport_mode = array("sea","air","road","rail");
|
|
|
}
|
|
|
$transport_mode = utils::implode(";",$transport_mode);
|
|
|
|
|
|
$mode_param = common::getInNotInSqlForSearch($transport_mode);
|
|
|
- $sqlWhere .= " and transport_mode in ($mode_param)";
|
|
|
- $transport_mode_search = " and transport_mode in ($mode_param)";
|
|
|
+ $sqlWhere .= " and transport_mode_extend in ($mode_param)";
|
|
|
+ $transport_mode_search = " and transport_mode_extend in ($mode_param)";
|
|
|
|
|
|
//查询tag
|
|
|
// IFFBCF Booking Confirmation Created
|
|
|
@@ -914,8 +914,10 @@ class ocean_order {
|
|
|
//这里都要查询,除非多传几个参数回来
|
|
|
if ($rc == - 1 || true) {
|
|
|
$sql = "select count(1) as rc,
|
|
|
- sum(case when (1<>1 or (transport_mode='sea')) then 1 else 0 end) as sea_rc,
|
|
|
- sum(case when (1<>1 or (transport_mode='air')) then 1 else 0 end) as air_rc,
|
|
|
+ sum(case when (1<>1 or (transport_mode_extend='sea')) then 1 else 0 end) as sea_rc,
|
|
|
+ sum(case when (1<>1 or (transport_mode_extend='air')) then 1 else 0 end) as air_rc,
|
|
|
+ sum(case when (1<>1 or (transport_mode_extend='road')) then 1 else 0 end) as road_rc,
|
|
|
+ sum(case when (1<>1 or (transport_mode_extend='rail')) then 1 else 0 end) as rail_rc,
|
|
|
sum(case when $tag_and_mode_param then 1 else 0 end) as seach_rc,
|
|
|
sum(case when (m_iffcpu is null and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffdel is null)
|
|
|
then 1 else 0 end)
|
|
|
@@ -951,6 +953,8 @@ class ocean_order {
|
|
|
$search_rc = $sql_all_status_data['seach_rc'];
|
|
|
$sea_rc = $sql_all_status_data['sea_rc'];
|
|
|
$air_rc = $sql_all_status_data['air_rc'];
|
|
|
+ $road_rc = $sql_all_status_data['road_rc'];
|
|
|
+ $rail_rc = $sql_all_status_data['rail_rc'];
|
|
|
$Created = $sql_all_status_data['created'];
|
|
|
$Cargo_Received = $sql_all_status_data['cargo_received'];
|
|
|
$Departed = $sql_all_status_data['departed'];
|