|
@@ -33,13 +33,10 @@ class flow_sealaplClassModel extends flowModel
|
|
|
//单据判断条件从写$lx类型,$uid用户Id
|
|
|
protected function flowbillwhere($lx, $uid){
|
|
|
$where = '';
|
|
|
-// $this->rock->post('key');
|
|
|
|
|
|
$startDate = $this->rock->post("start_date");
|
|
|
$stopDate = $this->rock->post("stop_date");
|
|
|
-// $status = $this->rock->post("status") ?? null;
|
|
|
-// $export_type = $this->rock->post("export_type");
|
|
|
-//
|
|
|
+
|
|
|
if ($uid == 'all') {
|
|
|
$where .= 'and '.$this->adminid.' in (1, 28)';
|
|
|
}
|
|
@@ -47,12 +44,11 @@ class flow_sealaplClassModel extends flowModel
|
|
|
if (!empty($startDate)) {
|
|
|
$where .= " and office_date > '{$startDate}'";
|
|
|
}
|
|
|
-// // 结束时间
|
|
|
-// if (!empty($stopDate)) {
|
|
|
-// $where .= " and office_date < '{$stopDate}'";
|
|
|
-// }
|
|
|
-// // 审核完成
|
|
|
-// $where .= " and status = 1";
|
|
|
+ // 结束时间
|
|
|
+ if (!empty($stopDate)) {
|
|
|
+ $where .= " and office_date < '{$stopDate}'";
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
return [
|
|
|
'where' => $where,
|