From 0abd5025780f0342967f14cbed2ab98317036643 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 19 Mar 2024 11:38:14 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/ProjectCommissionDetailLists.php | 2 ++
 app/adminapi/logic/ProjectCommissionDetailLogic.php | 5 ++++-
 app/adminapi/logic/ProjectCommissionLogic.php       | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/ProjectCommissionDetailLists.php b/app/adminapi/lists/ProjectCommissionDetailLists.php
index bca773e5e..9b3bcd577 100644
--- a/app/adminapi/lists/ProjectCommissionDetailLists.php
+++ b/app/adminapi/lists/ProjectCommissionDetailLists.php
@@ -61,6 +61,8 @@ class ProjectCommissionDetailLists extends BaseAdminDataLists implements ListsSe
             ->select()->each(function($data){
 				$project_commission = ProjectCommission::field('num')->where('id',$data['project_commission_id'])->findOrEmpty();
 				$data['project_commission_num'] = $project_commission['num'];
+				$data['task_type_text'] = $data->task_type_text;
+				$data['professional_type_text'] = $data->professional_type_text;
 	        })
             ->toArray();
     }
diff --git a/app/adminapi/logic/ProjectCommissionDetailLogic.php b/app/adminapi/logic/ProjectCommissionDetailLogic.php
index 91b037f39..c9e46da89 100644
--- a/app/adminapi/logic/ProjectCommissionDetailLogic.php
+++ b/app/adminapi/logic/ProjectCommissionDetailLogic.php
@@ -124,6 +124,9 @@ class ProjectCommissionDetailLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectCommissionDetail::findOrEmpty($params['id'])->toArray();
+		$data = ProjectCommissionDetail::findOrEmpty($params['id']);
+	    $data['task_type_text'] = $data->task_type_text;
+	    $data['professional_type_text'] = $data->professional_type_text;
+        return $data->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/ProjectCommissionLogic.php b/app/adminapi/logic/ProjectCommissionLogic.php
index 0e0b684b4..33922adc8 100644
--- a/app/adminapi/logic/ProjectCommissionLogic.php
+++ b/app/adminapi/logic/ProjectCommissionLogic.php
@@ -152,7 +152,10 @@ class ProjectCommissionLogic extends BaseLogic
 	    $data['total_pay_amount'] = ProjectCommission::where('project_id',$data['project_id'])->sum('bczfze');
 		//应提成总金额
 	    $data['total_commission_amount'] = $data['total_refund_amount'] * ($data['rate'] / 100);
-        $data['project_commission_detail'] = ProjectCommissionDetail::field('id,engineer,task_name,task_type,professional_type,zj_amount,sk_amount,tc_rate,tc_amount,pay_amount,other_fee,remark')->where('project_commission_id', $data['id'])->select()->toArray();
+        $data['project_commission_detail'] = ProjectCommissionDetail::field('id,engineer,task_name,task_type,professional_type,zj_amount,sk_amount,tc_rate,tc_amount,pay_amount,other_fee,remark')->where('project_commission_id', $data['id'])->select()->each(function($data){
+	        $data['task_type_text'] = $data->task_type_text;
+	        $data['professional_type_text'] = $data->professional_type_text;
+        })->toArray();
         return $data;
     }