mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构代码并优化营销合约逻辑中的项目负责人获取功能及财务统计逻辑

Browse Source
This commit is contained in:
mkm 2024-07-30 20:49:44 +08:00
parent 1f858e768e
commit 4691a10b03
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php
View File

@ -20,7 +20,8 @@
use app\common\model\dept\Dept;
use app\common\model\marketing\MarketingContract;
use app\common\model\marketing\MarketingCustom;
use app\common\model\oa\FlowApprove;
use app\common\model\marketing\MarketingCustomContacts;
use app\common\model\oa\FlowApprove;
use think\facade\Db;
@ -50,7 +51,7 @@
'contract_code' => data_unique_code('KJXY'),
'agreement_nature' => $params['agreement_nature'],
'part_a' => $params['part_a'],
'part_a_contact' => $params['part_a_contact'] ?? '',
'part_a_contact' => $params['part_a_contact_name'] ?? '',
'part_a_address' => $params['part_a_address'] ?? '',
'part_b' => $params['part_b'],
'part_b_signatory' => $params['part_b_signatory'] ?? 0,
@ -166,9 +167,10 @@
$data = MarketingContract::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id');
$admin = Admin::where('id', 'in', [$data['signed_head'], $data['seal_user']])->column('name', 'id');
$name=MarketingCustomContacts::where('id',$data['part_b_signatory'])->value('name');
$data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? '';
$data['part_b_signatory_name'] = $name ?? '';
$data['signed_dept_name'] = $dept['name'];
$data['signed_head_name'] = $admin[$data['signed_head']] ?? '';
$data['seal_user_name'] = $admin[$data['seal_user']] ?? '';