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

Merge branch 'develop'

Browse Source
This commit is contained in:
mzl
2025-09-18 15:05:57 +08:00
parent 5fef15b0fa
commit b7b6edb06c
46 changed files with 522 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/ApprovalRecordsController.php
+62 -10
View File
@@ -3,8 +3,7 @@ namespace app\admin\controller;
use app\common\controller\BaseController;
use app\common\traits\crud\CrudControllerTrait;
use app\admin\service\ApprovalRecordsService;
use app\admin\service\SysDictService;
use app\common\service\ApprovalRecordsService;
use app\common\model\SysDictItem;
use support\Request;
@@ -31,16 +30,16 @@ class ApprovalRecordsController extends BaseController
foreach ($data['records'] as $key => &$record) {
$result = [
'id' => $record['id'],
'flows_name' => $record['approvalInstance']['flows']['name'],
'flows_name' => $record['instance']['flows']['name'],
'instance_id' => $record['instance_id'],
'biz_id' => $record['approvalInstance']['biz_id'],
'biz_desc' => '备货单【'.$record['approvalInstance']['bizInfo']['order_no'].'】',
'biz_type' => $record['approvalInstance']['flow_type'],
'biz_id' => $record['instance']['biz_id'],
'biz_desc' => '备货单【'.$record['instance']['bizInfo']['order_no'].'】',
'biz_type' => $record['instance']['flow_type'],
'initiator_name' => $record['approvalInstance']['initiator']['name'],
'initiator_avatar' => $record['approvalInstance']['initiator']['avatar'],
'initiator_name' => $record['instance']['initiator']['name'],
'initiator_avatar' => $record['instance']['initiator']['avatar'],
'approver_name' => $record['approver']['name'],
'approver_avatar' => $record['approver']['avatar'],
@@ -53,8 +52,8 @@ class ApprovalRecordsController extends BaseController
'comment' => $record['comment'],
'approved_at' => $record['approved_at'],
'finished_at' => $record['approvalInstance']['finished_at'],
'deadline_at' => $record['approvalInstance']['deadline_at'],
'finished_at' => $record['instance']['finished_at'],
'deadline_at' => $record['instance']['deadline_at'],
'created_at' => $record['created_at']
];
@@ -87,4 +86,57 @@ class ApprovalRecordsController extends BaseController
return $this->error($e->getMessage());
}
}
public function todo(Request $request)
{
try {
$raw = $this->service->serviceList($request, 'todo');
$data = $this->transformData($raw, method_exists($this, 'todoFormat')
? [$this, 'todoFormat']
: null);
return $this->success($data);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
protected function todoFormat($data)
{
if (isset($data['records']) && count($data['records']) > 0) {
foreach ($data['records'] as $key => &$record) {
$result = [
'id' => $record['id'],
'flows_name' => $record['instance']['flows']['name'],
'instance_id' => $record['instance_id'],
'biz_id' => $record['instance']['biz_id'],
'biz_desc' => '备货单号【'.$record['instance']['bizInfo']['order_no'].'】',
'biz_type' => $record['instance']['flow_type'],
'initiator_name' => $record['instance']['initiator']['name'],
'initiator_avatar' => $record['instance']['initiator']['avatar'],
'approver_name' => $record['approver']['name'],
'approver_avatar' => $record['approver']['avatar'],
'step_index' => $record['step_index'],
'action' => $record['action'],
'action_desc' => SysDictItem::where('item_value', $record['action'])->where('status', 1)->value('item_label'),
'status' => $record['status'],
'status_desc' => SysDictItem::where('item_value', $record['status'])->where('status', 1)->value('item_label'),
'comment' => $record['comment'],
'approved_at' => $record['approved_at'],
'finished_at' => $record['instance']['finished_at'],
'deadline_at' => $record['instance']['deadline_at'],
'created_at' => $record['created_at']
];
$record = $result;
}
}
return $data;
}
}