From e3612bb4f7fdbd71c3ae755395b0527276a6056b Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 15 Sep 2023 18:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/approve/ApproveLists.php | 12 +++++++++++-
 app/api/controller/TaskController.php       |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/approve/ApproveLists.php b/app/adminapi/lists/approve/ApproveLists.php
index 4cc34a8b4..0e26cfa36 100644
--- a/app/adminapi/lists/approve/ApproveLists.php
+++ b/app/adminapi/lists/approve/ApproveLists.php
@@ -5,6 +5,9 @@ namespace app\adminapi\lists\approve;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\Approve;
+use app\common\model\auth\Admin;
+use app\common\model\Company;
+use think\facade\Db;
 
 class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface
 {
@@ -29,13 +32,20 @@ class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface
 
     public function lists(): array
     {
-        return Approve::where($this->searchWhere)
+        return  Approve::where($this->searchWhere)
             ->where($this->queryWhere())
             ->with('task')
             ->field('*')
+            ->append(['area_manager', 'company_name'], true)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
+            ->withAttr('area_manager',function($value,$data){
+                return Admin::where(['id' => $data['check_admin_ids']])->value('name');
+            })
+            ->withAttr('company_name',function($value,$data){
+                return Company::where(['admin_id' => $data['check_admin_ids']])->value('company_name');
+            })
             ->toArray();
     }
 
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index d0ed066a3..925c3153c 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -229,7 +229,7 @@ class TaskController extends BaseApiController
             }
             $extend = ['other' => ['is_commit' => 1, 'note' => $parmas['note'], 'annex'=>$parmas['annex']]];
             Db::startTrans();
-            Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend)]);
+            Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time()]);
 
             // 片区经理
             $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');