Эх сурвалжийг харах

津补贴兼容旧的变更记录

sugangqiang 1 жил өмнө
parent
commit
15907deab2

+ 3 - 3
app/enterprise/controller/TalentAllowance.php

@@ -261,7 +261,7 @@ class TalentAllowance extends EnterpriseController {
         $arrangeList = [];
         /*         * * 添加人才层次记录 */
         $where = [];
-        $where[] = ["talentId", "=", $info["talentId"]];
+        $where[] = ["idCard", "=", $info["idCard"]];
         $where[] = ["checkState", "=", MainState::PASS];
         $where[] = ["isPublic", ">=", 5];
         $where[] = ["oldIdentifyMonth", "<=", $info["year"] . "-12-31"];
@@ -331,7 +331,7 @@ class TalentAllowance extends EnterpriseController {
         $totalMonth = \DateUtil::getMonthBetweenDates($year . "-01-01", $year . "-12-31");
         /** 添加申报人才上一年度工作单位记录 */
         $where = [];
-        $where[] = ["talentId", "=", $talentInfo["id"]];
+        $where[] = ["idCard", "=", $talentInfo["card_number"]];
         $where[] = ["checkState", "=", 3];
         $quitList = \app\common\model\TalentQuit::where($where)->field("enterpriseId,enterpriseName,talentType,identifyGetTime,starttime,endtime,entryTime,quitTime,post")->select()->toArray();
 
@@ -786,7 +786,7 @@ class TalentAllowance extends EnterpriseController {
                     $res[] = $info;
                 } else {
                     $whereTypeChange = [];
-                    $whereTypeChange[] = ["talentId", "=", $info["id"]];
+                    $whereTypeChange[] = ["idCard", "=", $info["idCard"]];
                     $whereTypeChange[] = ["checkState", "=", MainState::PASS];
                     $whereTypeChange[] = ["isPublic", "=", 6];
                     $typeChanges = TalentTypeChange::where($whereTypeChange)->select()->toArray();

+ 2 - 2
app/job/TalentAllowance.php

@@ -150,7 +150,7 @@ class TalentAllowance {
         $arrangeList = [];
         /*         * * 添加人才层次记录 */
         $where = [];
-        $where[] = ["talentId", "=", $info["talentId"]];
+        $where[] = ["idCard", "=", $info["idCard"]];
         $where[] = ["checkState", "=", MainState::PASS];
         $where[] = ["isPublic", ">=", 5];
         $where[] = ["oldIdentifyMonth", "<=", $info["year"] . "-12-31"];
@@ -220,7 +220,7 @@ class TalentAllowance {
         $totalMonth = \DateUtil::getMonthBetweenDates($year . "-01-01", $year . "-12-31");
         /** 添加申报人才上一年度工作单位记录 */
         $where = [];
-        $where[] = ["talentId", "=", $talentInfo["id"]];
+        $where[] = ["idCard", "=", $talentInfo["card_number"]];
         $where[] = ["checkState", "=", 3];
         $quitList = \app\common\model\TalentQuit::where($where)->field("enterpriseId,enterpriseName,talentType,identifyGetTime,starttime,endtime,entryTime,quitTime,post")->select()->toArray();