|
@@ -539,6 +539,7 @@ class Returns extends Start_Controller {
|
|
|
$number = $this->input->get('number',true);
|
|
$number = $this->input->get('number',true);
|
|
|
$torderinfo = $this->input->get('torderinfo',true);
|
|
$torderinfo = $this->input->get('torderinfo',true);
|
|
|
$region = $this->input->get('region',true);
|
|
$region = $this->input->get('region',true);
|
|
|
|
|
+ $xztime = $this->input->post('xztime',true);
|
|
|
$timetk = strtotime($timetk);
|
|
$timetk = strtotime($timetk);
|
|
|
$timetj = strtotime($timetj);
|
|
$timetj = strtotime($timetj);
|
|
|
$dowid = $this->input->get('a');
|
|
$dowid = $this->input->get('a');
|
|
@@ -557,7 +558,7 @@ class Returns extends Start_Controller {
|
|
|
$where = "1=1 and (".$fgshop." shop = '0')";
|
|
$where = "1=1 and (".$fgshop." shop = '0')";
|
|
|
if($timetk && $timetj)
|
|
if($timetk && $timetj)
|
|
|
{
|
|
{
|
|
|
- $where .= " and time > '$timetk' and time < '$timetj'";
|
|
|
|
|
|
|
+ $where .= " and ".$xztime." > '$timetk' and ".$xztime." < '$timetj' ";
|
|
|
}
|
|
}
|
|
|
if($shop)
|
|
if($shop)
|
|
|
{
|
|
{
|
