|
@@ -2634,17 +2634,12 @@ class Transfer extends Start_Controller {
|
|
|
$this->_Template('transfer_wjsrk',$this->data);
|
|
|
}
|
|
|
public function _wjsrkexcel(){
|
|
|
- $api = $this->input->post('api',true);
|
|
|
- $page = $this->input->post('page',true);
|
|
|
- $perpage = $this->input->post('perpage',true);
|
|
|
-
|
|
|
- $transfer = $this->input->post('transfer',true);
|
|
|
- $transfer_ids = $this->input->post('transfer_ids',true);
|
|
|
+ $api = $this->input->get('api',true);
|
|
|
|
|
|
- $orver_flag = $this->input->post('orver_flag',true);
|
|
|
-
|
|
|
- $timetk = $this->input->post('timetk',true);
|
|
|
- $timetj = $this->input->post('timetj',true);
|
|
|
+ $transfer = $this->input->get('transfer',true);
|
|
|
+
|
|
|
+ $timetk = $this->input->get('timetk',true);
|
|
|
+ $timetj = $this->input->get('timetj',true);
|
|
|
$timetk = strtotime($timetk);
|
|
|
$timetj = strtotime($timetj);
|
|
|
|
|
@@ -2655,15 +2650,7 @@ class Transfer extends Start_Controller {
|
|
|
|
|
|
//数据排序
|
|
|
$order_str = "id desc";
|
|
|
- if(empty($page))
|
|
|
- {
|
|
|
- $start = 0;
|
|
|
- $perpage = 1;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- $start = ($page - 1)*$perpage;
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
if($transfer){
|
|
|
$where .= " and lx = '$transfer'";
|
|
@@ -2671,13 +2658,14 @@ class Transfer extends Start_Controller {
|
|
|
$transfer = $this->transfer->find_all('id not in (8,9,11,12,15,16)');
|
|
|
$transfer_ids = array_column($transfer, 'id');
|
|
|
$transfer_ids = implode(",",$transfer_ids);
|
|
|
- $where .= " and lx in (".$transfer_ids.") ";
|
|
|
+ $where .= " and lx in (".$transfer_ids.") ";
|
|
|
}
|
|
|
|
|
|
+
|
|
|
$where .= " and time > '$timetk' and time < '$timetj'";
|
|
|
|
|
|
- $list = $this->systemtransfer_cr->find_all($where,'*',$order_str,$start,$perpage);
|
|
|
-
|
|
|
+ $list = $this->systemtransfer_cr->find_all($where,'*',$order_str);
|
|
|
+
|
|
|
$final_list = [];
|
|
|
foreach ($list as $key => $value) {
|
|
|
|