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

审核附件

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2026-02-10 13:57:52 +08:00
parent 6469e05176
commit 452182f0b2
8 changed files with 147 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/InvRequisitionApproveService.php
+12 -2
View File
@@ -93,13 +93,13 @@ class InvRequisitionApproveService
}
/** 执行审批 */
public function approve(int $requisitionId, int $approverId, int $uid, string $action, string $comment = '')
public function approve(int $requisitionId, int $approverId, int $uid, string $action, string $comment = '', array $attachment = [])
{
if (!in_array($action, ['1','2'], true)) { //审批动作：1通过 2驳回
throw new BusinessException("无效的审批操作");
}
return Db::transaction(function () use ($requisitionId, $approverId, $uid, $action, $comment) {
return Db::transaction(function () use ($requisitionId, $approverId, $uid, $action, $comment, $attachment) {
// $instance = Db::table('approval_instances')->where('id', $instanceId)->lockForUpdate()->first();
$requisition = Db::table('inv_requisition')->where('id', $requisitionId)->lockForUpdate()->first();
if (!$requisition) throw new BusinessException("审批实例未找到");
@@ -151,6 +151,16 @@ class InvRequisitionApproveService
'action_at' => $now,
'updated_at' => $now,
]);
foreach ($attachment as $attac) {
Db::table('inv_requisition_approve_attachment')->insertGetId([
'requisition_id' => $requisitionId,
'approve_id' => $approverId,
'file_name' => $attac['original_name'],
'file_path' => $attac['file_path'],
'created_at' => $now,
]);
}
// 2) 已通过步骤与总步数相等则结束审核流程
$pass = Db::table('inv_requisition_approve')
app/common/service/InvRequisitionItemReturnService.php
+13 -2
View File
@@ -386,8 +386,10 @@ class InvRequisitionItemReturnService
public function serviceReturnConfirm(Request $request, array $data, string $scene = 'returnConfirm')
{
try {
$attachment = $request->post('attachment');
unset($data['attachment']);
// 归还确认是业务顶层方法，这里统一使用事务
return Db::transaction(function () use ($request, $data, $scene) {
return Db::transaction(function () use ($request, $data, $scene, $attachment) {
// 1. 当前操作人信息
$userInfo = (new UserService())->getUserInfo($request->user->uid, '');
@@ -430,7 +432,16 @@ class InvRequisitionItemReturnService
// 4. 更新归还记录（状态 + 审核人 + 备注等）
$updateResult = $this->logicUpdateBy($config, $data);
$resultItem = $this->logicShow($config);
InvRequisitionReturn::where('id',$resultItem['status'])->update(['status' => $data['status']]);
InvRequisitionReturn::where('id',$resultItem['return_id'])->update(['status' => $data['status']]);
foreach ($attachment as $attac) {
Db::table('inv_requisition_return_approve_attachment')->insertGetId([
'requisition_id' => $resultItem['requisition_id'],
'return_id' => $resultItem['return_id'],
'file_name' => $attac['original_name'],
'file_path' => $attac['file_path'],
'created_at' => time(),
]);
}
if ($updateResult === 0) {
throw new BusinessException('更新归还申请失败，可能记录不存在或已被处理');
}