|
|
@ -2253,9 +2253,9 @@ class ExportController extends Controller
|
|
|
|
|
|
|
|
|
|
|
|
if(!empty(I('get.extend'))) {
|
|
|
|
if(!empty(I('get.extend'))) {
|
|
|
|
$map['tab_spend.extend'] = I('get.extend');
|
|
|
|
$map['tab_spend.extend'] = I('get.extend');
|
|
|
|
$data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->page($p, $row)->order('tab_repair_pay.id DESC')->select();
|
|
|
|
$data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->order('tab_repair_pay.id DESC')->select();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
$data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->order('id DESC')->select();
|
|
|
|
$data = M('repair_pay', 'tab_')->where($map)->order('id DESC')->select();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$xlsData = [];
|
|
|
|
$xlsData = [];
|
|
|
|