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-03-28 11:13:22 +08:00
parent ab005f90c1
commit 32b287b856
2 changed files with 266 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/adminapi/lists/project/ProjectExpenseReimbursementInvoiceDetailLists.php
View File

@ -12,25 +12,24 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\project; namespace app\adminapi\lists\project;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExcelInterface;
use app\common\model\project\Project; use app\common\lists\ListsSearchInterface;
use app\common\model\project\ProjectExpenseReimbursement; use app\common\model\project\Project;
use app\common\model\project\ProjectExpenseReimbursementInvoiceDetail; use app\common\model\project\ProjectExpenseReimbursement;
use app\common\lists\ListsSearchInterface; use app\common\model\project\ProjectExpenseReimbursementInvoiceDetail;
use think\helper\Str;
/** /**
* 发票明细列表 * 发票明细列表
* Class ProjectExpenseReimbursementInvoiceDetailLists * Class ProjectExpenseReimbursementInvoiceDetailLists
* @package app\adminapi\listsproject * @package app\adminapi\listsproject
*/ */
class ProjectExpenseReimbursementInvoiceDetailLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface class ProjectExpenseReimbursementInvoiceDetailLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
{ {
/** /**
@ -59,24 +58,24 @@ class ProjectExpenseReimbursementInvoiceDetailLists extends BaseAdminDataLists i
*/ */
public function lists(): array public function lists(): array
{ {
$params = $this->request->get(['expense_reimbursement_code','project_code']); $params = $this->request->get(['expense_reimbursement_code', 'project_code']);
$where = []; $where = [];
if(isset($params['expense_reimbursement_code']) && $params['expense_reimbursement_code']){ if (isset($params['expense_reimbursement_code']) && $params['expense_reimbursement_code']) {
$expense_reimbursement_ids = ProjectExpenseReimbursement::where('expense_reimbursement_code','like','%'.$params['expense_reimbursement_code'].'%')->column('id'); $expense_reimbursement_ids = ProjectExpenseReimbursement::where('expense_reimbursement_code', 'like', '%' . $params['expense_reimbursement_code'] . '%')->column('id');
$where[] = ['expense_reimbursement_id','in',$expense_reimbursement_ids]; $where[] = ['expense_reimbursement_id', 'in', $expense_reimbursement_ids];
} }
if(isset($params['project_code']) && $params['project_code']){ if (isset($params['project_code']) && $params['project_code']) {
$project_ids = Project::where('project_code','like','%'.$params['project_code'].'%')->column('id'); $project_ids = Project::where('project_code', 'like', '%' . $params['project_code'] . '%')->column('id');
$expense_reimbursement_ids = ProjectExpenseReimbursement::where('project_id','in',$project_ids)->column('id'); $expense_reimbursement_ids = ProjectExpenseReimbursement::where('project_id', 'in', $project_ids)->column('id');
$where[] = ['expense_reimbursement_id','in',$expense_reimbursement_ids]; $where[] = ['expense_reimbursement_id', 'in', $expense_reimbursement_ids];
} }
return ProjectExpenseReimbursementInvoiceDetail::where($this->searchWhere)->where($where) return ProjectExpenseReimbursementInvoiceDetail::where($this->searchWhere)->where($where)
->field(['id', 'expense_reimbursement_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'invoice_amount', 'tax_amount', 'remark']) ->field(['id', 'expense_reimbursement_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'invoice_amount', 'tax_amount', 'remark', 'annex'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($data){ ->select()->each(function ($data) {
$expense_reimbursement = ProjectExpenseReimbursement::field('expense_reimbursement_code,project_id,apply_user,apply_date')->where('id',$data['expense_reimbursement_id'])->findOrEmpty(); $expense_reimbursement = ProjectExpenseReimbursement::field('expense_reimbursement_code,project_id,apply_user,apply_date')->where('id', $data['expense_reimbursement_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id',$expense_reimbursement['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id', $expense_reimbursement['project_id'])->findOrEmpty();
$data['expense_reimbursement_code'] = $expense_reimbursement['expense_reimbursement_code']; $data['expense_reimbursement_code'] = $expense_reimbursement['expense_reimbursement_code'];
$data['project_name'] = $project['name']; $data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code']; $data['project_code'] = $project['project_code'];
@ -102,16 +101,16 @@ class ProjectExpenseReimbursementInvoiceDetailLists extends BaseAdminDataLists i
*/ */
public function count(): int public function count(): int
{ {
$params = $this->request->get(['expense_reimbursement_code','project_code']); $params = $this->request->get(['expense_reimbursement_code', 'project_code']);
$where = []; $where = [];
if(isset($params['expense_reimbursement_code']) && $params['expense_reimbursement_code']){ if (isset($params['expense_reimbursement_code']) && $params['expense_reimbursement_code']) {
$expense_reimbursement_ids = ProjectExpenseReimbursement::where('expense_reimbursement_code','like','%'.$params['expense_reimbursement_code'].'%')->column('id'); $expense_reimbursement_ids = ProjectExpenseReimbursement::where('expense_reimbursement_code', 'like', '%' . $params['expense_reimbursement_code'] . '%')->column('id');
$where[] = ['expense_reimbursement_id','in',$expense_reimbursement_ids]; $where[] = ['expense_reimbursement_id', 'in', $expense_reimbursement_ids];
} }
if(isset($params['project_code']) && $params['project_code']){ if (isset($params['project_code']) && $params['project_code']) {
$project_ids = Project::where('project_code','like','%'.$params['project_code'].'%')->column('id'); $project_ids = Project::where('project_code', 'like', '%' . $params['project_code'] . '%')->column('id');
$expense_reimbursement_ids = ProjectExpenseReimbursement::where('project_id','in',$project_ids)->column('id'); $expense_reimbursement_ids = ProjectExpenseReimbursement::where('project_id', 'in', $project_ids)->column('id');
$where[] = ['expense_reimbursement_id','in',$expense_reimbursement_ids]; $where[] = ['expense_reimbursement_id', 'in', $expense_reimbursement_ids];
} }
return ProjectExpenseReimbursementInvoiceDetail::where($this->searchWhere)->where($where)->count(); return ProjectExpenseReimbursementInvoiceDetail::where($this->searchWhere)->where($where)->count();
} }
@ -143,4 +142,4 @@ class ProjectExpenseReimbursementInvoiceDetailLists extends BaseAdminDataLists i
]; ];
} }
} }

82
app/adminapi/lists/project/ProjectTravelReimbursementInvoiceDetailLists.php
View File

@ -12,25 +12,25 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\project; namespace app\adminapi\lists\project;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExcelInterface;
use app\common\model\project\Project; use app\common\lists\ListsSearchInterface;
use app\common\model\project\ProjectTravelReimbursement; use app\common\model\project\Project;
use app\common\model\project\ProjectTravelReimbursementInvoiceDetail; use app\common\model\project\ProjectTravelReimbursement;
use app\common\lists\ListsSearchInterface; use app\common\model\project\ProjectTravelReimbursementInvoiceDetail;
use app\common\model\project\ProjectTripApply; use app\common\model\project\ProjectTripApply;
/** /**
* 发票明细列表 * 发票明细列表
* Class ProjectTravelReimbursementInvoiceDetailLists * Class ProjectTravelReimbursementInvoiceDetailLists
* @package app\adminapi\listsproject * @package app\adminapi\listsproject
*/ */
class ProjectTravelReimbursementInvoiceDetailLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface class ProjectTravelReimbursementInvoiceDetailLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
{ {
/** /**
@ -59,30 +59,30 @@ class ProjectTravelReimbursementInvoiceDetailLists extends BaseAdminDataLists im
*/ */
public function lists(): array public function lists(): array
{ {
$params = $this->request->get(['trip_reimbursement_code','project_code','trip_apply_code']); $params = $this->request->get(['trip_reimbursement_code', 'project_code', 'trip_apply_code']);
$where = []; $where = [];
if(isset($params['trip_reimbursement_code']) && $params['trip_reimbursement_code']){ if (isset($params['trip_reimbursement_code']) && $params['trip_reimbursement_code']) {
$travel_reimbursement_ids = ProjectTravelReimbursement::where('trip_reimbursement_code','like','%'.$params['trip_reimbursement_code'].'%')->column('id'); $travel_reimbursement_ids = ProjectTravelReimbursement::where('trip_reimbursement_code', 'like', '%' . $params['trip_reimbursement_code'] . '%')->column('id');
$where[] = ['travel_reimbursement_id','in',$travel_reimbursement_ids]; $where[] = ['travel_reimbursement_id', 'in', $travel_reimbursement_ids];
} }
if(isset($params['project_code']) && $params['project_code']){ if (isset($params['project_code']) && $params['project_code']) {
$project_ids = Project::where('project_code','like','%'.$params['project_code'].'%')->column('id'); $project_ids = Project::where('project_code', 'like', '%' . $params['project_code'] . '%')->column('id');
$travel_reimbursement_ids = ProjectTravelReimbursement::where('project_id','in',$project_ids)->column('id'); $travel_reimbursement_ids = ProjectTravelReimbursement::where('project_id', 'in', $project_ids)->column('id');
$where[] = ['travel_reimbursement_id','in',$travel_reimbursement_ids]; $where[] = ['travel_reimbursement_id', 'in', $travel_reimbursement_ids];
} }
if(isset($params['trip_apply_code']) && $params['trip_apply_code']){ if (isset($params['trip_apply_code']) && $params['trip_apply_code']) {
$trip_apply_ids = ProjectTripApply::where('trip_apply_code','like','%'.$params['trip_apply_code'].'%')->column('id'); $trip_apply_ids = ProjectTripApply::where('trip_apply_code', 'like', '%' . $params['trip_apply_code'] . '%')->column('id');
$travel_reimbursement_ids = ProjectTravelReimbursement::where('trip_apply_id','in',$trip_apply_ids)->column('id'); $travel_reimbursement_ids = ProjectTravelReimbursement::where('trip_apply_id', 'in', $trip_apply_ids)->column('id');
$where[] = ['travel_reimbursement_id','in',$travel_reimbursement_ids]; $where[] = ['travel_reimbursement_id', 'in', $travel_reimbursement_ids];
} }
return ProjectTravelReimbursementInvoiceDetail::where($this->searchWhere)->where($where) return ProjectTravelReimbursementInvoiceDetail::where($this->searchWhere)->where($where)
->field(['id', 'travel_reimbursement_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'invoice_amount', 'tax_amount', 'remark']) ->field(['id', 'travel_reimbursement_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'invoice_amount', 'tax_amount', 'remark', 'annex'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($data){ ->select()->each(function ($data) {
$travel_reimbursement = ProjectTravelReimbursement::field('trip_reimbursement_code,trip_apply_id,project_id,apply_user,apply_date')->where('id',$data['travel_reimbursement_id'])->findOrEmpty(); $travel_reimbursement = ProjectTravelReimbursement::field('trip_reimbursement_code,trip_apply_id,project_id,apply_user,apply_date')->where('id', $data['travel_reimbursement_id'])->findOrEmpty();
$trip_apply = ProjectTripApply::field('trip_apply_code')->where('id',$travel_reimbursement['trip_apply_id'])->findOrEmpty(); $trip_apply = ProjectTripApply::field('trip_apply_code')->where('id', $travel_reimbursement['trip_apply_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id',$travel_reimbursement['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id', $travel_reimbursement['project_id'])->findOrEmpty();
$data['trip_apply_code'] = $trip_apply['trip_apply_code']; $data['trip_apply_code'] = $trip_apply['trip_apply_code'];
$data['project_name'] = $project['name']; $data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code']; $data['project_code'] = $project['project_code'];
@ -109,21 +109,21 @@ class ProjectTravelReimbursementInvoiceDetailLists extends BaseAdminDataLists im
*/ */
public function count(): int public function count(): int
{ {
$params = $this->request->get(['trip_reimbursement_code','project_code','trip_apply_code']); $params = $this->request->get(['trip_reimbursement_code', 'project_code', 'trip_apply_code']);
$where = []; $where = [];
if(isset($params['trip_reimbursement_code']) && $params['trip_reimbursement_code']){ if (isset($params['trip_reimbursement_code']) && $params['trip_reimbursement_code']) {
$travel_reimbursement_ids = ProjectTravelReimbursement::where('trip_reimbursement_code','like','%'.$params['trip_reimbursement_code'].'%')->column('id'); $travel_reimbursement_ids = ProjectTravelReimbursement::where('trip_reimbursement_code', 'like', '%' . $params['trip_reimbursement_code'] . '%')->column('id');
$where[] = ['travel_reimbursement_id','in',$travel_reimbursement_ids]; $where[] = ['travel_reimbursement_id', 'in', $travel_reimbursement_ids];
} }
if(isset($params['project_code']) && $params['project_code']){ if (isset($params['project_code']) && $params['project_code']) {
$project_ids = Project::where('project_code','like','%'.$params['project_code'].'%')->column('id'); $project_ids = Project::where('project_code', 'like', '%' . $params['project_code'] . '%')->column('id');
$travel_reimbursement_ids = ProjectTravelReimbursement::where('project_id','in',$project_ids)->column('id'); $travel_reimbursement_ids = ProjectTravelReimbursement::where('project_id', 'in', $project_ids)->column('id');
$where[] = ['travel_reimbursement_id','in',$travel_reimbursement_ids]; $where[] = ['travel_reimbursement_id', 'in', $travel_reimbursement_ids];
} }
if(isset($params['trip_apply_code']) && $params['trip_apply_code']){ if (isset($params['trip_apply_code']) && $params['trip_apply_code']) {
$trip_apply_ids = ProjectTripApply::where('trip_apply_code','like','%'.$params['trip_apply_code'].'%')->column('id'); $trip_apply_ids = ProjectTripApply::where('trip_apply_code', 'like', '%' . $params['trip_apply_code'] . '%')->column('id');
$travel_reimbursement_ids = ProjectTravelReimbursement::where('trip_apply_id','in',$trip_apply_ids)->column('id'); $travel_reimbursement_ids = ProjectTravelReimbursement::where('trip_apply_id', 'in', $trip_apply_ids)->column('id');
$where[] = ['travel_reimbursement_id','in',$travel_reimbursement_ids]; $where[] = ['travel_reimbursement_id', 'in', $travel_reimbursement_ids];
} }
return ProjectTravelReimbursementInvoiceDetail::where($this->searchWhere)->where($where)->count(); return ProjectTravelReimbursementInvoiceDetail::where($this->searchWhere)->where($where)->count();
} }
@ -154,4 +154,4 @@ class ProjectTravelReimbursementInvoiceDetailLists extends BaseAdminDataLists im
]; ];
} }
} }