工作单位变更及离职兼容旧系统数据

app/admin/controller/TalentQuit.php

@@ -63,6 +63,20 @@ class TalentQuit extends AdminController {
             $responseObj->msg = "系统错误，请联系管理员";
             return $responseObj;
         }
+        if (strlen($info["talentId"]) == 19) {
+            //旧系统申请兼容处理
+            unset($where);
+            $where[] = ["card_number", "=", $info["idCard"]];
+            $where[] = ["checkState", "=", \app\common\api\TalentState::CERTIFICATED];
+            $where[] = ["active", "=", 1];
+            $where[] = ["delete", "=", 0];
+            $ti = \app\enterprise\model\Talent::where($where)->order("createTime desc")->find();
+            if (!$ti) {
+                $responseObj->msg = "未匹配到人才数据";
+                return $responseObj;
+            }
+            $info["talentId"] = $ti["id"];
+        }
         if (!$checkState) {
             $responseObj->msg = "请选择审核状态";
             return $responseObj;

app/admin/controller/TalentWorkUnitChange.php

@@ -84,6 +84,21 @@ class TalentWorkUnitChange extends AdminController {
             $responseObj->msg = "系统错误，请联系管理员";
             return $responseObj;
         }
+        if (strlen($info["talentId"]) == 19) {
+            //旧系统申请兼容处理
+            unset($where);
+            $where[] = ["enterprise_id", "=", $info["oldEnterpriseId"]];
+            $where[] = ["card_number", "=", $info["idCard"]];
+            $where[] = ["checkState", "=", \app\common\api\TalentState::CERTIFICATED];
+            $where[] = ["active", "=", 2];
+            $where[] = ["delete", "=", 0];
+            $ti = \app\enterprise\model\Talent::where($where)->order("createTime desc")->find();
+            if (!$ti) {
+                $responseObj->msg = "未匹配到人才数据";
+                return $responseObj;
+            }
+            $info["talentId"] = $ti["id"];
+        }
         if (!$checkState) {
             $responseObj->msg = "请选择审核状态";
             return $responseObj;

app/enterprise/controller/Talent.php

@@ -1528,28 +1528,28 @@ class Talent extends EnterpriseController {
         if ($type == ProjectState::QUIT) {
             $_where = [];
             $_where[] = ["checkState", "not in", [3]];
-            $talentIds = Db::table("un_talent_quit")->where($_where)->column("talentId");
-            $sList = array_merge($sList, (array) $talentIds);
+            $idCards = Db::table("un_talent_quit")->where($_where)->column("idCard");
+            $sList = array_merge($sList, (array) $idCards);
             $where[] = ["active", "=", 1];
         }
         if ($type == ProjectState::BANKCHANGE) {
             $_where = [];
             $_where[] = ["checkState", "not in", [3]];
-            $talentIds = Db::table("un_talent_bank_change")->where($_where)->column("talentId");
-            $sList = array_merge($sList, (array) $talentIds);
+            $idCards = Db::table("un_talent_bank_change")->where($_where)->column("idCard");
+            $sList = array_merge($sList, (array) $idCards);
         }
         if ($type == ProjectState::LEVELCHANGE) {
             $_where = [];
             $_where[] = ["checkState", "not in", [35, -1]];
             $_where[] = ["isPublic", "<", 5];
-            $talentIds = Db::table("un_talent_type_change")->where($_where)->column("talentId");
-            $sList = array_merge($sList, (array) $talentIds);
+            $idCards = Db::table("un_talent_type_change")->where($_where)->column("idCard");
+            $sList = array_merge($sList, (array) $idCards);
         }
         $where[] = ["enterprise_id", "=", $this->user["uid"]];
         $where[] = ["checkState", "=", TalentState::CERTIFICATED];
         $where[] = ["isEffect", "<>", 4];
         if ($sList) {
-            $where[] = ["id", "not in", $sList];
+            $where[] = ["card_number", "not in", $sList];
         }
         $result = TalentModel::where($where)->field("id,name")->select()->toArray();
         return json($result);
@@ -1561,34 +1561,39 @@ class Talent extends EnterpriseController {
         $type = $this->request->param('type');
         if ($type == ProjectState::QUIT) {
             $info = Db::table("un_talent_quit")->where("id", $id)->find();
-            $where[] = ["id", "=", $info["talentId"]];
         }
         if ($type == ProjectState::LEVELCHANGE) {
             $info = Db::table("un_talent_type_change")->where("id", $id)->find();
-            $where[] = ["id", "=", $info["talentId"]];
         }
         if ($type == ProjectState::BANKCHANGE) {
             $info = Db::table("un_talent_bank_change")->where("id", $id)->find();
+        }
+        if (strlen($info["talentId"]) == 19) {
+            $where[] = ["enterprise_id", "=", $this->user["uid"]];
+            $where[] = ["card_number", "=", $info["idCard"]];
+            $where[] = ["delete", "=", 0];
+            $where[] = ["checkState", "=", TalentState::CERTIFICATED];
+        } else {
             $where[] = ["id", "=", $info["talentId"]];
         }
         $result = TalentModel::where($where)->field("id,name")->select()->toArray();
         return json($result);
     }
-    
-    public function getTalentBasicById(){        
+
+    public function getTalentBasicById() {
         $id = $this->request["id"];
         $ti = \app\common\api\VerifyApi::getTalentInfoById($id);
-        /*if(FengStringUtil.isNotEmpAndNull(year)){
-            StringBuilder sb = new StringBuilder();
-            List<TalentAllowancecontractDetail> contractDetailList = new ArrayList<>();     //保存上一年度的工作单位
-            TalentAllowanceInfo info = new TalentAllowanceInfo();
-            info.setType(ti.getType());
-            info.setYear(year);
-            info.setFirstInJJTime(ti.getFirstInJJTime());
-            ApiTalentAllowanceController.getConcatList(ti,info,year,sb,contractDetailList);
-            int active = AllowanceSelectUtil.validMyqy(contractDetailList,ti,info);
-            ti.setActive(active);
-        }*/
+        /* if(FengStringUtil.isNotEmpAndNull(year)){
+          StringBuilder sb = new StringBuilder();
+          List<TalentAllowancecontractDetail> contractDetailList = new ArrayList<>();     //保存上一年度的工作单位
+          TalentAllowanceInfo info = new TalentAllowanceInfo();
+          info.setType(ti.getType());
+          info.setYear(year);
+          info.setFirstInJJTime(ti.getFirstInJJTime());
+          ApiTalentAllowanceController.getConcatList(ti,info,year,sb,contractDetailList);
+          int active = AllowanceSelectUtil.validMyqy(contractDetailList,ti,info);
+          ti.setActive(active);
+          } */
         return $ti;
     }
 

app/enterprise/controller/TalentQuit.php

@@ -58,6 +58,10 @@ class TalentQuit extends EnterpriseController {
         $request = $this->request;
         $id = isset($request["id"]) ? $request["id"] : 0;
         $info = TqModel::where("id", $id)->find();
+        if (strlen($info["talentId"]) == 19) {
+            $newTalentInfo = $this->getTalentInfoByIdCard($info["idCard"]);
+            $info["talentId"] = $newTalentInfo["id"];
+        }
         if ($this->request->isPost()) {
             $response = new \stdClass();
             $response->code = 500;
@@ -110,6 +114,10 @@ class TalentQuit extends EnterpriseController {
     public function view() {
         $id = $this->request["id"];
         $info = TqModel::where("id", $id)->find();
+        if (strlen($info["talentId"]) == 19) {
+            $newTalentInfo = $this->getTalentInfoByIdCard($info["idCard"]);
+            $info["talentId"] = $newTalentInfo["id"];
+        }
         return view("", ["row" => $info]);
     }
 
@@ -208,12 +216,8 @@ class TalentQuit extends EnterpriseController {
         }
         $ti = \app\common\api\VerifyApi::getTalentInfoById($talentQuit["talentId"]);
         if (!$ti) {
-            unset($where);
-            $where[] = ["card_number", "=", $idCard];
-            $where[] = ["checkState", "=", \app\common\api\TalentState::CERTIFICATED];
-            $where[] = ["active", "=", 2];
-            $where[] = ["delete", "=", 0];
-            $ti = \app\enterprise\model\Talent::where($where)->order("createTime desc")->find();
+            $ti = $this->getTalentInfoByIdCard($idCard, 2);
+            $talentQuit["talentId"] = $ti["id"];
         }
         if (!$ti) {
             $responseObj->msg = "未匹配到人才数据";
@@ -235,6 +239,18 @@ class TalentQuit extends EnterpriseController {
         return $responseObj;
     }
 
+    private function getTalentInfoByIdCard($idCard, $active = null) {
+        $where[] = ["enterprise_id", "=", $this->user["uid"]];
+        $where[] = ["card_number", "=", $idCard];
+        $where[] = ["checkState", "=", \app\common\api\TalentState::CERTIFICATED];
+        $where[] = ["delete", "=", 0];
+        if ($active) {
+            $where[] = ["active", "=", $active];
+        }
+        $ti = \app\enterprise\model\Talent::where($where)->order("createTime desc")->find();
+        return $ti;
+    }
+
     private function dataCheck($data) {
         $response = new \stdClass();
         $response->code = 500;

app/enterprise/controller/TalentWorkUnitChange.php

@@ -77,6 +77,10 @@ class TalentWorkUnitChange extends EnterpriseController {
                 return $check;
             }
             $talentInfo = \app\common\api\VerifyApi::getTalentInfoById($request["talentId"]);
+            if (!$talentInfo) {
+                $response->msg = "未匹配到人才数据";
+                return $response;
+            }
             if ($data["id"]) {
                 unset($data["year"]);
                 $data["updateUser"] = $this->user["uid"];