增加导入旧系统电路人才的入口；修改不同批次同身份证可进行人才认证申请

app/admin/controller/System.php

@@ -66,4 +66,37 @@ class System extends AdminController {
         }
     }
 
+    /**
+     * 导入旧的电路人才到新库
+     *
+      -1 复核不通过 173
+      1 待提交 4
+      7 待初审 22
+      10 初审驳回 44
+      20 复审驳回 1
+      25 初审通过 71
+      35 复核通过，待核查征信 1281
+     * isPublic 5：待发证 6：已发证
+     * active 1：在职 2：离职
+     * isEffect 1：有效 4：失效 其它：已过期
+     * 需要增加字段
+     * cur_quit_time离职时间
+     * active在职状态
+     * identifyMonth认证月份
+     * identifyExpireTime
+     * oldId 旧id
+     */
+    public function import_old_jcdl() {
+        $where = [];
+        $where[] = ["type", "=", 2];
+        $list = Db::table("un_talent_info")->where($where)->select();
+        $count = session("oldJcjlTalentInfoToNewTable");
+        $count += count($list);
+        session("oldJcjlTalentInfoToNewTable", $count);
+        foreach ($list as $item) {
+            queue("app\job\Worker", ["type" => 99, "talent_info" => $item]);
+        }
+        echo "加入队列成功";
+    }
+
 }

app/enterprise/validate/TalentInfo.php

@@ -92,7 +92,12 @@ class TalentInfo extends Validate {
         $map[] = ["delete", "=", 0];
         $map[] = ["checkState", "not in", [TalentState::SCND_SAVE, TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL]];
         if ($data[$pk]) {
+            $info = $db->where("id", $data[$pk])->field($pk)->find();
             $map[] = [$pk, "<>", $data[$pk]];
+            $map[] = ["apply_year", "=", $info["apply_year"]];
+        } else {
+            $batch = \app\common\api\BatchApi::getValidBatch(\app\common\state\ProjectState::TALENT, session("user")["type"])["batch"];
+            $map[] = ["apply_year", "=", $batch];
         }
         if ($db->where($map)->field($pk)->find()) {
             return false;

app/job/Worker.php

@@ -109,7 +109,11 @@ class Worker {
         $data["oldId"] = $talent_info["id"];
         switch ($talent_info["checkState"]) {
             case -1:
-                $data["checkState"] = TalentState::REVERIFY_FAIL;
+                if ($talent_info["isPublic"] == 5) {
+                    $data["checkState"] = TalentState::PUBLISH_FAIL;
+                } else {
+                    $data["checkState"] = TalentState::REVERIFY_FAIL;
+                }
                 break;
             case 1:
                 $data["checkState"] = TalentState::SCND_SAVE;
@@ -129,6 +133,8 @@ class Worker {
             case 35:
                 if ($talent_info["isPublic"] == 5) {
                     $data["checkState"] = TalentState::PUBLISH_PASS;
+                } else if ($talent_info["isPublic"] == 2) {
+                    $data["checkState"] = TalentState::ZX_PASS;
                 } else if ($talent_info["isPublic"] == 6) {
                     $data["checkState"] = TalentState::CERTIFICATED;
                 } else {