|
@@ -54,8 +54,10 @@ class Payment extends BaseController
|
|
|
// if($check){
|
|
|
// $condition .=" and `a`.`apply_id` = {$this->uid}";
|
|
|
// }
|
|
|
- $startTime= isset($post['startTime'])&&$post['startTime']!="" ? trim($post['startTime']) :"";
|
|
|
- $endTime= isset($post['endTime'])&&$post['endTime']!="" ? trim($post['endTime']) :"";
|
|
|
+ $startTime= isset($post['startTime'])&&$post['startTime']!="" ? date("Y-m-d 00:00:00",strtotime($post['startTime']))
|
|
|
+ :"";
|
|
|
+ $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['startTime']))
|
|
|
+ :"";
|
|
|
$supplierNo= isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
|
|
|
$companyNo= isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
|
|
|
|
|
@@ -143,8 +145,10 @@ class Payment extends BaseController
|
|
|
if($check){
|
|
|
$condition[]=["apply_id","=",$this->uid];
|
|
|
}
|
|
|
- $startTime= isset($post['startTime'])&&$post['startTime']!="" ? trim($post['startTime']) :"";
|
|
|
- $endTime= isset($post['endTime'])&&$post['endTime']!="" ? trim($post['endTime']) :"";
|
|
|
+ $startTime= isset($post['startTime'])&&$post['startTime']!="" ? date("Y-m-d 00:00:00",strtotime($post['startTime']))
|
|
|
+ :"";
|
|
|
+ $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['startTime']))
|
|
|
+ :"";
|
|
|
$supplierNo= isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
|
|
|
$payNo= isset($post['payNo'])&&$post['payNo']!="" ? trim($post['payNo']) :"";
|
|
|
$paystatus= isset($post['pay_status'])&&$post['pay_status']!="" ? $post['pay_status'] :"";
|
|
@@ -158,10 +162,10 @@ class Payment extends BaseController
|
|
|
if($tag_id==4) $condition[]=["pay_tag&inv_tag","=",1];
|
|
|
}
|
|
|
if($startTime!=""){
|
|
|
- $condition[]=["addtime",">=",$startTime." 00:00:00"];
|
|
|
+ $condition[]=["addtime",">=",$startTime];
|
|
|
}
|
|
|
if($endTime!=""){
|
|
|
- $condition[]=["addtime","<=",$endTime." 23:59:59"];
|
|
|
+ $condition[]=["addtime","<=",$endTime];
|
|
|
}
|
|
|
|
|
|
if($supplierNo!=""){
|