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

update

Browse Source
This commit is contained in:
chenbo 2024-02-27 15:17:26 +08:00
parent c4990ab1c1
commit aad3b2b25f
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,6 +170,11 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
*/
public static function detail($params): array
{
return TaskHandlingThreeLevelReview::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
$data = TaskHandlingThreeLevelReview::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
$data['result_file'] = json_decode($data['result_file'], true);
$data['master_annex'] = json_decode($data['master_annex'], true);
$data['bm_annex'] = json_decode($data['bm_annex'], true);
$data['shb_annex'] = json_decode($data['shb_annex'], true);
return $data;
}
}

9
app/adminapi/logic/task/TaskAllocationLogic.php
View File

@ -19,6 +19,7 @@ use app\adminapi\logic\TaskDetailLogic;
use app\common\model\task\TaskAllocation;
use app\common\logic\BaseLogic;
use app\common\model\task\TaskType;
use app\common\model\TaskDetail;
use think\facade\Db;
@ -132,6 +133,12 @@ class TaskAllocationLogic extends BaseLogic
*/
public static function detail($params): array
{
return TaskAllocation::findOrEmpty($params['id'])->with(['taskTypeInfo', 'projectInfo'])->toArray();
$data = TaskAllocation::with(['taskTypeInfo', 'projectInfo'])->findOrEmpty($params['id'])->toArray();
$data['annex'] = json_decode($data['annex'], true);
$data['task_detail'] = TaskDetail::where('task_allocation_id', $data['id'])->select()->each(function ($item){
$taskTypeInfo = TaskType::findOrEmpty($item['task_type_id'])->toArray();
$item['task_name'] = $taskTypeInfo['name'];
})->toArray();
return $data;
}
}