xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加时间轴内容

Browse Source
This commit is contained in:
mzl
2025-09-24 17:43:48 +08:00
parent 2a44802994
commit ad7b42db45
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/ApprovalRecordsController.php
+4 -3
View File
@@ -186,14 +186,15 @@ class ApprovalRecordsController extends BaseController
protected function timelineFormat($data) protected function timelineFormat($data)
{ {
$result = []; $result = [];
foreach ($data as $record) { foreach ($data as $record) {
$result[] = [ $result[] = [
'id' => $record['id'], 'id' => $record['id'],
'name' => $record['approver']['name'], 'name' => $record['approver']['name'],
'comment' => $record['comment'], 'comment' => $record['comment'] ?? '',
'time' => $record['updated_at'] 'time' => $record['updated_at'],
'status_desc' => SysDictItem::where('item_value', $record['status'])->where('status', 1)->value('item_label'),
]; ];
} }
return $result; return $result;
app/common/service/ApprovalRecordsService.php
+3
View File
@@ -176,6 +176,9 @@ class ApprovalRecordsService
public function serviceApprovalTimeline(Request $request, array $data = []) public function serviceApprovalTimeline(Request $request, array $data = [])
{ {
$instance = \app\common\model\ApprovalInstances::where('biz_id', $data['id'])->where('flow_type', $data['flow_type'])->first(); $instance = \app\common\model\ApprovalInstances::where('biz_id', $data['id'])->where('flow_type', $data['flow_type'])->first();
if (!$instance) {
return [];
}
$result = \app\common\model\ApprovalRecords::where('instance_id', $instance->id)->with('approver')->orderBy('id', 'desc')->get(); $result = \app\common\model\ApprovalRecords::where('instance_id', $instance->id)->with('approver')->orderBy('id', 'desc')->get();
return $result; return $result;
} }