From dd3947298dac28774be802541ea3007c56d8e265 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Wed, 20 Dec 2023 11:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B1=87=E6=AC=BE=E5=85=91?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bill/RedemptionBillController.php | 108 +++++++++++++++ .../lists/bill/RedemptionBillLists.php | 90 +++++++++++++ .../logic/bill/RedemptionBillLogic.php | 125 ++++++++++++++++++ .../validate/bill/RedemptionBillValidate.php | 100 ++++++++++++++ app/common/model/bill/RedemptionBill.php | 67 ++++++++++ 5 files changed, 490 insertions(+) create mode 100644 app/adminapi/controller/bill/RedemptionBillController.php create mode 100644 app/adminapi/lists/bill/RedemptionBillLists.php create mode 100644 app/adminapi/logic/bill/RedemptionBillLogic.php create mode 100644 app/adminapi/validate/bill/RedemptionBillValidate.php create mode 100644 app/common/model/bill/RedemptionBill.php diff --git a/app/adminapi/controller/bill/RedemptionBillController.php b/app/adminapi/controller/bill/RedemptionBillController.php new file mode 100644 index 000000000..b5719c22e --- /dev/null +++ b/app/adminapi/controller/bill/RedemptionBillController.php @@ -0,0 +1,108 @@ +dataLists(new RedemptionBillLists()); + } + + + /** + * @notes 添加 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function add() + { + $params = (new RedemptionBillValidate())->post()->goCheck('add'); + $result = RedemptionBillLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(RedemptionBillLogic::getError()); + } + + + /** + * @notes 编辑 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function edit() + { + $params = (new RedemptionBillValidate())->post()->goCheck('edit'); + $result = RedemptionBillLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(RedemptionBillLogic::getError()); + } + + + /** + * @notes 删除 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function delete() + { + $params = (new RedemptionBillValidate())->post()->goCheck('delete'); + RedemptionBillLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function detail() + { + $params = (new RedemptionBillValidate())->goCheck('detail'); + $result = RedemptionBillLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/bill/RedemptionBillLists.php b/app/adminapi/lists/bill/RedemptionBillLists.php new file mode 100644 index 000000000..a0daea75c --- /dev/null +++ b/app/adminapi/lists/bill/RedemptionBillLists.php @@ -0,0 +1,90 @@ + ['rb.org_id', 'rb.dept_id', 'rb.acceptance_bill_id'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function lists(): array + { + return Db::name('RedemptionBill')->alias('rb') + ->where($this->searchWhere) + ->whereNull('rb.delete_time') + ->leftJoin('orgs o','o.id = rb.org_id') + ->leftJoin('dept d','d.id = rb.dept_id') + ->leftJoin('acceptance_bill ab','ab.id = rb.acceptance_bill_id') + ->field('rb.*, d.name as dept_name, o.name as org_name, ab.receipt_date, ab.bill_sn, ab.bill_type, ab.draft_acceptance_bank, ab.bill_due_date') + ->limit($this->limitOffset, $this->limitLength) + ->order(['rb.id' => 'desc']) + ->select()->each(function($item, $key){ + //关联数据后续添加 + return $item; + }) + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function count(): int + { + return Db::name('RedemptionBill')->alias('rb') + ->where($this->searchWhere) + ->whereNull('rb.delete_time') + ->leftJoin('orgs o','o.id = rb.org_id') + ->leftJoin('dept d','d.id = rb.dept_id') + ->leftJoin('acceptance_bill ab','ab.id = rb.acceptance_bill_id')->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/bill/RedemptionBillLogic.php b/app/adminapi/logic/bill/RedemptionBillLogic.php new file mode 100644 index 000000000..6ed3b142b --- /dev/null +++ b/app/adminapi/logic/bill/RedemptionBillLogic.php @@ -0,0 +1,125 @@ + $params['org_id'] ?? 0, + 'dept_id' => $params['dept_id'] ?? 0, + 'acceptance_bill_id' => $params['acceptance_bill_id'] ?? 0, + 'maturity_date' => $params['maturity_date'] ?? '', + 'amount' => $params['amount'] ?? 0, + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ?? '', + 'amount_daxie' => $params['amount_daxie'] ?? '', + ]); + + 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/20 11:01 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + RedemptionBill::where('id', $params['id'])->update([ + 'org_id' => $params['org_id'] ?? 0, + 'dept_id' => $params['dept_id'] ?? 0, + 'acceptance_bill_id' => $params['acceptance_bill_id'] ?? 0, + 'maturity_date' => $params['maturity_date'] ?? '', + 'amount' => $params['amount'] ?? 0, + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ?? '', + 'amount_daxie' => $params['amount_daxie'] ?? '', + ]); + + 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/20 11:01 + */ + public static function delete(array $params): bool + { + return RedemptionBill::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public static function detail($params): array + { + return RedemptionBill::findOrEmpty($params['id'])->toArray(); + $redemptionBill = RedemptionBill::findOrEmpty($params['id']); + $redemptionBill->org; + $redemptionBill->dept; + $redemptionBill->acceptance; + return $redemptionBill->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/bill/RedemptionBillValidate.php b/app/adminapi/validate/bill/RedemptionBillValidate.php new file mode 100644 index 000000000..fa7f1f713 --- /dev/null +++ b/app/adminapi/validate/bill/RedemptionBillValidate.php @@ -0,0 +1,100 @@ + 'require', + 'org_id' => 'require', + 'dept_id' => 'require', + 'acceptance_bill_id' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'org_id' => '组织id', + 'dept_id' => '部门id', + 'acceptance_bill_id' => '承兑汇票id', + ]; + + + /** + * @notes 添加场景 + * @return RedemptionBillValidate + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function sceneAdd() + { + return $this->only(['org_id','dept_id','acceptance_bill_id']); + } + + + /** + * @notes 编辑场景 + * @return RedemptionBillValidate + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function sceneEdit() + { + return $this->only(['id','org_id','dept_id','acceptance_bill_id']); + } + + + /** + * @notes 删除场景 + * @return RedemptionBillValidate + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return RedemptionBillValidate + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/common/model/bill/RedemptionBill.php b/app/common/model/bill/RedemptionBill.php new file mode 100644 index 000000000..65e27a86f --- /dev/null +++ b/app/common/model/bill/RedemptionBill.php @@ -0,0 +1,67 @@ +hasOne(\app\common\model\dept\Orgs::class, 'id', 'org_id'); + } + + /** + * @notes 关联dept + * @return \think\model\relation\HasOne + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function dept() + { + return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id'); + } + + /** + * @notes 关联acceptance + * @return \think\model\relation\HasOne + * @author likeadmin + * @date 2023/12/20 11:01 + */ + public function acceptance() + { + return $this->hasOne(\app\common\model\bill\AcceptanceBill::class, 'id', 'acceptance_bill_id'); + } + +} \ No newline at end of file