mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-04-22 15:27:00 +08:00
parent 07dfbb4a66
commit a30b68adc1
4 changed files with 514 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/adminapi/lists/ApprovalIssuanceAchievementDocumentsLists.php
View File

@ -15,10 +15,10 @@
namespace app\adminapi\lists;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface;
use app\common\model\ApprovalIssuanceAchievementDocuments;
use app\common\lists\ListsSearchInterface;
use app\common\model\ApprovalIssuanceAchievementDocuments;
use app\common\model\auth\Admin;
/**
@ -60,7 +60,10 @@ class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists imple
->with(['projectInfo'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->select()->each(function ($data) {
$head = Admin::field('name')->where('id', $data['person'])->findOrEmpty();
$data['person_name'] = $head?->name;
})
->toArray();
}

9
app/adminapi/lists/TaskHandlingThreeLevelReviewLists.php
View File

@ -15,10 +15,10 @@
namespace app\adminapi\lists;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface;
use app\common\model\TaskHandlingThreeLevelReview;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\TaskHandlingThreeLevelReview;
/**
@ -68,7 +68,10 @@ class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements Li
->with(['projectInfo'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->select()->each(function ($data) {
$head = Admin::field('name')->where('id', $data['head'])->findOrEmpty();
$data['head_name'] = $head?->name;
})
->toArray();
}

8
app/adminapi/logic/ApprovalIssuanceAchievementDocumentsLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic;
use app\common\model\ApprovalIssuanceAchievementDocuments;
use app\common\logic\BaseLogic;
use app\common\model\ApprovalIssuanceAchievementDocuments;
use app\common\model\auth\Admin;
use think\facade\Db;
@ -121,6 +122,9 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
*/
public static function detail($params): array
{
return ApprovalIssuanceAchievementDocuments::findOrEmpty($params['id'])->toArray();
$data = ApprovalIssuanceAchievementDocuments::findOrEmpty($params['id']);
$head = Admin::field('name')->where('id', $data['person'])->findOrEmpty();
$data['person_name'] = $head?->name;
return $data->toArray();
}
}

5
app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic;
use app\common\model\TaskHandlingThreeLevelReview;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\TaskHandlingThreeLevelReview;
use think\facade\Db;
@ -171,6 +172,8 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
public static function detail($params): array
{
$data = TaskHandlingThreeLevelReview::with(['projectInfo'])->findOrEmpty($params['id']);
$head = Admin::field('name')->where('id', $data['head'])->findOrEmpty();
$data['head_name'] = $head?->name;
$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) : '';