|
|
|
@ -185,7 +185,8 @@ class Orders_model extends CI_Model {
|
|
|
|
|
LEFT JOIN BIZ_ConfirmLineDetail cold ON cold.COLD_COLI_SN=coli.COLI_SN
|
|
|
|
|
where
|
|
|
|
|
GCI_combineNo is not null and GCI_combineNo not in ('cancel','forbidden')
|
|
|
|
|
and GCI_travelDate between '2018-06-01' and '2018-06-30 23:59:59'
|
|
|
|
|
and GCI_leaveDate < '" . date('Y-m-d', strtotime("-7 days")) . "'
|
|
|
|
|
and gci.GCI_createTime < '" . date('Y-m-d') . "'
|
|
|
|
|
and GCI_combineNo not like '%取消%'
|
|
|
|
|
";
|
|
|
|
|
$sql .= " ORDER BY isHistory ASC,GCI_createTime ASC ";
|
|
|
|
|