Merge branch 'feature/inv' into develop
This commit is contained in:
@@ -61,6 +61,13 @@ class InvRequisitionService
|
|||||||
}elseif(isset($p['applicant_id']) && $p['applicant_id']){
|
}elseif(isset($p['applicant_id']) && $p['applicant_id']){
|
||||||
$config['where']['applicant_id'] = $p['applicant_id'];
|
$config['where']['applicant_id'] = $p['applicant_id'];
|
||||||
}
|
}
|
||||||
|
if(isset($p['phase']) && $p['phase'] == 'approve'){//借用审批中
|
||||||
|
$config['where']['status'] = ['in',[10,11,13]];
|
||||||
|
}elseif(isset($p['phase']) && $p['phase'] == 'repaid'){//已全部归还
|
||||||
|
$config['where']['unreturned'] = 17;
|
||||||
|
}elseif(isset($p['phase']) && $p['phase'] == 'unreturned'){ //未归还
|
||||||
|
$config['where']['status'] = ['in',[12,14,15,16,18]];
|
||||||
|
}
|
||||||
$config['order']['id'] = 'desc';
|
$config['order']['id'] = 'desc';
|
||||||
break;
|
break;
|
||||||
case 'show':
|
case 'show':
|
||||||
|
|||||||
Reference in New Issue
Block a user