From 6a99dd3afe137bc67c81da0116e460309287b328 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Fri, 15 Dec 2023 14:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finance/FinancePaymentApplyController.php | 108 +++++++++++++ .../finance/FinancePaymentApplyLists.php | 86 +++++++++++ .../lists/finance/FinancePaymentPlanLists.php | 2 +- .../finance/FinanceReceiptRecordLists.php | 2 +- .../finance/FinancePaymentApplyLogic.php | 146 ++++++++++++++++++ .../finance/FinancePaymentApplyValidate.php | 104 +++++++++++++ .../model/finance/FinancePaymentApply.php | 42 +++++ 7 files changed, 488 insertions(+), 2 deletions(-) create mode 100644 app/adminapi/controller/finance/FinancePaymentApplyController.php create mode 100644 app/adminapi/lists/finance/FinancePaymentApplyLists.php create mode 100644 app/adminapi/logic/finance/FinancePaymentApplyLogic.php create mode 100644 app/adminapi/validate/finance/FinancePaymentApplyValidate.php create mode 100644 app/common/model/finance/FinancePaymentApply.php diff --git a/app/adminapi/controller/finance/FinancePaymentApplyController.php b/app/adminapi/controller/finance/FinancePaymentApplyController.php new file mode 100644 index 000000000..867a37a93 --- /dev/null +++ b/app/adminapi/controller/finance/FinancePaymentApplyController.php @@ -0,0 +1,108 @@ +dataLists(new FinancePaymentApplyLists()); + } + + + /** + * @notes 添加 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function add() + { + $params = (new FinancePaymentApplyValidate())->post()->goCheck('add'); + $result = FinancePaymentApplyLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(FinancePaymentApplyLogic::getError()); + } + + + /** + * @notes 编辑 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function edit() + { + $params = (new FinancePaymentApplyValidate())->post()->goCheck('edit'); + $result = FinancePaymentApplyLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(FinancePaymentApplyLogic::getError()); + } + + + /** + * @notes 删除 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function delete() + { + $params = (new FinancePaymentApplyValidate())->post()->goCheck('delete'); + FinancePaymentApplyLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function detail() + { + $params = (new FinancePaymentApplyValidate())->goCheck('detail'); + $result = FinancePaymentApplyLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinancePaymentApplyLists.php b/app/adminapi/lists/finance/FinancePaymentApplyLists.php new file mode 100644 index 000000000..bf8574a79 --- /dev/null +++ b/app/adminapi/lists/finance/FinancePaymentApplyLists.php @@ -0,0 +1,86 @@ + ['fpa.supplier_id', 'fpa.contract_id', 'fpa.pay_date', 'fpa.payment_plan_id', 'fpa.payment_natrue', 'fpa.pay_type', 'fpa.applier', 'fpa.invoice_status'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function lists(): array + { + return Db::name('FinancePaymentApply')->alias('fpa') + ->where($this->searchWhere) + ->leftJoin('procurement_contract pc','pc.id = fpa.contract_id') + ->leftJoin('project p','p.id = pc.project_id') + ->field('fpa.*, p.id as project_id, p.name as project_name, pc.contract_no') + ->limit($this->limitOffset, $this->limitLength) + ->order(['fpa.id' => 'desc']) + ->select()->each(function($item, $key){ + //关联数据 供应商后续添加 + $item['supplier_name'] = '供应商名称'; + $item['contract_type'] = '1'; + return $item; + }) + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function count(): int + { + return FinancePaymentApply::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinancePaymentPlanLists.php b/app/adminapi/lists/finance/FinancePaymentPlanLists.php index cc1b6a9c7..bb1783140 100644 --- a/app/adminapi/lists/finance/FinancePaymentPlanLists.php +++ b/app/adminapi/lists/finance/FinancePaymentPlanLists.php @@ -58,7 +58,7 @@ class FinancePaymentPlanLists extends BaseAdminDataLists implements ListsSearchI ->where($this->searchWhere) ->leftJoin('procurement_contract pc','pc.id = fpp.contract_id') ->leftJoin('project p','p.id = pc.project_id') - ->field('fpp.*, p.name, p.id as project_id, p.name as project_name, pc.contract_no') + ->field('fpp.*, p.id as project_id, p.name as project_name, pc.contract_no') ->limit($this->limitOffset, $this->limitLength) ->order(['fpp.id' => 'desc']) ->select()->each(function($item, $key){ diff --git a/app/adminapi/lists/finance/FinanceReceiptRecordLists.php b/app/adminapi/lists/finance/FinanceReceiptRecordLists.php index ffc786ca1..e002078db 100644 --- a/app/adminapi/lists/finance/FinanceReceiptRecordLists.php +++ b/app/adminapi/lists/finance/FinanceReceiptRecordLists.php @@ -59,7 +59,7 @@ class FinanceReceiptRecordLists extends BaseAdminDataLists implements ListsSearc ->where($this->searchWhere) ->leftJoin('procurement_contract pc','pc.id = frr.contract_id') ->leftJoin('project p','p.id = pc.project_id') - ->field('frr.*, p.name, p.id as project_id, p.name as project_name, pc.contract_no') + ->field('frr.*, p.id as project_id, p.name as project_name, pc.contract_no') ->limit($this->limitOffset, $this->limitLength) ->order(['frr.id' => 'desc']) ->select()->each(function($item, $key){ diff --git a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php new file mode 100644 index 000000000..6256fe5b5 --- /dev/null +++ b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php @@ -0,0 +1,146 @@ + $params['supplier_id'] ?? 0, + 'contract_id' => $params['contract_id'] ?? 0, + 'pay_date' => $params['pay_date'] ?? '', + 'period' => $params['period'] ?? 0, + 'payment_plan_id' => $params['payment_plan_id'] ?? 0, + 'payment_natrue' => $params['payment_natrue'] ?? 0, + 'pay_type' => $params['pay_type'] ?? 0, + 'applier' => $params['applier'] ?? '', + 'invoice_status' => $params['invoice_status'] ?? 0, + 'amount' => $params['amount'] ?? 0, + 'amount_daxie' => $params['amount_daxie'] ?? '', + 'desc' => $params['desc'] ?? '', + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ?? '', + 'bank' => $params['bank'] ?? '', + 'account_name' => $params['account_name'] ?? '', + 'account' => $params['account'] ?? '', + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + FinancePaymentApply::where('id', $params['id'])->update([ + 'supplier_id' => $params['supplier_id'] ?? 0, + 'contract_id' => $params['contract_id'] ?? 0, + 'pay_date' => $params['pay_date'] ?? '', + 'period' => $params['period'] ?? 0, + 'payment_plan_id' => $params['payment_plan_id'] ?? 0, + 'payment_natrue' => $params['payment_natrue'] ?? 0, + 'pay_type' => $params['pay_type'] ?? 0, + 'applier' => $params['applier'] ?? '', + 'invoice_status' => $params['invoice_status'] ?? 0, + 'amount' => $params['amount'] ?? 0, + 'amount_daxie' => $params['amount_daxie'] ?? '', + 'desc' => $params['desc'] ?? '', + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ?? '', + 'bank' => $params['bank'] ?? '', + 'account_name' => $params['account_name'] ?? '', + 'account' => $params['account'] ?? '', + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public static function delete(array $params): bool + { + return FinancePaymentApply::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public static function detail($params): array + { + $financePaymentApply = FinancePaymentApply::findOrEmpty($params['id']); + $financePaymentApply->contract; + $financePaymentApply->plan; + $financePaymentApply->project = null; + if (!empty($financePaymentApply->contract->project_id)) { + $financePaymentApply->project = Project::findOrEmpty($financePaymentApply->contract->project_id); + } + return $financePaymentApply->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/finance/FinancePaymentApplyValidate.php b/app/adminapi/validate/finance/FinancePaymentApplyValidate.php new file mode 100644 index 000000000..41ca75ed9 --- /dev/null +++ b/app/adminapi/validate/finance/FinancePaymentApplyValidate.php @@ -0,0 +1,104 @@ + 'require', + 'supplier_id' => 'require', + 'contract_id' => 'require', + 'pay_date' => 'require', + 'pay_type' => 'require', + 'amount' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'supplier_id' => '供应商id', + 'contract_id' => '合同id', + 'pay_date' => '付款日期', + 'pay_type' => '付款方式', + 'amount' => '本次申请金额', + ]; + + + /** + * @notes 添加场景 + * @return FinancePaymentApplyValidate + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function sceneAdd() + { + return $this->only(['supplier_id','contract_id','pay_date','pay_type','amount']); + } + + + /** + * @notes 编辑场景 + * @return FinancePaymentApplyValidate + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function sceneEdit() + { + return $this->only(['id','supplier_id','contract_id','pay_date','pay_type','amount']); + } + + + /** + * @notes 删除场景 + * @return FinancePaymentApplyValidate + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return FinancePaymentApplyValidate + * @author likeadmin + * @date 2023/12/15 13:47 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/common/model/finance/FinancePaymentApply.php b/app/common/model/finance/FinancePaymentApply.php new file mode 100644 index 000000000..4b36f0949 --- /dev/null +++ b/app/common/model/finance/FinancePaymentApply.php @@ -0,0 +1,42 @@ +belongsTo(\app\common\model\contract\ProcurementContract::class, 'contract_id'); + } + + public function plan() + { + return $this->hasOne(FinancePaymentPlan::class, 'id','payment_plan_id'); + } +} \ No newline at end of file