|
|
@@ -613,7 +613,7 @@ class Export extends BaseController
|
|
|
|
|
|
$where = [];
|
|
|
|
|
|
- if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.createdTime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
|
|
|
+ if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['createdTime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
|
|
|
if ($param['companyNo'] != '') $where[] = ['companyNo', '=', $param['companyNo']];
|
|
|
if ($param['supplierNo'] != '') $where[] = ['supplierNo', '=', $param['supplierNo']];
|
|
|
$data = Db::name("cgd_info")->where($where)
|
|
|
@@ -674,7 +674,7 @@ class Export extends BaseController
|
|
|
|
|
|
$where = [["is_del","=",0],["status","=",2]];
|
|
|
|
|
|
- if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.createdTime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
|
|
|
+ if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['addtime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
|
|
|
if ($param['companyNo'] != '') $where[] = ['companyNo', '=', $param['companyNo']];
|
|
|
if ($param['supplierNo'] != '') $where[] = ['supplierNo', '=', $param['supplierNo']];
|
|
|
$data=Db::name("pay")->where($where)
|
