Develop

models/WorkflowRuntime.php

@@ -120,61 +120,15 @@ class WorkflowRuntime extends \lsat\microbase\models\BaseRestModel
         ];
     }
 
-//    public static function getInstancesCodes($userCode, $requestParams, $submitter = false)
-//    {
-//        $httpRequest = new HttpRequest([
-//            'method' => 'POST',
-//            'url' => Yii::$app->params['workflow']['url'] . Yii::$app->params['workflow']['api_endpoint'] . getenv("WORKFLOW_API_RUNTIME_ASSIGN"),
-//            'data' => [
-//                'assign' => $userCode,
-//                'authStatus' => $requestParams['runtime_auth_status'] ?? null,
-//            ],
-//            'jwtToken' => Yii::$app->user->identity->jwtToken,
-//            'format' => HttpRequest::FORMAT_TYPE_JSON,
-//            'associative' => true,
-//        ]);
-//        $response = $httpRequest->send();
-//        $result = [];
-////        Yii::error($response['data']);
-////        Yii::error($response);
-//        if (!empty($response) && $response['status'] && !empty($response['data'])) {
-//            if($submitter){
-//                $data = $response['data'];
-//            }else{
-//                $data = array_filter($response['data'], function ($res) {
-//                    return $res['makerId'] != $res['assign'];
-//                });
-//            }
-//
-//            $result = ArrayHelper::getColumn($data, 'instanceCode');
-//        }
-//        return $result;
-//    }
-    public static function getInstancesCodes($userCode, $requestParams, $submitter = false,$modelCode = null)
+    public static function getInstancesCodes($userCode, $requestParams, $submitter = false)
     {
-        $baseData = [
-            'authStatus' => $requestParams['runtime_auth_status'] ?? null,
-        ];
-        if(is_array($userCode)){
-            $baseData['assigns'] = $userCode;
-        }else{
-            $baseData['assign'] = $userCode;
-        }
-        if (!$submitter) {
-            if (is_array($userCode)) {
-                $baseData["makerIds"] = $userCode;
-            } else {
-                $baseData["makerIds"] = [$userCode];
-            }
-        }
-        if($modelCode){
-            $baseData["instanceCode"] = "###".$modelCode;
-        }
-
         $httpRequest = new HttpRequest([
             'method' => 'POST',
             'url' => Yii::$app->params['workflow']['url'] . Yii::$app->params['workflow']['api_endpoint'] . getenv("WORKFLOW_API_RUNTIME_ASSIGN"),
-            'data' => $baseData,
+            'data' => [
+                'assign' => $userCode,
+                'authStatus' => $requestParams['runtime_auth_status'] ?? null,
+            ],
             'jwtToken' => Yii::$app->user->identity->jwtToken,
             'format' => HttpRequest::FORMAT_TYPE_JSON,
             'associative' => true,
@@ -183,14 +137,14 @@ class WorkflowRuntime extends \lsat\microbase\models\BaseRestModel
         $result = [];
         Yii::error($response['data']);
         if (!empty($response) && $response['status'] && !empty($response['data'])) {
-//            if($submitter){
-//                $data = $response['data'];
-//            }else{
-//                $data = array_filter($response['data'], function ($res) {
-//                    return $res['makerId'] != $res['assign'];
-//                });
-//            }
-            $data = $response['data']['content'];
+            if($submitter){
+                $data = $response['data'];
+            }else{
+                $data = array_filter($response['data'], function ($res) {
+                    return $res['makerId'] != $res['assign'];
+                });
+            }
+
             $result = ArrayHelper::getColumn($data, 'instanceCode');
         }
         return $result;