|
@@ -125,6 +125,7 @@ class Returns extends Start_Controller {
|
|
|
$xztime = $this->input->post('xztime',true);
|
|
$xztime = $this->input->post('xztime',true);
|
|
|
$timetk = $this->input->post('timetk',true);
|
|
$timetk = $this->input->post('timetk',true);
|
|
|
$timetj = $this->input->post('timetj',true);
|
|
$timetj = $this->input->post('timetj',true);
|
|
|
|
|
+ $whcd_status = $this->input->post('whcd_status',true);
|
|
|
$timetk = strtotime($timetk);
|
|
$timetk = strtotime($timetk);
|
|
|
$timetj = strtotime($timetj);
|
|
$timetj = strtotime($timetj);
|
|
|
$where = "(".rtrim($fgshop,'or').")";
|
|
$where = "(".rtrim($fgshop,'or').")";
|
|
@@ -177,6 +178,9 @@ class Returns extends Start_Controller {
|
|
|
{
|
|
{
|
|
|
$where .= " and torderinfo like '%$torderinfo%'";
|
|
$where .= " and torderinfo like '%$torderinfo%'";
|
|
|
}
|
|
}
|
|
|
|
|
+ if($whcd_status){
|
|
|
|
|
+ $where .= " and degreetext like '%".$whcd_status."~%' ";
|
|
|
|
|
+ }
|
|
|
if($timetk && $timetj)
|
|
if($timetk && $timetj)
|
|
|
{
|
|
{
|
|
|
$where .= " and ".$xztime." > '$timetk' and ".$xztime." < '$timetj'";
|
|
$where .= " and ".$xztime." > '$timetk' and ".$xztime." < '$timetj'";
|