|
|
@ -148,7 +148,11 @@ class Orders_model extends CI_Model {
|
|
|
|
$sql .= " and GCI_VendorOrderId='$get_vendorID' ";
|
|
|
|
$sql .= " and GCI_VendorOrderId='$get_vendorID' ";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ($startDate !== NULL) {
|
|
|
|
if ($startDate !== NULL) {
|
|
|
|
$sql .= " and gci.GCI_travelDate between '$startDate' and '$endDate'
|
|
|
|
$sql .= " and (
|
|
|
|
|
|
|
|
gci.GCI_travelDate between '$startDate' and '$endDate'
|
|
|
|
|
|
|
|
OR
|
|
|
|
|
|
|
|
CONVERT(DATE, COLI_ApplyDate) = CONVERT(DATE, GETDATE())
|
|
|
|
|
|
|
|
)
|
|
|
|
and gci.GCI_createTime < '" . date($createTime_format) . "' ";
|
|
|
|
and gci.GCI_createTime < '" . date($createTime_format) . "' ";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 近期的订单同步完成之后, 同步历史数据
|
|
|
|
// 近期的订单同步完成之后, 同步历史数据
|
|
|
|