mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-05-29 11:12:58 +08:00
parent 88571803de
commit 1b4bbbfafb
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/adminapi/controller/works/finance/ExpenseController.php
View File

@ -236,13 +236,13 @@
$where[] = ['create_time','between',[strtotime($params['start_time']),strtotime($params['end_time'])]];
}
if(!empty($params['status'])){
$where[] = match ((int)$params['status']){
1=> ['check_status','=',0], //待审核
2=> ['check_status','=',1], //审核中
3=> [['check_status','=',2],['pay_admin_id','=',0],['pay_time','=',0]], //审批通过,待打款
4=> ['check_status','=',3], //审核不通过
5=> ['check_status','=',4], //撤销审核
6=> [['check_status','=',2],['pay_admin_id','>',0],['pay_time','>',0]], //审批通过,已打款
$where[] = match ($params['status']){
'1'=> ['check_status','=',0], //待审核
'2'=> ['check_status','=',1], //审核中
'3'=> [['check_status','=',2],['pay_admin_id','=',0],['pay_time','=',0]], //审批通过,待打款
'4'=> ['check_status','=',3], //审核不通过
'5'=> ['check_status','=',4], //撤销审核
'6'=> [['check_status','=',2],['pay_admin_id','>',0],['pay_time','>',0]], //审批通过,已打款
};
}else{
$where[] = ['check_status','in','0,1,2,3,4'];
@ -693,9 +693,9 @@
$where[] = ['create_time','between',[strtotime($params['start_time']),strtotime($params['end_time'])]];
}
if(!empty($params['status'])){
$where[] = match ((int)$params['status']){
1=> [['check_status','=',2],['pay_admin_id','=',0],['pay_time','=',0]], //审批通过,待打款
2=> [['check_status','=',2],['pay_admin_id','>',0],['pay_time','>',0]], //审批通过,已打款
$where[] = match ($params['status']){
'1'=> [['check_status','=',2],['pay_admin_id','=',0],['pay_time','=',0]], //审批通过,待打款
'2'=> [['check_status','=',2],['pay_admin_id','>',0],['pay_time','>',0]], //审批通过,已打款
};
}else{
$where[] = ['check_status','=',2];

24
app/adminapi/controller/works/finance/InvoiceController.php
View File

@ -169,14 +169,14 @@
$where[] = ['create_time','between',[strtotime($params['start_time']),strtotime($params['end_time'])]];
}
if(!empty($params['status'])){
$where[] = match ((int)$params['status']){
1=> ['check_status','=',0], //待审核
2=> ['check_status','=',1], //审核中
3=> [['check_status','=',2]], //审批通过,待开具
4=> ['check_status','=',3], //审核不通过
5=> ['check_status','=',4], //撤销审核
6=> [['check_status','=',5]], //审批通过,已开具
7=> [['check_status','=',10]], //已作废
$where[] = match ($params['status']){
'1'=> ['check_status','=',0], //待审核
'2'=> ['check_status','=',1], //审核中
'3'=> [['check_status','=',2]], //审批通过,待开具
'4'=> ['check_status','=',3], //审核不通过
'5'=> ['check_status','=',4], //撤销审核
'6'=> [['check_status','=',5]], //审批通过,已开具
'7'=> [['check_status','=',10]], //已作废
};
}else{
$where[] = ['check_status','in','0,1,2,3,4,5,10'];
@ -680,10 +680,10 @@
$where[] = ['create_time','between',[strtotime($params['start_time']),strtotime($params['end_time'])]];
}
if(!empty($params['status'])){
$where[] = match ((int)$params['status']){
1=> ['check_status','=',2], //审批通过,待开具
2=> ['check_status','=',5], //审批通过,已开具
3=> [['check_status','=',10]], //已作废
$where[] = match ($params['status']){
'1'=> ['check_status','=',2], //审批通过,待开具
'2'=> ['check_status','=',5], //审批通过,已开具
'3'=> [['check_status','=',10]], //已作废
};
}else{
$where[] = ['check_status','in','2,5,10'];