借用

app/common/service/InvRequisitionApproveService.php

@@ -93,7 +93,7 @@ class InvRequisitionApproveService
     }
 
     /** 执行审批 */
-    public function approve(int $requisitionId, int $approverId, string $action, string $comment = '')
+    public function approve(int $requisitionId, int $approverId, int $uid, string $action, string $comment = '')
     {
         if (!in_array($action, ['1','2'], true)) { //审批动作：1通过 2驳回
             throw new BusinessException("无效的审批操作");
@@ -103,12 +103,12 @@ class InvRequisitionApproveService
 //            $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("审批实例未找到");
-            if ($requisition->status !== 'processing') {
+            if ($requisition->status !== 10 && $requisition->status !== 11) {
                 return ['status' => 'noop', 'msg' => '实例未处理'];
             }
 
             //审批流程
-            $flow  = Db::table('approval_flows')->where('type', $requisition->flow_type)->first();
+            $flow  = Db::table('approval_flows')->where('type', 'inv_requisition')->first();
             if (!$flow) throw new BusinessException("审批流程定义未找到");
 
             $steps = json_decode($flow->steps, true);
@@ -119,7 +119,7 @@ class InvRequisitionApproveService
             // 找到该用户在本步的 pending 记录（加锁）
             $pendingRecord = Db::table('inv_requisition_approve')
                 ->where('requisition_id', $requisitionId)
-                ->where('approver_id', $approverId)
+                ->where('id', $approverId)
                 ->where('action', 0)
                 ->lockForUpdate()
                 ->first();
@@ -140,26 +140,26 @@ class InvRequisitionApproveService
                 return ['status' => 'noop', 'msg' => '无待处理记录'];
             }
 
-            $now = date('Y-m-d H:i:s');
+            $now = time();
 
             // 1) 更新当前人的审批记录
             Db::table('inv_requisition_approve')->where('id', $pendingRecord->id)->update([
                 'action'      => $action,
                 'comment'     => $comment,
-                'approved_at' => $now,
+                'action_at' => $now,
                 'updated_at'  => $now,
             ]);
 
             // 2) 已通过步骤与总步数相等则结束审核流程
             $pass = Db::table('inv_requisition_approve')
                 ->where('requisition_id', $requisitionId)
-                ->where('approver_id', $approverId)
                 ->where('action', 1)
                 ->count();
             if($action == 1){
                 if(count($steps) == $pass){
-                    $requisition->status = 12;
-                    $requisition->save();
+                    Db::table('inv_requisition')->where('id', $requisition->id)->update(['status'=>12]);
+//                    $requisition->status = 12;
+//                    $requisition->save();
                     return ['status' => 'complete', 'msg' => '已通过'];
                 }
             }
@@ -173,28 +173,41 @@ class InvRequisitionApproveService
                     'updated_at'  => $now,
                 ]);
                 if(count($steps) == $pass){
-                    $requisition->status = 13;
-                    $requisition->save();
+                    Db::table('inv_requisition')->where('id', $requisition->id)->update(['status'=>12]);
+//                    $requisition->status = 13;
+//                    $requisition->save();
                     return ['status' => 'complete', 'msg' => '拒绝'];
                 }
             }
 
 
             // 4) 通过 => 进入下一步或结束
-            $formData  = ['manage_user_id'=>''];
+            $requisitionItem = Db::table('inv_requisition_item')->where('requisition_id', $requisitionId)->first();
+            $item_id = Db::table('inv_item')->where('id', $requisitionItem->item_id)->first();
+            $formData  = ['manage_user_id'=>$item_id->manage_user_id];
 
             $nextIndex = $pass;
             $nextStep = $steps[$nextIndex];
             $service = new \app\common\utils\approval\service\ApprovalFlowService();
 
             $instance = (object)[
+                'initiator_id' => $requisition->applicant_id, //申请人id
                 'form_data'=>json_encode($formData, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
             ];
             $approverIds = $service->StetApprovers($nextStep, $instance, true);
+//            if($approverIds == "manage_user_id"){ //物品管理人审核步骤查询管理人
+//                $requisitionItem = Db::table('inv_requisition_item')->where('id', $requisitionId)->first();
+//                $invItem = Db::table('inv_requisition_item')->where('id', $requisitionItem->item_id)->first();
+//
+//                if(empty($invItem)){
+//                    return ['status' => 'noop', 'msg' => '未查询到物品管理人'];
+//                }
+//                $approverIds = [$invItem->manage_user_id];
+//            }
             $approver = User::where('id', array_pop($approverIds))->first();
             Db::table('inv_requisition_approve')->insertGetId([
                 'requisition_id' => $requisitionId, //申请单ID
-                'node_type' => $nextStep['approvers']['initiator_leader'],
+                'node_type' => $nextStep['approvers'][0]['value'],
                 'approver_id' => $approver->id,
                 'approver_name' => $approver->name,
                 'action' => 0,