From 696b18f8c3e223378397c319f8b3446a3b6d7b14 Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Wed, 13 Dec 2023 17:32:08 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/project/ProjectLists.php | 5 ++++-
 app/adminapi/logic/project/ProjectLogic.php | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/lists/project/ProjectLists.php b/app/adminapi/lists/project/ProjectLists.php
index a1df93ffe..8ebeaf161 100644
--- a/app/adminapi/lists/project/ProjectLists.php
+++ b/app/adminapi/lists/project/ProjectLists.php
@@ -19,6 +19,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\custom\Custom;
 use app\common\model\project\Project;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\project\ProjectTypeSet;
 
 
 /**
@@ -63,12 +64,14 @@ class ProjectLists extends BaseAdminDataLists implements ListsSearchInterface
 			$condition[] = ['custom_id','in',$customIds];
 		}
         return Project::where($this->searchWhere)->where($condition)
-            ->field(['id','custom_id','project_code','name','status','project_address','project_type','strategic_significance','industry','unit_nature','bidding_method','information_sources','person'])
+            ->field(['id','custom_id','project_code','name','status','contacts','telephone','project_address','project_type','strategic_significance','industry','unit_nature','bidding_method','information_sources','person'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
+				$projectType = ProjectTypeSet::where('id',$item['project_type'])->findOrEmpty();
 				$custom = Custom::field('name')->where('id',$item['custom_id'])->findOrEmpty();
 		        $item['custom_name'] = $custom->isEmpty() ? '' : $custom['name'];
+				$item['project_type_name'] = $projectType->isEmpty() ? '' : $projectType['name'];
 				return $item;
 	        })
             ->toArray();
diff --git a/app/adminapi/logic/project/ProjectLogic.php b/app/adminapi/logic/project/ProjectLogic.php
index e0c4de653..d61dc4171 100644
--- a/app/adminapi/logic/project/ProjectLogic.php
+++ b/app/adminapi/logic/project/ProjectLogic.php
@@ -18,6 +18,7 @@ namespace app\adminapi\logic\project;
 use app\common\model\custom\Custom;
 use app\common\model\project\Project;
 use app\common\logic\BaseLogic;
+use app\common\model\project\ProjectTypeSet;
 use think\facade\Db;
 
 
@@ -157,8 +158,10 @@ class ProjectLogic extends BaseLogic
     public static function detail($params): array
     {
 		$data = Project::findOrEmpty($params['id'])->toArray();
+	    $projectType = ProjectTypeSet::where('id',$data['project_type'])->findOrEmpty();
 	    $custom = Custom::field('name')->where('id',$data['custom_id'])->findOrEmpty();
 	    $data['custom_name'] = $custom->isEmpty() ? '' : $custom['name'];
+	    $data['project_type_name'] = $projectType->isEmpty() ? '' : $projectType['name'];
         return $data;
     }
 }
\ No newline at end of file