初审增加重新提交审核的筛查，及行业领域单位标签的筛查

app/admin/controller/Talent.php

@@ -134,7 +134,14 @@ class Talent extends AdminController {
     public function fst_verify() {
         $enterprises = EnterpriseApi::getSimpleList();
         $conditions = TalentConditionApi::getList([1, 2, 3, 4, 5, 6, 7], $this->user["type"]);
-        return view("", ["enterprises" => $enterprises, "talent_conditions" => $conditions]);
+        $industry_field_new = array_column(DictApi::findChildDictByCode("industry_field"), "code");
+        foreach ($industry_field_new as &$field) {
+            $field .= "_field";
+        }
+        $parent_industry_fields = implode(",", $industry_field_new);
+        $where[] = ["d2.code", "in", $parent_industry_fields];
+        $industry_field_old = \app\common\model\Dict::alias("d1")->field("d1.*,d2.`name` as pname")->leftJoin("new_talent_dict d2", "d1.pid=d2.id")->order("name asc")->where($where)->select();
+        return view("", ["enterprises" => $enterprises, "talent_conditions" => $conditions, "industry_field_old" => $industry_field_old]);
     }
 
     /**
@@ -1458,7 +1465,7 @@ class Talent extends AdminController {
                             }
                         }
                         if ($where) {
-                            $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                            $files = \think\facade\Db::table("new_common_filetype")->where($where)->order("sn asc")->select();
                         } else {
                             $files = [];
                         }
@@ -1475,9 +1482,9 @@ class Talent extends AdminController {
                         $where[] = ["delete", "=", 0];
                         if ($condition && $condition["bindFileTypes"]) {
                             $whr[] = ["id", "in", explode(",", $condition["bindFileTypes"])];
-                            $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->select();
+                            $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->order("sn asc")->select();
                         } else {
-                            $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                            $files = \think\facade\Db::table("new_common_filetype")->where($where)->order("sn asc")->select();
                         }
                     }
                 }
@@ -1519,9 +1526,9 @@ class Talent extends AdminController {
             $where[] = ["delete", "=", 0];
             if ($condition && $condition["bindFileTypes"]) {
                 $whr[] = ["id", "in", explode(",", $condition["bindFileTypes"])];
-                $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->select();
+                $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->order("sn asc")->select();
             } else {
-                $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                $files = \think\facade\Db::table("new_common_filetype")->where($where)->order("sn asc")->select();
             }
             $responseObj->code = 200;
             $responseObj->id = $id;

app/admin/view/talent/fst_verify.html

@@ -110,6 +110,7 @@
                                     <select class="form-control" id="checkState">
                                         <option value="">---请选择---</option>
                                         <option value="-1">保存未提交</option>
+                                        <option value="5">重新提交</option>
                                         <option value="1">待审核</option>
                                         <option value="2">审核驳回</option>
                                         <option value="3">审核通过</option>
@@ -188,6 +189,32 @@
                                     </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="industry_field_old">
+                                        <option value="">---请选择---</option>
+                                        {volist name="industry_field_old" id="field"}
+                                        <option value="{$field.code}">{$field.name}</option>
+                                        {/volist}
+                                    </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">

app/common/api/VerifyApi.php

@@ -284,6 +284,12 @@ class VerifyApi {
         if ($params["industry_field"]) {
             $where[] = ["e.industryFieldNew", "=", $params["industry_field"]];
         }
+        if ($params["industry_field_old"]) {
+            $where[] = ["e.industryFieldOld", "=", $params["industry_field_old"]];
+        }
+        if ($params["enterprise_tag"]) {
+            $where[] = ["e.enterpriseTag", "=", $params["enterprise_tag"]];
+        }
         if ($params["talent_type"]) {
             $where[] = ["ti.talent_type", "=", $params["talent_type"]];
         }
@@ -389,6 +395,10 @@ class VerifyApi {
                         case 4://失败
                             $where[] = ["tl.state", "in", [TalentState::FST_VERIFY_FAIL]];
                             break;
+                        case 5://重新提交
+                            $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.last_state", "=", TalentState::FST_VERIFY_REJECT];
+                            break;
                         default:
                             //$where[] = ["ti.checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_FAIL]];
                             //$where[] = ["tl.new_state", "in", [TalentState::SCND_SAVE, TalentState::SCND_SUBMIT]];

public/static/modular/talentIdentify/talentInfo/talentInfo_common.js

@@ -31,6 +31,8 @@ TalentInfo.formParams = function () {
     queryData['politics'] = $("#politics").val();
     queryData['enterprise_id'] = $("#enterprise_id").val();
     queryData['industry_field'] = $("#industry_field").val();
+    queryData['industry_field_old'] = $("#industry_field_old").val();
+    queryData['enterprise_tag'] = $("#enterprise_tag").val();
     queryData['source'] = $("#source").val();
     queryData['city'] = $("#city").val();
     queryData['import_way'] = $("#import_way").val();
@@ -79,6 +81,8 @@ TalentInfo.reset = function () {
     $("#politics").val("");
     $("#enterprise_id").val("").trigger("chosen:updated");
     $("#industry_field").val("");
+    $("#industry_field_old").val("");
+    $("#enterprise_tag").val("");
     $("#source").val("");
     $("#fromCity").val("");
     $("#import_way").val("");
@@ -200,7 +204,8 @@ TalentInfo.init = function () {
         {"name": "talent_type", "code": "talent_type"},
         {"name": "talent_arrange", "code": "talent_arrange"},
         {"name": "source", "code": "source"},
-        {"name": "street", "code": "street"}];
+        {"name": "street", "code": "street"},
+        {"name": "enterprise_tag", "code": "enterprise_tag"},];
     Feng.findChildDictBatch(JSON.stringify(arr));
     //TalentInfo.getIdentifyCondition();
     TalentInfo.getProvince();