From 0ee3af092f776a852fb6601b2885a93d0b6bcf51 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Thu, 21 Mar 2024 11:30:57 +0800 Subject: [PATCH] update --- .../finance/FinanceInvoiceApplyController.php | 2 +- .../finance/FinancePaymentApplyController.php | 2 +- .../finance/FinancePaymentPlanController.php | 2 +- .../FinanceReceiptRecordController.php | 2 +- .../finance/FinanceRefundApplyController.php | 2 +- .../finance/FinanceRefundRecordController.php | 2 +- .../FinanceReturnedMoneyController.php | 2 +- .../FinanceReturnedRecordController.php | 2 +- app/adminapi/lists/bank/BankAccountLists.php | 12 ++------ .../finance/FinanceInvoiceApplyLists.php | 4 +-- app/adminapi/logic/bank/BankAccountLogic.php | 10 +------ .../finance/FinanceInvoiceApplyLogic.php | 4 +-- .../finance/FinancePaymentApplyLogic.php | 4 +-- .../logic/finance/FinancePaymentPlanLogic.php | 4 +-- .../finance/FinanceReceiptRecordLogic.php | 4 +-- .../logic/finance/FinanceRefundApplyLogic.php | 4 +-- .../finance/FinanceRefundRecordLogic.php | 4 +-- .../finance/FinanceReturnedMoneyLogic.php | 4 +-- .../finance/FinanceReturnedRecordLogic.php | 4 +-- .../validate/bank/BankAccountValidate.php | 28 ------------------- .../validate/bid/BidSecurityApplyValidate.php | 12 +------- .../bid/BidSecurityRefundValidate.php | 12 +------- .../finance/FinanceInvoiceApplyValidate.php | 12 +------- .../finance/FinancePaymentApplyValidate.php | 12 +------- .../finance/FinancePaymentPlanValidate.php | 12 +------- .../finance/FinanceReceiptRecordValidate.php | 12 +------- .../finance/FinanceRefundApplyValidate.php | 12 +------- .../finance/FinanceRefundRecordValidate.php | 2 +- .../finance/FinanceReturnedMoneyValidate.php | 14 ++-------- .../finance/FinanceReturnedRecordValidate.php | 12 +------- app/common/model/bid/BidSecurityApply.php | 4 --- app/common/model/bid/BidSecurityRefund.php | 4 --- .../model/finance/FinanceInvoiceApply.php | 4 --- .../model/finance/FinancePaymentApply.php | 4 --- .../model/finance/FinancePaymentPlan.php | 4 --- .../model/finance/FinanceReceiptRecord.php | 4 --- .../model/finance/FinanceRefundApply.php | 4 --- .../model/finance/FinanceRefundRecord.php | 4 --- .../model/finance/FinanceReturnedMoney.php | 4 --- .../model/finance/FinanceReturnedRecord.php | 4 --- 40 files changed, 40 insertions(+), 214 deletions(-) diff --git a/app/adminapi/controller/finance/FinanceInvoiceApplyController.php b/app/adminapi/controller/finance/FinanceInvoiceApplyController.php index 09f7c81b8..d14797ed1 100644 --- a/app/adminapi/controller/finance/FinanceInvoiceApplyController.php +++ b/app/adminapi/controller/finance/FinanceInvoiceApplyController.php @@ -54,7 +54,7 @@ class FinanceInvoiceApplyController extends BaseAdminController public function add() { $params = (new FinanceInvoiceApplyValidate())->post()->goCheck('add'); - $result = FinanceInvoiceApplyLogic::add($params,$this->adminId); + $result = FinanceInvoiceApplyLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/controller/finance/FinancePaymentApplyController.php b/app/adminapi/controller/finance/FinancePaymentApplyController.php index 4d3f5a8c6..2f3ff3de9 100644 --- a/app/adminapi/controller/finance/FinancePaymentApplyController.php +++ b/app/adminapi/controller/finance/FinancePaymentApplyController.php @@ -54,7 +54,7 @@ class FinancePaymentApplyController extends BaseAdminController public function add() { $params = (new FinancePaymentApplyValidate())->post()->goCheck('add'); - $result = FinancePaymentApplyLogic::add($params,$this->adminId); + $result = FinancePaymentApplyLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/controller/finance/FinancePaymentPlanController.php b/app/adminapi/controller/finance/FinancePaymentPlanController.php index 91a794d3d..f54583379 100644 --- a/app/adminapi/controller/finance/FinancePaymentPlanController.php +++ b/app/adminapi/controller/finance/FinancePaymentPlanController.php @@ -54,7 +54,7 @@ class FinancePaymentPlanController extends BaseAdminController public function add() { $params = (new FinancePaymentPlanValidate())->post()->goCheck('add'); - $result = FinancePaymentPlanLogic::add($params,$this->adminId); + $result = FinancePaymentPlanLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/controller/finance/FinanceReceiptRecordController.php b/app/adminapi/controller/finance/FinanceReceiptRecordController.php index d00e89d53..de9b03cd8 100644 --- a/app/adminapi/controller/finance/FinanceReceiptRecordController.php +++ b/app/adminapi/controller/finance/FinanceReceiptRecordController.php @@ -54,7 +54,7 @@ class FinanceReceiptRecordController extends BaseAdminController public function add() { $params = (new FinanceReceiptRecordValidate())->post()->goCheck('add'); - $result = FinanceReceiptRecordLogic::add($params,$this->adminId); + $result = FinanceReceiptRecordLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/controller/finance/FinanceRefundApplyController.php b/app/adminapi/controller/finance/FinanceRefundApplyController.php index c16803490..aadacf851 100644 --- a/app/adminapi/controller/finance/FinanceRefundApplyController.php +++ b/app/adminapi/controller/finance/FinanceRefundApplyController.php @@ -54,7 +54,7 @@ class FinanceRefundApplyController extends BaseAdminController public function add() { $params = (new FinanceRefundApplyValidate())->post()->goCheck('add'); - $result = FinanceRefundApplyLogic::add($params,$this->adminId); + $result = FinanceRefundApplyLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/controller/finance/FinanceRefundRecordController.php b/app/adminapi/controller/finance/FinanceRefundRecordController.php index 8c809c91b..9af640209 100644 --- a/app/adminapi/controller/finance/FinanceRefundRecordController.php +++ b/app/adminapi/controller/finance/FinanceRefundRecordController.php @@ -54,7 +54,7 @@ class FinanceRefundRecordController extends BaseAdminController public function add() { $params = (new FinanceRefundRecordValidate())->post()->goCheck('add'); - $result = FinanceRefundRecordLogic::add($params,$this->adminId); + $result = FinanceRefundRecordLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/controller/finance/FinanceReturnedMoneyController.php b/app/adminapi/controller/finance/FinanceReturnedMoneyController.php index 101f3c217..cb03beadd 100644 --- a/app/adminapi/controller/finance/FinanceReturnedMoneyController.php +++ b/app/adminapi/controller/finance/FinanceReturnedMoneyController.php @@ -54,7 +54,7 @@ class FinanceReturnedMoneyController extends BaseAdminController public function add() { $params = (new FinanceReturnedMoneyValidate())->post()->goCheck('add'); - $result = FinanceReturnedMoneyLogic::add($params,$this->adminId); + $result = FinanceReturnedMoneyLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/controller/finance/FinanceReturnedRecordController.php b/app/adminapi/controller/finance/FinanceReturnedRecordController.php index 9fcfbe4bd..6ce408ab8 100644 --- a/app/adminapi/controller/finance/FinanceReturnedRecordController.php +++ b/app/adminapi/controller/finance/FinanceReturnedRecordController.php @@ -54,7 +54,7 @@ class FinanceReturnedRecordController extends BaseAdminController public function add() { $params = (new FinanceReturnedRecordValidate())->post()->goCheck('add'); - $result = FinanceReturnedRecordLogic::add($params,$this->adminId); + $result = FinanceReturnedRecordLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/adminapi/lists/bank/BankAccountLists.php b/app/adminapi/lists/bank/BankAccountLists.php index 1554650ba..cb15c4b20 100644 --- a/app/adminapi/lists/bank/BankAccountLists.php +++ b/app/adminapi/lists/bank/BankAccountLists.php @@ -18,8 +18,6 @@ namespace app\adminapi\lists\bank; use app\adminapi\lists\BaseAdminDataLists; use app\common\model\bank\BankAccount; use app\common\lists\ListsSearchInterface; -use app\common\model\dept\Dept; -use app\common\model\dept\Orgs; /** @@ -58,16 +56,10 @@ class BankAccountLists extends BaseAdminDataLists implements ListsSearchInterfac public function lists(): array { return BankAccount::where($this->searchWhere) - ->field('id,org_id,dept_id,account_sn,deposit_bank,account_name,account,account_opening_date,opening_amount,remark') + ->field('id,account_sn,deposit_bank,account_name,account,account_opening_date,opening_amount,remark') ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select()->each(function($data){ - $org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty(); - $dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty(); - $data['org_name'] = $org['name']; - $data['dept_name'] = $dept['name']; - return $data; - }) + ->select() ->toArray(); } diff --git a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php index a58a7d6e6..5ecfbddf8 100644 --- a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php +++ b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php @@ -42,7 +42,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch { return [ '=' => ['project_id', 'contract_id','invoice_type'], - '%like%' => ['invoicing_code'], + '%like%' => ['invoicing_code','invoicing_company_name'], ]; } @@ -65,7 +65,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch $where[] = ['project_id','in',$project_ids]; } return FinanceInvoiceApply::where($this->searchWhere)->where($where) - ->field('id,contract_id,project_id,invoicing_code,invoicing_date,period,tax_rate,invoice_type,invoicing_amount,tax_amount,amount_including_tax') + ->field('id,contract_id,project_id,invoicing_code,invoicing_date,period,tax_rate,invoice_type,invoicing_amount,tax_amount,amount_including_tax,invoicing_company_name') ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($data){ diff --git a/app/adminapi/logic/bank/BankAccountLogic.php b/app/adminapi/logic/bank/BankAccountLogic.php index 28e6a6377..cdbf6db9b 100644 --- a/app/adminapi/logic/bank/BankAccountLogic.php +++ b/app/adminapi/logic/bank/BankAccountLogic.php @@ -43,8 +43,6 @@ class BankAccountLogic extends BaseLogic Db::startTrans(); try { BankAccount::create([ - 'org_id' => $params['org_id'], - 'dept_id' => $params['dept_id'], 'account_sn' => data_unique_code('BANK'), 'deposit_bank' => $params['deposit_bank'], 'account_name' => $params['account_name'], @@ -75,8 +73,6 @@ class BankAccountLogic extends BaseLogic Db::startTrans(); try { BankAccount::where('id', $params['id'])->update([ - 'org_id' => $params['org_id'], - 'dept_id' => $params['dept_id'], 'deposit_bank' => $params['deposit_bank'], 'account_name' => $params['account_name'], 'account' => $params['account'], @@ -116,11 +112,7 @@ class BankAccountLogic extends BaseLogic */ public static function detail($params): array { - $data = BankAccount::field('id,org_id,dept_id,account_sn,deposit_bank,account_name,account,account_opening_date,opening_amount,remark')->findOrEmpty($params['id']); - $org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty(); - $dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty(); - $data['org_name'] = $org['name']; - $data['dept_name'] = $dept['name']; + $data = BankAccount::field('id,account_sn,deposit_bank,account_name,account,account_opening_date,opening_amount,remark')->findOrEmpty($params['id']); return $data->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php index ed1259c5c..88a90e76c 100644 --- a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php +++ b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php @@ -43,13 +43,13 @@ class FinanceInvoiceApplyLogic extends BaseLogic * @author likeadmin * @date 2023/12/13 15:01 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); $tax_rate = DictData::where('type_value','tax_rate')->column('name','value'); Db::startTrans(); try { - $res = FinanceInvoiceApply::create([ + FinanceInvoiceApply::create([ 'project_id' => $contract['project_id'], 'contract_id' => $params['contract_id'], 'invoicing_code' => data_unique_code('开票申请'), diff --git a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php index 3f7d5e75e..c4c93e22a 100644 --- a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php +++ b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php @@ -43,7 +43,7 @@ class FinancePaymentApplyLogic extends BaseLogic * @author likeadmin * @date 2023/12/15 13:47 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { if($params['contract_cate'] == 1){ $contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray(); @@ -55,7 +55,7 @@ class FinancePaymentApplyLogic extends BaseLogic } Db::startTrans(); try { - $res = FinancePaymentApply::create([ + FinancePaymentApply::create([ 'payment_apply_code' => data_unique_code('付款申请'), 'supplier_id' => $params['supplier_id'], 'project_id' => $contract['project_id'], diff --git a/app/adminapi/logic/finance/FinancePaymentPlanLogic.php b/app/adminapi/logic/finance/FinancePaymentPlanLogic.php index ccb368afa..84cfbf538 100644 --- a/app/adminapi/logic/finance/FinancePaymentPlanLogic.php +++ b/app/adminapi/logic/finance/FinancePaymentPlanLogic.php @@ -41,7 +41,7 @@ class FinancePaymentPlanLogic extends BaseLogic * @author likeadmin * @date 2023/12/15 11:14 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { if($params['contract_cate'] == 1){ $contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray(); @@ -53,7 +53,7 @@ class FinancePaymentPlanLogic extends BaseLogic } Db::startTrans(); try { - $res = FinancePaymentPlan::create([ + FinancePaymentPlan::create([ 'supplier_id' => $params['supplier_id'], 'project_id' => $contract['project_id'], 'contract_id' => $params['contract_id'], diff --git a/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php b/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php index 19291d027..b76b0c11a 100644 --- a/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php +++ b/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php @@ -42,7 +42,7 @@ class FinanceReceiptRecordLogic extends BaseLogic * @author likeadmin * @date 2023/12/15 10:20 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { if($params['contract_cate'] == 1){ $contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray(); @@ -55,7 +55,7 @@ class FinanceReceiptRecordLogic extends BaseLogic $tax_rate = DictData::where('type_value','tax_rate')->column('name','value'); Db::startTrans(); try { - $res = FinanceReceiptRecord::create([ + FinanceReceiptRecord::create([ 'supplier_id' => $params['supplier_id'], 'project_id' => $contract['project_id'], 'contract_id' => $params['contract_id'], diff --git a/app/adminapi/logic/finance/FinanceRefundApplyLogic.php b/app/adminapi/logic/finance/FinanceRefundApplyLogic.php index 016405c51..e2f98d3cb 100644 --- a/app/adminapi/logic/finance/FinanceRefundApplyLogic.php +++ b/app/adminapi/logic/finance/FinanceRefundApplyLogic.php @@ -41,12 +41,12 @@ class FinanceRefundApplyLogic extends BaseLogic * @author likeadmin * @date 2023/12/14 16:58 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); Db::startTrans(); try { - $res = FinanceRefundApply::create([ + FinanceRefundApply::create([ 'refund_code' => data_unique_code('退款申请'), 'project_id' => $contract['project_id'], 'contract_id' => $params['contract_id'], diff --git a/app/adminapi/logic/finance/FinanceRefundRecordLogic.php b/app/adminapi/logic/finance/FinanceRefundRecordLogic.php index d55aee18a..abfcef27d 100644 --- a/app/adminapi/logic/finance/FinanceRefundRecordLogic.php +++ b/app/adminapi/logic/finance/FinanceRefundRecordLogic.php @@ -42,7 +42,7 @@ class FinanceRefundRecordLogic extends BaseLogic * @author likeadmin * @date 2023/12/15 14:41 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { if($params['contract_cate'] == 1){ $contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray(); @@ -54,7 +54,7 @@ class FinanceRefundRecordLogic extends BaseLogic } Db::startTrans(); try { - $res = FinanceRefundRecord::create([ + FinanceRefundRecord::create([ 'supplier_id' => $params['supplier_id'], 'project_id' => $contract['project_id'], 'contract_type' => $params['contract_cate'], diff --git a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php index 732597962..388243eb7 100644 --- a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php +++ b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php @@ -41,12 +41,12 @@ class FinanceReturnedMoneyLogic extends BaseLogic * @author likeadmin * @date 2023/12/13 15:38 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); Db::startTrans(); try { - $res = FinanceReturnedMoney::create([ + FinanceReturnedMoney::create([ 'project_id' => $contract['project_id'], 'contract_id' => $params['contract_id'], 'return_date' => strtotime($params['return_date']), diff --git a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php index 25ffd6cec..ad9587788 100644 --- a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php +++ b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php @@ -42,12 +42,12 @@ class FinanceReturnedRecordLogic extends BaseLogic * @author likeadmin * @date 2023/12/13 16:28 */ - public static function add(array $params,$admin_id): bool + public static function add(array $params): bool { $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); Db::startTrans(); try { - $res = FinanceReturnedRecord::create([ + FinanceReturnedRecord::create([ 'project_id' => $contract['project_id'], 'contract_id' => $params['contract_id'], 'finance_returned_money_id' => $params['finance_returned_money_id'], diff --git a/app/adminapi/validate/bank/BankAccountValidate.php b/app/adminapi/validate/bank/BankAccountValidate.php index 7203f8ae0..515e3c005 100644 --- a/app/adminapi/validate/bank/BankAccountValidate.php +++ b/app/adminapi/validate/bank/BankAccountValidate.php @@ -14,9 +14,6 @@ namespace app\adminapi\validate\bank; - -use app\common\model\dept\Dept; -use app\common\model\dept\Orgs; use app\common\validate\BaseValidate; @@ -34,8 +31,6 @@ class BankAccountValidate extends BaseValidate */ protected $rule = [ 'id' => 'require', - 'org_id' => 'require|checkOrg', - 'dept_id' => 'require|checkDept', 'deposit_bank' => 'require', 'account_name' => 'require', 'account' => 'require', @@ -50,8 +45,6 @@ class BankAccountValidate extends BaseValidate */ protected $field = [ 'id' => 'id', - 'org_id' => '组织', - 'dept_id' => '部门', 'deposit_bank' => '开户银行', 'account_name' => '开户名称', 'account' => '账号', @@ -104,26 +97,5 @@ class BankAccountValidate extends BaseValidate { return $this->only(['id']); } - - public function checkOrg($value): bool|string - { - $org = Orgs::where('id',$value)->findOrEmpty(); - if($org->isEmpty()){ - return '组织不存在'; - } - return true; - } - - public function checkDept($value,$rule,$data): bool|string - { - $dept = Dept::where('id',$value)->findOrEmpty(); - if($dept->isEmpty()){ - return '部门不存在'; - } - if($dept['org_id'] != $data['org_id']){ - return '部门无效'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/bid/BidSecurityApplyValidate.php b/app/adminapi/validate/bid/BidSecurityApplyValidate.php index 8cefb13ad..52bd6e533 100644 --- a/app/adminapi/validate/bid/BidSecurityApplyValidate.php +++ b/app/adminapi/validate/bid/BidSecurityApplyValidate.php @@ -96,7 +96,7 @@ class BidSecurityApplyValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -145,15 +145,5 @@ class BidSecurityApplyValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/bid/BidSecurityRefundValidate.php b/app/adminapi/validate/bid/BidSecurityRefundValidate.php index 1e2470e7d..c63303a17 100644 --- a/app/adminapi/validate/bid/BidSecurityRefundValidate.php +++ b/app/adminapi/validate/bid/BidSecurityRefundValidate.php @@ -90,7 +90,7 @@ class BidSecurityRefundValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -128,16 +128,6 @@ class BidSecurityRefundValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } - public function checkBankAccount($value): bool|string { $data = BankAccount::where('id',$value)->findOrEmpty(); diff --git a/app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php b/app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php index 3e72f1d7f..34dd74f44 100644 --- a/app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php +++ b/app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php @@ -96,7 +96,7 @@ class FinanceInvoiceApplyValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -160,15 +160,5 @@ class FinanceInvoiceApplyValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/finance/FinancePaymentApplyValidate.php b/app/adminapi/validate/finance/FinancePaymentApplyValidate.php index 38d2cc8d8..c8fe8e5ae 100644 --- a/app/adminapi/validate/finance/FinancePaymentApplyValidate.php +++ b/app/adminapi/validate/finance/FinancePaymentApplyValidate.php @@ -112,7 +112,7 @@ class FinancePaymentApplyValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -207,16 +207,6 @@ class FinancePaymentApplyValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } - public function checkBankAccount($value): bool|string { $bank = BankAccount::where('id',$value)->findOrEmpty(); diff --git a/app/adminapi/validate/finance/FinancePaymentPlanValidate.php b/app/adminapi/validate/finance/FinancePaymentPlanValidate.php index 9f80eea47..63d79b136 100644 --- a/app/adminapi/validate/finance/FinancePaymentPlanValidate.php +++ b/app/adminapi/validate/finance/FinancePaymentPlanValidate.php @@ -98,7 +98,7 @@ class FinancePaymentPlanValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -171,15 +171,5 @@ class FinancePaymentPlanValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/finance/FinanceReceiptRecordValidate.php b/app/adminapi/validate/finance/FinanceReceiptRecordValidate.php index d8a856759..368926cf4 100644 --- a/app/adminapi/validate/finance/FinanceReceiptRecordValidate.php +++ b/app/adminapi/validate/finance/FinanceReceiptRecordValidate.php @@ -99,7 +99,7 @@ class FinanceReceiptRecordValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -172,15 +172,5 @@ class FinanceReceiptRecordValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/finance/FinanceRefundApplyValidate.php b/app/adminapi/validate/finance/FinanceRefundApplyValidate.php index 2421f0cbe..9d3b48fb8 100644 --- a/app/adminapi/validate/finance/FinanceRefundApplyValidate.php +++ b/app/adminapi/validate/finance/FinanceRefundApplyValidate.php @@ -99,7 +99,7 @@ class FinanceRefundApplyValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -146,16 +146,6 @@ class FinanceRefundApplyValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } - public function checkBankAccount($value): bool|string { $bank = BankAccount::where('id',$value)->findOrEmpty(); diff --git a/app/adminapi/validate/finance/FinanceRefundRecordValidate.php b/app/adminapi/validate/finance/FinanceRefundRecordValidate.php index 16273a0b4..4e731d13c 100644 --- a/app/adminapi/validate/finance/FinanceRefundRecordValidate.php +++ b/app/adminapi/validate/finance/FinanceRefundRecordValidate.php @@ -99,7 +99,7 @@ class FinanceRefundRecordValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } diff --git a/app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php b/app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php index 7171c3479..7a43f3128 100644 --- a/app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php +++ b/app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php @@ -35,7 +35,7 @@ class FinanceReturnedMoneyValidate extends BaseValidate * @var string[] */ protected $rule = [ - 'id' => 'require', + 'id' => 'require|checkData', 'contract_id' => 'require|checkContract', 'return_date' => 'require|dateFormat:Y-m-d', 'period' => 'require|checkPeriod', @@ -95,7 +95,7 @@ class FinanceReturnedMoneyValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -159,15 +159,5 @@ class FinanceReturnedMoneyValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php b/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php index d690b0ed8..191cfef0a 100644 --- a/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php +++ b/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php @@ -100,7 +100,7 @@ class FinanceReturnedRecordValidate extends BaseValidate */ public function sceneDelete() { - return $this->only(['id']); + return $this->only(['id'])->remove('id','checkData'); } @@ -177,16 +177,6 @@ class FinanceReturnedRecordValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != ''){ - if(!is_array($value)){ - return '附件格式错误'; - } - } - return true; - } - public function checkBankAccount($value): bool|string { $bank = BankAccount::where('id',$value)->findOrEmpty(); diff --git a/app/common/model/bid/BidSecurityApply.php b/app/common/model/bid/BidSecurityApply.php index 1583e5844..5af3e36d4 100644 --- a/app/common/model/bid/BidSecurityApply.php +++ b/app/common/model/bid/BidSecurityApply.php @@ -31,10 +31,6 @@ class BidSecurityApply extends BaseModel use SoftDelete; protected $name = 'bid_security_apply'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } public function getRefundDateAttr($value): string { diff --git a/app/common/model/bid/BidSecurityRefund.php b/app/common/model/bid/BidSecurityRefund.php index 619bed80e..951fe5201 100644 --- a/app/common/model/bid/BidSecurityRefund.php +++ b/app/common/model/bid/BidSecurityRefund.php @@ -30,10 +30,6 @@ class BidSecurityRefund extends BaseModel protected $name = 'bid_security_refund'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getRefundDateAttr($value): string { return !empty($value) ? date('Y-m-d',$value) : ''; diff --git a/app/common/model/finance/FinanceInvoiceApply.php b/app/common/model/finance/FinanceInvoiceApply.php index bb7b4c8d0..3ccdc5053 100644 --- a/app/common/model/finance/FinanceInvoiceApply.php +++ b/app/common/model/finance/FinanceInvoiceApply.php @@ -31,10 +31,6 @@ class FinanceInvoiceApply extends BaseModel protected $name = 'finance_invoice_apply'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getInvoicingDateAttr($value): string { return !empty($value) ? date('Y-m-d',$value) : ''; diff --git a/app/common/model/finance/FinancePaymentApply.php b/app/common/model/finance/FinancePaymentApply.php index 7f8bf123e..089b1a111 100644 --- a/app/common/model/finance/FinancePaymentApply.php +++ b/app/common/model/finance/FinancePaymentApply.php @@ -31,10 +31,6 @@ class FinancePaymentApply extends BaseModel protected $name = 'finance_payment_apply'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getContractTypeTextAttr($value,$data): string { $type = [1=>'采购合同',2=>'分包合同']; diff --git a/app/common/model/finance/FinancePaymentPlan.php b/app/common/model/finance/FinancePaymentPlan.php index 82a7af9e4..dece3916b 100644 --- a/app/common/model/finance/FinancePaymentPlan.php +++ b/app/common/model/finance/FinancePaymentPlan.php @@ -31,10 +31,6 @@ class FinancePaymentPlan extends BaseModel protected $name = 'finance_payment_plan'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getContractTypeTextAttr($value,$data): string { $type = [1=>'采购合同',2=>'分包合同']; diff --git a/app/common/model/finance/FinanceReceiptRecord.php b/app/common/model/finance/FinanceReceiptRecord.php index 7221ef2f5..4eb9e1767 100644 --- a/app/common/model/finance/FinanceReceiptRecord.php +++ b/app/common/model/finance/FinanceReceiptRecord.php @@ -31,10 +31,6 @@ class FinanceReceiptRecord extends BaseModel protected $name = 'finance_receipt_record'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getInvoicingDateAttr($value): string { return !empty($value) ? date('Y-m-d',$value) : ''; diff --git a/app/common/model/finance/FinanceRefundApply.php b/app/common/model/finance/FinanceRefundApply.php index f3c79c127..79b6ba654 100644 --- a/app/common/model/finance/FinanceRefundApply.php +++ b/app/common/model/finance/FinanceRefundApply.php @@ -31,10 +31,6 @@ class FinanceRefundApply extends BaseModel protected $name = 'finance_refund_apply'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getRefundTypeTextAttr($value,$data){ $dict = DictData::where('type_value','refund_type')->column('name','value'); return !empty($data['refund_type']) ? $dict[$data['refund_type']] : ''; diff --git a/app/common/model/finance/FinanceRefundRecord.php b/app/common/model/finance/FinanceRefundRecord.php index 82a9044d5..4341fdb5c 100644 --- a/app/common/model/finance/FinanceRefundRecord.php +++ b/app/common/model/finance/FinanceRefundRecord.php @@ -31,10 +31,6 @@ class FinanceRefundRecord extends BaseModel protected $name = 'finance_refund_record'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getContractTypeTextAttr($value,$data): string { $type = [1=>'采购合同',2=>'分包合同']; diff --git a/app/common/model/finance/FinanceReturnedMoney.php b/app/common/model/finance/FinanceReturnedMoney.php index dc6090adf..08a8ed18b 100644 --- a/app/common/model/finance/FinanceReturnedMoney.php +++ b/app/common/model/finance/FinanceReturnedMoney.php @@ -31,10 +31,6 @@ class FinanceReturnedMoney extends BaseModel protected $name = 'finance_returned_money'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getPeriodTextAttr($value,$data){ $dict = DictData::where('type_value','pay_period')->column('name','value'); return !empty($data['period']) ? $dict[$data['period']] : ''; diff --git a/app/common/model/finance/FinanceReturnedRecord.php b/app/common/model/finance/FinanceReturnedRecord.php index 3620bdb86..69e34cfc0 100644 --- a/app/common/model/finance/FinanceReturnedRecord.php +++ b/app/common/model/finance/FinanceReturnedRecord.php @@ -31,10 +31,6 @@ class FinanceReturnedRecord extends BaseModel protected $name = 'finance_returned_record'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getCollectionTypeTextAttr($value,$data){ $dict = DictData::where('type_value','collection_type')->column('name','value'); return !empty($data['collection_type']) ? $dict[$data['collection_type']] : '';