提交

app/enterprise/api/TalentApi.php

@@ -6,6 +6,7 @@ use app\enterprise\model\Talent;
 use app\common\api\DictApi;
 use app\common\api\TalentConditionApi;
 use app\common\api\TalentLogApi;
+use app\common\api\TalentState;
 
 /**
  * Description of TalentApi
@@ -30,7 +31,7 @@ class TalentApi {
         return Talent::findOrEmpty($id);
     }
 
-    public static function getList($request, $checkStates = []) {
+    public static function getList($request, $step = 0) {
         $order = trim($request->param("order")) ?: "desc";
         $offset = trim($request->param("offset")) ?: 0;
         $limit = trim($request->param("limit")) ?: 10;
@@ -47,68 +48,84 @@ class TalentApi {
         if (session("user")["usertype"] == 2) {
             $where[] = ["enterprise_id", "=", session("user")["uid"]];
         }
-        if ($checkStates) {
-            $where[] = ["checkState", "in", $checkStates];
-        }
-        if ($name) {
-            $where[] = ["name", "like", "%" . $name . "%"];
-        }
-        if ($idCard) {
-            $where[] = ["card_number", "like", "%" . $idCard . "%"];
-        }
-        if ($sex) {
-            $where[] = ["sex", $sex];
-        }
-        if ($nation) {
-            $where[] = ["nation", $nation];
-        }
-        if ($nationality) {
-            $where[] = ["nationality", $nationality];
-        }
-        if ($talentArrange) {
-            $where[] = ["talent_arrange", $talentArrange];
-        }
-        if ($checkState) {
-            switch ($checkState) {
-                case -1:
-                    $where[] = [["checkState", $checkState], ["isPublic", ">=", 5]];
-                    break;
+        if ($step) {
+            switch ($step) {
                 case 1:
-                    $where[] = [["checkState", $checkState]];
+                    $where[] = ["checkState", "in", [TalentState::FST_SAVE, TalentState::BASE_REJECT, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
+                    switch ($checkState) {
+                        case -1:
+                            $where[] = ["checkState", "=", TalentState::BASE_VERIFY_FAIL];
+                            break;
+                        case 1:
+                            $where[] = ["checkState", "=", TalentState::FST_SAVE];
+                            break;
+                        case 2:
+                            $where[] = ["checkState", "=", TalentState::BASE_REJECT];
+                            break;
+                        case 3:
+                            $where[] = ["checkState", "=", TalentState::FST_SUBMIT];
+                            break;
+                    }
                     break;
                 case 2:
-                    $where[] = [["checkState", "in", "5,10"]];
-                    break;
-                case 3:
-                    $where[] = [["checkState", "not in", "1,5,10"], ["isPublic", "<", 5]];
-                    break;
-                case 4:
-                    $where[] = [["checkState", 35], ["isPublic", ">=", 5]];
-                    break;
+                    $where[] = ["checkState", "not in", [TalentState::FST_SAVE, TalentState::BASE_REJECT, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
+                    switch ($checkState) {
+                        case -1:
+                            $where[] = ["checkState", "in", [TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL]];
+                            break;
+                        case 1:
+                            $where[] = ["checkState", "=", TalentState::SCND_SAVE];
+                            break;
+                        case 2:
+                            $where[] = ["checkState", "in", [TalentState::FST_VERIFY_REJECT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
+                            break;
+                        case 3:
+                            $where[] = ["checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS, TalentState::REVERIFY_PASS, TalentState::ZX_PASS,
+                                    TalentState::ANNOUNCED_REVERIFY_PASS, TalentState::PUBLISH_PASS]];
+                            break;
+                        case 4:
+                            $where[] = ["checkState", "=", TalentState::CERTIFICATED];
+                            break;
+                    }
             }
+            if ($name) {
+                $where[] = ["name", "like", "%" . $name . "%"];
+            }
+            if ($idCard) {
+                $where[] = ["card_number", "like", "%" . $idCard . "%"];
+            }
+            if ($sex) {
+                $where[] = ["sex", "=", $sex];
+            }
+            if ($nation) {
+                $where[] = ["nation", "=", $nation];
+            }
+            if ($nationality) {
+                $where[] = ["nationality", "=", $nationality];
+            }
+            if ($talentArrange) {
+                $where[] = ["talent_arrange", "=", $talentArrange];
+            }
+            $count = Talent::where($where)->count();
+            $list = Talent::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
+            $talentTagList = DictApi::selectByParentCode("enterprise_tag"); //单位标签
+            $talentArangeList = DictApi::selectByParentCode("talent_arrange"); //人才层次
+            $industries = DictApi::selectByParentCode("industry_field"); //产业
+            $enterprise = \app\common\model\Enterprise::find(session("user")["uid"]);
+            foreach ($list as $key => $item) {
+                $condition = TalentConditionApi::getOne($item["talent_condition"]);
+                $list[$key]["talentArrangeName"] = isset($talentArangeList[$item["talent_arrange"]]) ? $talentArangeList[$item["talent_arrange"]] : "";
+                $list[$key]["identifyConditionText"] = $condition["name"];
+                $list[$key]["companyIds"] = $condition["companyIds"];
+                $list[$key]["type"] = $enterprise["type"];
+                $list[$key]["enterpriseName"] = $enterprise["name"];
+                $list[$key]["industryName"] = $industries[$enterprise["industryFieldNew"]];
+                $list[$key]["enterpriseTagName"] = $talentTagList[$enterprise["enterpriseTag"]];
+                $last_log = TalentLogApi::getLastLog($item["id"], 1);
+                $list[$key]["real_state"] = $last_log["state"];
+            }
+            return ["total" => $count, "rows" => $list];
         }
-        if ($request->param("type") == 2) {
-            $where[] = [["checkState", 35], ["isPublic", 6]];
-        }
-        $count = Talent::where($where)->count();
-        $list = Talent::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
-        $talentTagList = DictApi::selectByParentCode("enterprise_tag"); //单位标签
-        $talentArangeList = DictApi::selectByParentCode("talent_arrange"); //人才层次
-        $industries = DictApi::selectByParentCode("industry_field"); //产业
-        $enterprise = \app\common\model\Enterprise::find(session("user")["uid"]);
-        foreach ($list as $key => $item) {
-            $condition = TalentConditionApi::getOne($item["talent_condition"]);
-            $list[$key]["talentArrangeName"] = isset($talentArangeList[$item["talent_arrange"]]) ? $talentArangeList[$item["talent_arrange"]] : "";
-            $list[$key]["identifyConditionText"] = $condition["name"];
-            $list[$key]["companyIds"] = $condition["companyIds"];
-            $list[$key]["type"] = $enterprise["type"];
-            $list[$key]["enterpriseName"] = $enterprise["name"];
-            $list[$key]["industryName"] = $industries[$enterprise["industryFieldNew"]];
-            $list[$key]["enterpriseTagName"] = $talentTagList[$enterprise["enterpriseTag"]];
-            $last_log = TalentLogApi::getLastLog($item["id"], 1);
-            $list[$key]["real_state"] = $last_log["state"];
-        }
-        return ["total" => $count, "rows" => $list];
     }
 
 }

app/enterprise/controller/Base.php

@@ -27,7 +27,8 @@ class Base extends EnterpriseController {
     }
 
     public function list() {
-        $res = TalentApi::getList($this->request, [TalentState::FST_SAVE, TalentState::FST_SUBMIT]);
+        $step = 1;
+        $res = TalentApi::getList($this->request, $step);
         return json($res);
     }
 

app/enterprise/controller/Talent.php

@@ -25,7 +25,8 @@ class Talent extends EnterpriseController {
     }
 
     public function list() {
-        $res = TalentApi::getList($this->request);
+        $step = 2;
+        $res = TalentApi::getList($this->request, $step);
         return json($res);
     }
 

app/enterprise/view/base/index.html

@@ -72,17 +72,6 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-sm-3">                         
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            单位标签
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="enterprise_tag">
-                                    </select>
-                                </div>
-                            </div>
                             <div class="col-sm-3">                    
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -92,7 +81,7 @@
                                     </div>
                                     <select class="form-control" id="checkState">
                                         <option value=""></option>
-                                        <option value="13">审核不通过</option>
+                                        <option value="-1">审核不通过</option>
                                         <option value="1">待提交</option>
                                         <option value="2">已驳回</option>
                                         <option value="3">审核中</option>
@@ -115,9 +104,6 @@
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openTalentInfoDetail()" id="">
                                 <i class="fa fa-edit"></i>&nbsp;修改申报
                             </button>
-<!--                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openTalentInfoSelect()" id="">-->
-<!--                                <i class="fa fa-book"></i>&nbsp;查看申报-->
-<!--                            </button>-->
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.delete()" id="">
                                 <i class="fa fa-remove"></i>&nbsp;删除申报
                             </button>

app/enterprise/view/talent/index.html

@@ -72,17 +72,6 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-sm-3">                         
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            单位标签
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="enterprise_tag">
-                                    </select>
-                                </div>
-                            </div>
                             <div class="col-sm-3">                        
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -94,7 +83,7 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-sm-3">                    
+                            <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
                                         <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">

public/static/modular/gate/talentBase/talentBase.js

@@ -305,12 +305,11 @@ TalentInfo.delete = function () {
 TalentInfo.formParams = function () {
     var queryData = {};
     queryData['name'] = $("#name").val();
-    queryData['idCard'] = $("#idCard").val();
+    queryData['card_number'] = $("#idCard").val();
     queryData['sex'] = $("#sex").val();
     queryData['nation'] = $("#nation").val();
     queryData['nationality'] = $("#nationality").val();
-    queryData['talentType'] = $("#talentType").val();
-    queryData['talentArrange'] = $("#talentArrange").val();
+    queryData['talent_arrange'] = $("#talent_arrange").val();
     queryData['checkState'] = $("#checkState").val();
     return queryData;
 }

public/static/modular/gate/talentInfo/talentInfo.js

@@ -96,11 +96,35 @@ TalentInfo.initColumn = function () {
                             return "<span class='label label-success'>待复审</span>";
                             break;
                         case 11:
-                            return "<span class='label label-primary'>认定通过</span>";
+                            return "<span class='label label-primary'>复审通过待核查征信</span>";
                             break;
                         case 13:
                             return "<span class='label label-danger'>复审失败</span>";
                             break;
+                        case 21:
+                            return "<span class='label label-success'>征信通过</span>";
+                            break;
+                        case 22:
+                            return "<span class='label label-danger'>征信不通过</span>";
+                            break;
+                        case 23:
+                            return "<span class='label label-success'>公示待审核</span>";
+                            break;
+                        case 24:
+                            return "<span class='label label-success'>待公布审核</span>";
+                            break;
+                        case 25:
+                            return "<span class='label label-danger'>公示审核不通过</span>";
+                            break;
+                        case 26:
+                            return "<span class='label label-success'>公布通过</span>";
+                            break;
+                        case 27:
+                            return "<span class='label label-danger'>公布不通过</span>";
+                            break;
+                        case 28:
+                            return "<span class='label label-inverse'>已发证</span>";
+                            break;
                     }
                 }
             }
@@ -306,12 +330,11 @@ TalentInfo.delete = function () {
 TalentInfo.formParams = function () {
     var queryData = {};
     queryData['name'] = $("#name").val();
-    queryData['idCard'] = $("#idCard").val();
+    queryData['card_number'] = $("#idCard").val();
     queryData['sex'] = $("#sex").val();
     queryData['nation'] = $("#nation").val();
     queryData['nationality'] = $("#nationality").val();
-    queryData['talentType'] = $("#talentType").val();
-    queryData['talentArrange'] = $("#talentArrange").val();
+    queryData['talent_arrange'] = $("#talent_arrange").val();
     queryData['checkState'] = $("#checkState").val();
     return queryData;
 }