From 67043e2587f44ac1e707293a21a714421d106524 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Tue, 2 Apr 2024 17:15:00 +0800 Subject: [PATCH] update --- .../marketing/MarketingCustomReturnVisitEvaluateLists.php | 3 ++- .../marketing/MarketingCustomReturnVisitEvaluateLogic.php | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/adminapi/lists/marketing/MarketingCustomReturnVisitEvaluateLists.php b/app/adminapi/lists/marketing/MarketingCustomReturnVisitEvaluateLists.php index 3fb9f9986..eac3c2190 100644 --- a/app/adminapi/lists/marketing/MarketingCustomReturnVisitEvaluateLists.php +++ b/app/adminapi/lists/marketing/MarketingCustomReturnVisitEvaluateLists.php @@ -60,9 +60,10 @@ ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($data) { - $custom_return_visit = MarketingCustomReturnVisit::field('contract_id')->where('id', $data['custom_return_visit_id'])->findOrEmpty(); + $custom_return_visit = MarketingCustomReturnVisit::field('contract_id,code')->where('id', $data['custom_return_visit_id'])->findOrEmpty(); //todo $data['contract_name'] = ''; + $data['custom_return_visit_code'] = $custom_return_visit['code']; }) ->toArray(); } diff --git a/app/adminapi/logic/marketing/MarketingCustomReturnVisitEvaluateLogic.php b/app/adminapi/logic/marketing/MarketingCustomReturnVisitEvaluateLogic.php index 1ce19e0ca..1c9a116d4 100644 --- a/app/adminapi/logic/marketing/MarketingCustomReturnVisitEvaluateLogic.php +++ b/app/adminapi/logic/marketing/MarketingCustomReturnVisitEvaluateLogic.php @@ -16,6 +16,7 @@ use app\common\logic\BaseLogic; + use app\common\model\marketing\MarketingCustomReturnVisit; use app\common\model\marketing\MarketingCustomReturnVisitEvaluate; use think\facade\Db; @@ -106,6 +107,9 @@ */ public static function detail($params): array { - return MarketingCustomReturnVisitEvaluate::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id'])->toArray(); + $data = MarketingCustomReturnVisitEvaluate::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $custom_return_visit = MarketingCustomReturnVisit::field('code')->where('id', $data['custom_return_visit_id'])->findOrEmpty(); + $data['custom_return_visit_code'] = $custom_return_visit['code']; + return $data->toArray(); } } \ No newline at end of file