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

---
 .../TaskHandlingThreeLevelReviewLogic.php     | 11 ++++-
 .../model/TaskHandlingThreeLevelReview.php    | 44 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php b/app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php
index 392883b68..2a19ba9ea 100644
--- a/app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php
+++ b/app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php
@@ -170,11 +170,18 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        $data =  TaskHandlingThreeLevelReview::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data =  TaskHandlingThreeLevelReview::with(['projectInfo'])->findOrEmpty($params['id']);
         $data['result_file'] = !empty($data['result_file']) ? json_decode($data['result_file'], true) : '';
         $data['master_annex'] = !empty($data['master_annex']) ? json_decode($data['master_annex'], true) : '';
         $data['bm_annex'] = !empty($data['bm_annex']) ? json_decode($data['bm_annex'], true) : '';
         $data['shb_annex'] = !empty($data['shb_annex']) ? json_decode($data['shb_annex'], true) : '';
-        return $data;
+		$data['rtype_text'] = $data->rtype_text;
+		$data['zType_text'] = $data->zType_text;
+		$data['examine_text'] = $data->examine_text;
+		$data['type_text'] = $data->type_text;
+		$data['ask_text'] = $data->ask_text;
+		$data['according_text'] = $data->according_text;
+		$data['clbc_text'] = $data->clbc_text;
+        return $data->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/common/model/TaskHandlingThreeLevelReview.php b/app/common/model/TaskHandlingThreeLevelReview.php
index a33cc131d..5eae11b34 100644
--- a/app/common/model/TaskHandlingThreeLevelReview.php
+++ b/app/common/model/TaskHandlingThreeLevelReview.php
@@ -17,6 +17,7 @@ namespace app\common\model;
 
 use app\common\model\BaseModel;
 use app\common\model\cost_project\CostProject;
+use app\common\model\dict\DictData;
 use think\model\concern\SoftDelete;
 
 
@@ -45,4 +46,47 @@ class TaskHandlingThreeLevelReview extends BaseModel
 	{
 		return !empty($value) ? date('Y-m-d',$value) : '';
 	}
+	
+	public function getRtypeTextAttr($value,$data)
+	{
+		$dict = DictData::where('type_value','task_type')->column('name','value');
+		return !empty($data['rtype']) ? $dict[$data['rtype']] : '';
+	}
+	
+	public function getZTypeTextAttr($value,$data)
+	{
+		$dict = DictData::where('type_value','major_type')->column('name','value');
+		return !empty($data['zType']) ? $dict[$data['zType']] : '';
+	}
+	
+	public function getExamineTextAttr($value,$data)
+	{
+		$dict = DictData::where('type_value','review_process')->column('name','value');
+		return !empty($data['examine']) ? $dict[$data['examine']] : '';
+	}
+	
+	public function getTypeTextAttr($value,$data)
+	{
+		$dict = DictData::where('type_value','building_structure_type')->column('name','value');
+		return !empty($data['type']) ? $dict[$data['type']] : '';
+	}
+	
+	public function getAskTextAttr($value,$data)
+	{
+		$dict = DictData::where('type_value','preparation_requirements')->column('name','value');
+		return !empty($data['ask']) ? $dict[$data['ask']] : '';
+	}
+	
+	
+	public function getAccordingTextAttr($value,$data)
+	{
+		$dict = DictData::where('type_value','cost_sentence')->column('name','value');
+		return !empty($data['according']) ? $dict[$data['according']] : '';
+	}
+	
+	public function getClbcTextAttr($value,$data)
+	{
+		$dict = DictData::where('type_value','material_compensation')->column('name','value');
+		return !empty($data['clbc']) ? $dict[$data['clbc']] : '';
+	}
 }
\ No newline at end of file