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-25 15:19:31 +08:00
parent 23a6b23314
commit b35219cd6a
2 changed files with 400 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
app/adminapi/logic/finance/FinancePaymentApplyLogic.php
View File

@ -12,28 +12,28 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\finance;
namespace app\adminapi\logic\finance;
use app\common\model\bank\BankAccount;
use app\common\model\contract\ProcurementContract;
use app\common\model\contract\SubcontractingContract;
use app\common\model\finance\FinancePaymentApply;
use app\common\model\finance\FinancePaymentPlan;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\logic\BaseLogic;
use app\common\model\supplier\Supplier;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\bank\BankAccount;
use app\common\model\contract\ProcurementContract;
use app\common\model\contract\SubcontractingContract;
use app\common\model\finance\FinancePaymentApply;
use app\common\model\finance\FinancePaymentPlan;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\model\supplier\Supplier;
use think\facade\Db;
/**
/**
* FinancePaymentApply逻辑
* Class FinancePaymentApplyLogic
* @package app\adminapi\logic\finance
*/
class FinancePaymentApplyLogic extends BaseLogic
{
class FinancePaymentApplyLogic extends BaseLogic
{
/**
@ -45,14 +45,20 @@ class FinancePaymentApplyLogic extends BaseLogic
*/
public static function add(array $params): bool
{
if($params['contract_cate'] == 1){
$contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
}elseif($params['contract_cate'] == 2){
$contract = SubcontractingContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
}else{
if ($params['contract_cate'] == 1) {
$contract = ProcurementContract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty()->toArray();
} elseif ($params['contract_cate'] == 2) {
$contract = SubcontractingContract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty()->toArray();
} else {
self::setError('合同信息不存在');
return false;
}
$finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty();
if ($finance_payment_plan['amount'] < $params['amount']) {
$status = 2;
} else {
$status = 3;
}
Db::startTrans();
try {
FinancePaymentApply::create([
@ -70,12 +76,15 @@ class FinancePaymentApplyLogic extends BaseLogic
'amount' => $params['amount'],
'desc' => $params['desc'] ?? '',
'remark' => $params['remark'] ?? '',
'annex' => $params['annex']? json_encode($params['annex']) : null,
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'payee_bank' => $params['payee_bank'],
'payee_account_name' => $params['payee_account_name'],
'payee_account' => $params['payee_account'],
'bank_account_id' => $params['bank_account_id'],
]);
FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->update([
'status' => $status
]);
Db::commit();
return true;
} catch (\Exception $e) {
@ -95,14 +104,20 @@ class FinancePaymentApplyLogic extends BaseLogic
*/
public static function edit(array $params): bool
{
if($params['contract_cate'] == 1){
$contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
}elseif($params['contract_cate'] == 2){
$contract = SubcontractingContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
}else{
if ($params['contract_cate'] == 1) {
$contract = ProcurementContract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty()->toArray();
} elseif ($params['contract_cate'] == 2) {
$contract = SubcontractingContract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty()->toArray();
} else {
self::setError('合同信息不存在');
return false;
}
$finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty();
if ($finance_payment_plan['amount'] < $params['amount']) {
$status = 2;
} else {
$status = 3;
}
Db::startTrans();
try {
FinancePaymentApply::where('id', $params['id'])->update([
@ -119,14 +134,16 @@ class FinancePaymentApplyLogic extends BaseLogic
'amount' => $params['amount'],
'desc' => $params['desc'] ?? '',
'remark' => $params['remark'] ?? '',
'annex' => $params['annex']? json_encode($params['annex']) : null,
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'payee_bank' => $params['payee_bank'],
'payee_account_name' => $params['payee_account_name'],
'payee_account' => $params['payee_account'],
'bank_account_id' => $params['bank_account_id'],
'update_time' => time(),
]);
FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->update([
'status' => $status
]);
Db::commit();
return true;
} catch (\Exception $e) {
@ -163,33 +180,34 @@ class FinancePaymentApplyLogic extends BaseLogic
$data['payment_nature_text'] = $data->payment_nature_text;
$data['pay_type_text'] = $data->pay_type_text;
$data['invoice_status_text'] = $data->invoice_status_text;
$supplier = Supplier::field('supplier_name,supplier_code')->where('id',$data['supplier_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
$finance_payment_plan = FinancePaymentPlan::field('period')->where('id',$data['finance_payment_plan_id'])->findOrEmpty();
$supplier = Supplier::field('supplier_name,supplier_code')->where('id', $data['supplier_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
$finance_payment_plan = FinancePaymentPlan::field('period')->where('id', $data['finance_payment_plan_id'])->findOrEmpty();
$data['supplier_name'] = $supplier['supplier_name'];
$data['supplier_code'] = $supplier['supplier_code'];
$data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code'];
$data['contract_cate'] = $data['contract_type'];
$data['contract_type_text'] = $data->contract_type_text;
if($data['contract_type'] == 1){
$contract = ProcurementContract::field('contract_no,contract_name')->where('id',$data['contract_id'])->findOrEmpty();
}else{
$contract = SubcontractingContract::field('contract_no,contract_name')->where('id',$data['contract_id'])->findOrEmpty();
if ($data['contract_type'] == 1) {
$contract = ProcurementContract::field('contract_no,contract_name')->where('id', $data['contract_id'])->findOrEmpty();
} else {
$contract = SubcontractingContract::field('contract_no,contract_name')->where('id', $data['contract_id'])->findOrEmpty();
}
$data['contract_no'] = $contract['contract_no'];
$data['contract_name'] = $contract['contract_name'];
$data['period'] = $finance_payment_plan->period_text;
$data['bank_account_info'] = BankAccount::field('account_sn,deposit_bank,account_name,account')->where('id',$data['bank_account_id'])->findOrEmpty();
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty();
$data['bank_account_info'] = BankAccount::field('account_sn,deposit_bank,account_name,account')->where('id', $data['bank_account_id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
$data['approve_check_status'] = $approve_data['check_status'];
return $data->toArray();
}
public static function approve($params,$admin_id): bool{
$data = FinancePaymentApply::where('id',$params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty();
if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
public static function approve($params, $admin_id): bool
{
$data = FinancePaymentApply::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
self::setError('当前内容存在审核信息，请勿重复提交');
return false;
}
@ -203,8 +221,8 @@ class FinancePaymentApplyLogic extends BaseLogic
$params['flow_id'],
$admin_id
);
if($res){
FinancePaymentApply::where('id',$params['id'])->update([
if ($res) {
FinancePaymentApply::where('id', $params['id'])->update([
'approve_id' => $res,
]);
}
@ -216,4 +234,4 @@ class FinancePaymentApplyLogic extends BaseLogic
return false;
}
}
}
}

75
app/adminapi/logic/finance/FinancePaymentPlanLogic.php
View File

@ -12,26 +12,26 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\finance;
namespace app\adminapi\logic\finance;
use app\common\model\contract\ProcurementContract;
use app\common\model\contract\SubcontractingContract;
use app\common\model\finance\FinancePaymentPlan;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\logic\BaseLogic;
use app\common\model\supplier\Supplier;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\contract\ProcurementContract;
use app\common\model\contract\SubcontractingContract;
use app\common\model\finance\FinancePaymentPlan;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\model\supplier\Supplier;
use think\facade\Db;
/**
/**
* FinancePaymentPlan逻辑
* Class FinancePaymentPlanLogic
* @package app\adminapi\logic\finance
*/
class FinancePaymentPlanLogic extends BaseLogic
{
class FinancePaymentPlanLogic extends BaseLogic
{
/**
@ -43,11 +43,11 @@ class FinancePaymentPlanLogic extends BaseLogic
*/
public static function add(array $params): bool
{
if($params['contract_cate'] == 1){
$contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
}elseif($params['contract_cate'] == 2){
$contract = SubcontractingContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
}else{
if ($params['contract_cate'] == 1) {
$contract = ProcurementContract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty()->toArray();
} elseif ($params['contract_cate'] == 2) {
$contract = SubcontractingContract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty()->toArray();
} else {
self::setError('合同信息不存在');
return false;
}
@ -62,7 +62,6 @@ class FinancePaymentPlanLogic extends BaseLogic
'pay_date' => strtotime($params['pay_date']),
'amount' => $params['amount'],
'foreign_currency_remark' => $params['foreign_currency_remark'] ?? '',
'status' => $params['status'],
'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]);
@ -85,11 +84,11 @@ class FinancePaymentPlanLogic extends BaseLogic
*/
public static function edit(array $params): bool
{
if($params['contract_cate'] == 1){
$contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
}elseif($params['contract_cate'] == 2){
$contract = SubcontractingContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
}else{
if ($params['contract_cate'] == 1) {
$contract = ProcurementContract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty()->toArray();
} elseif ($params['contract_cate'] == 2) {
$contract = SubcontractingContract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty()->toArray();
} else {
self::setError('合同信息不存在');
return false;
}
@ -104,7 +103,6 @@ class FinancePaymentPlanLogic extends BaseLogic
'pay_date' => strtotime($params['pay_date']),
'amount' => $params['amount'],
'foreign_currency_remark' => $params['foreign_currency_remark'] ?? '',
'status' => $params['status'],
'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]);
@ -145,28 +143,29 @@ class FinancePaymentPlanLogic extends BaseLogic
$data['period_text'] = $data->period_text;
$data['status_text'] = $data->status_text;
$data['contract_type_text'] = $data->contract_type_text;
$supplier = Supplier::field('supplier_name,supplier_code')->where('id',$data['supplier_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
$supplier = Supplier::field('supplier_name,supplier_code')->where('id', $data['supplier_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
$data['supplier_name'] = $supplier['supplier_name'];
$data['supplier_code'] = $supplier['supplier_code'];
$data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code'];
if($data['contract_type'] == 1){
$contract = ProcurementContract::field('contract_no,contract_name')->where('id',$data['contract_id'])->findOrEmpty();
}else{
$contract = SubcontractingContract::field('contract_no,contract_name')->where('id',$data['contract_id'])->findOrEmpty();
if ($data['contract_type'] == 1) {
$contract = ProcurementContract::field('contract_no,contract_name')->where('id', $data['contract_id'])->findOrEmpty();
} else {
$contract = SubcontractingContract::field('contract_no,contract_name')->where('id', $data['contract_id'])->findOrEmpty();
}
$data['contract_no'] = $contract['contract_no'];
$data['contract_name'] = $contract['contract_name'];
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
$data['approve_check_status'] = $approve_data['check_status'];
return $data->toArray();
}
public static function approve($params,$admin_id): bool{
$data = FinancePaymentPlan::where('id',$params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty();
if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
public static function approve($params, $admin_id): bool
{
$data = FinancePaymentPlan::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
self::setError('当前内容存在审核信息，请勿重复提交');
return false;
}
@ -180,8 +179,8 @@ class FinancePaymentPlanLogic extends BaseLogic
$params['flow_id'],
$admin_id
);
if($res){
FinancePaymentPlan::where('id',$params['id'])->update([
if ($res) {
FinancePaymentPlan::where('id', $params['id'])->update([
'approve_id' => $res,
]);
}
@ -193,4 +192,4 @@ class FinancePaymentPlanLogic extends BaseLogic
return false;
}
}
}
}