sugangqiang 2 年之前
父节点
当前提交
f51856a99b
共有 1 个文件被更改,包括 69 次插入34 次删除
  1. 69 34
      app/common/controller/Api.php

+ 69 - 34
app/common/controller/Api.php

@@ -115,42 +115,77 @@ class Api extends BaseController {
         }
         $new_list = [];
         foreach ($list as $key => $item) {
-            switch ($item['category']) {
-                case 'enterprise_change':
-                    switch ($item['step']) {
-                        case 100:
-                            $new_item["stepName"] = "<span class='label'>用户操作</span>";
-                            break;
-                        case 101:
-                            $new_item["stepName"] = "<span class='label label-primary'>审核</span>";
-                            break;
-                        case 102:
-                            $new_item["stepName"] = "<span class='label label-danger'>设置冻结</span>";
-                            break;
-                        case 103:
-                            $new_item["stepName"] = "<span class='label label-info'>重置密码</span>";
-                            break;
-                    }
-                    switch ($item['state']) {
-                        case 1:
-                            $new_item["stateName"] = "<span class='label label-success'>待提交</span>";
-                            break;
-                        case 2:
-                            $new_item["stateName"] = "<span class='label label-success'>待审核</span>";
-                            break;
-                        case 3:
-                            $new_item["stateName"] = "<span class='label label-danger'>审核驳回</span>";
-                            break;
-                        case 4:
-                            $new_item["stateName"] = "<span class='label label-primary'>审核通过</span>";
-                            break;
-                        case 5:
-                            $new_item["stateName"] = "<span class='label label-warm'>重新提交</span>";
-                            break;
+            switch ($item['type']) {
+                case 10:
+                    if ($item["category"] == "enterprise_change") {
+                        switch ($item['step']) {
+                            case 100:
+                                $new_item["stepName"] = "<span class='label'>用户操作</span>";
+                                break;
+                            case 101:
+                                $new_item["stepName"] = "<span class='label label-primary'>审核</span>";
+                                break;
+                            case 102:
+                                $new_item["stepName"] = "<span class='label label-danger'>设置冻结</span>";
+                                break;
+                            case 103:
+                                $new_item["stepName"] = "<span class='label label-info'>重置密码</span>";
+                                break;
+                        }
+                        switch ($item['state']) {
+                            case 1:
+                                if ($item["stateChange"]) {
+                                    $new_item["stateName"] = "<span class='label label-success'>待提交</span>";
+                                } else {
+                                    $item['stateChange'] = "修改密码";
+                                }
+                                break;
+                            case 2:
+                                $new_item["stateName"] = "<span class='label label-success'>待审核</span>";
+                                break;
+                            case 3:
+                                $new_item["stateName"] = "<span class='label label-danger'>审核驳回</span>";
+                                break;
+                            case 4:
+                                $new_item["stateName"] = "<span class='label label-primary'>审核通过</span>";
+                                break;
+                            case 5:
+                                $new_item["stateName"] = "<span class='label label-warm'>重新提交</span>";
+                                break;
+                        }
+                        $new_item["stateChange"] = $item['stateChange'];
+                    } else {
+                        switch ($item['step']) {
+                            case 100:
+                                $new_item["stepName"] = "<span class='label'>用户操作</span>";
+                                break;
+                            case 101:
+                                $new_item["stepName"] = "<span class='label label-primary'>注册审核</span>";
+                                break;
+                            case 102:
+                                $new_item["stepName"] = "<span class='label label-danger'>设置冻结</span>";
+                                break;
+                            case 103:
+                                $new_item["stepName"] = "<span class='label label-info'>重置密码</span>";
+                                break;
+                        }
+                        switch ($item['state']) {
+                            case 1:
+                                $new_item["stateName"] = "<span class='label label-success'>待审核</span>";
+                                break;
+                            case 2:
+                                $new_item["stateName"] = "<span class='label label-danger'>审核驳回</span>";
+                                break;
+                            case 3:
+                                $new_item["stateName"] = "<span class='label label-primary'>审核通过</span>";
+                                break;
+                            default:
+                                break;
+                        }
+                        $new_item["stateChange"] = $item['stateChange'];
                     }
-                    $new_item["stateChange"] = $item['stateChange'];
                     break;
-                default:
+                case 1:
                     $new_item["stepName"] = DictApi::getCheckLogStepName($item["state"], $item["step"]);
                     if (in_array($item["state"], [TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL])) {
                         $new_item["stateName"] = '<span class="label label-danger">审核不通过</span>';