星科源

app/Http/Controllers/Api/DingTalkController.php

@@ -233,7 +233,7 @@ class DingTalkController extends BaseController
                         $staffId = $event['staffId'] ?? "";
 
                         // 动作导致流程成功 或 流程终止
-                        $this->settleData($type, $result, $processInstanceId, $staffId);
+                        $this->settleDataH($type, $result, $processInstanceId, $staffId);
 //                        Log::info('审批实例变更', compact('processInstanceId','result'));
 
 //                        Log::info("最后一个节点审核通过，审批完成", compact('processInstanceId'));
@@ -293,7 +293,16 @@ class DingTalkController extends BaseController
             $record->save();
 
             $record_array = $record->toArray();
-            if($record_array['del_time'] == 2) ProcessDataJob::dispatch($record_array)->onQueue(Record::$job);
+            if($record_array['del_time'] == 2) {
+                //通过后 =》 逻辑
+                ProcessDataJob::dispatch($record_array)->onQueue(Record::$job);
+            }elseif ($record_array['del_time'] == 1){
+                //其他环节 =》 更新表状态为中
+                U8State::updateOrCreate(
+                    ['order_number' => $record_array['order_number'], 'login_type' => $record_array['login_type'], 'type' => $record_array['type']],
+                    ['state' => U8State::state_two]
+                );
+            }
 
         } catch (\Throwable $exception) {
             Log::channel('apiLog')->info('钉钉回调处理数据保存异常', ['msg' => $exception->getMessage()]);

app/Service/U8ServerService.php

@@ -419,7 +419,7 @@ class U8ServerService extends Service
         foreach ($list['data'] as $key => $value){
             if(isset($map[$value->order_number])) {
                 $m = $map[$value->order_number];
-                $state = $m['state'];
+                $state = $m;
                 $state_title = Record::state_name[$state];
             }else{
                 $state = Record::state_minus_one;
@@ -444,7 +444,7 @@ class U8ServerService extends Service
 
         if(isset($map[$list['order_number']])) {
             $m = $map[$list['order_number']];
-            $state = $m['state'];
+            $state = $m;
             $state_title = Record::state_name[$state];
         }else{
             $state = Record::state_minus_one;

app/Service/U8XkyServerService.php

@@ -220,7 +220,7 @@ class U8XkyServerService extends Service
 
             if(isset($map[$value['order_number']])) {
                 $m = $map[$value['order_number']];
-                $state = $m['state'];
+                $state = $m;
                 $state_title = Record::state_name[$state];
             }else{
                 $state = Record::state_minus_one;
@@ -398,7 +398,7 @@ class U8XkyServerService extends Service
 
             if(isset($map[$value['order_number']])) {
                 $m = $map[$value['order_number']];
-                $state = $m['state'];
+                $state = $m;
                 $state_title = Record::state_name[$state];
             }else{
                 $state = Record::state_minus_one;