增加时间轴内容
This commit is contained in:
@@ -186,14 +186,15 @@ class ApprovalRecordsController extends BaseController
|
||||
|
||||
|
||||
protected function timelineFormat($data)
|
||||
{
|
||||
{
|
||||
$result = [];
|
||||
foreach ($data as $record) {
|
||||
$result[] = [
|
||||
'id' => $record['id'],
|
||||
'name' => $record['approver']['name'],
|
||||
'comment' => $record['comment'],
|
||||
'time' => $record['updated_at']
|
||||
'comment' => $record['comment'] ?? '',
|
||||
'time' => $record['updated_at'],
|
||||
'status_desc' => SysDictItem::where('item_value', $record['status'])->where('status', 1)->value('item_label'),
|
||||
];
|
||||
}
|
||||
return $result;
|
||||
|
||||
@@ -176,6 +176,9 @@ class ApprovalRecordsService
|
||||
public function serviceApprovalTimeline(Request $request, array $data = [])
|
||||
{
|
||||
$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();
|
||||
return $result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user