补充上一条修改

app/enterprise/controller/TalentAllowance.php

@@ -413,7 +413,8 @@ class TalentAllowance extends EnterpriseController {
         $where[] = ["checkState", "=", MainState::PASS];
         $where[] = ["isPublic", ">=", 5];
         $where[] = [$oldStartTimeField, "<=", $info["year"] . "-12-31"];
-        $typeList = TalentTypeChange::where($where)->field("oldTalentArrange,oldIdentifyCondition,oldIdentifyGetTime,oldIdentifyOutTime,oldIdentifyMonth,oldCertificateStartTime,oldCertificateOutTime,newIdentifyMonth")->order("createTime desc")->select()->toArray();
+        $typeList = TalentTypeChange::where($where)->field("oldTalentArrange,oldIdentifyCondition,oldIdentifyGetTime,oldIdentifyOutTime,oldIdentifyMonth,oldCertificateStartTime,oldCertificateOutTime,newIdentifyMonth,newIdentifyGetTime")->order("createTime desc")->select()->toArray();
+
         $typeList[] = [
             "oldTalentArrange" => $talentInfo["talent_arrange"],
             "oldIdentifyCondition" => $talentInfo["talent_condition"],
@@ -422,7 +423,8 @@ class TalentAllowance extends EnterpriseController {
             "oldIdentifyMonth" => $talentInfo["identifyMonth"],
             "oldCertificateStartTime" => $talentInfo["certificateGetTime"],
             "oldCertificateOutTime" => $talentInfo["certificateExpireTime"],
-            "newIdentifyMonth" => $info["year"] . "-12-31"
+            "newIdentifyMonth" => $info["year"] . "-12-31",
+            "newIdentifyGetTime" => $info["year"] . "-12-31"
         ];
         $totalMonth = \DateUtil::getMonthBetweenDates($info["year"] . "-01-01", $info["year"] . "-12-31");
         /*         * 获取上一年度有效的人才层次 */

app/job/TalentAllowance.php

@@ -180,7 +180,7 @@ class TalentAllowance {
         $where[] = ["checkState", "=", MainState::PASS];
         $where[] = ["isPublic", ">=", 5];
         $where[] = [$oldStartTimeField, "<=", $info["year"] . "-12-31"];
-        $typeList = TalentTypeChange::where($where)->field("oldTalentArrange,oldIdentifyCondition,oldIdentifyGetTime,oldIdentifyOutTime,oldIdentifyMonth,oldCertificateStartTime,oldCertificateOutTime,newIdentifyMonth")->order("createTime desc")->select()->toArray();
+        $typeList = TalentTypeChange::where($where)->field("oldTalentArrange,oldIdentifyCondition,oldIdentifyGetTime,oldIdentifyOutTime,oldIdentifyMonth,oldCertificateStartTime,oldCertificateOutTime,newIdentifyMonth,newIdentifyGetTime")->order("createTime desc")->select()->toArray();
         $typeList[] = [
             "oldTalentArrange" => $talentInfo["talent_arrange"],
             "oldIdentifyCondition" => $talentInfo["talent_condition"],
@@ -189,7 +189,8 @@ class TalentAllowance {
             "oldIdentifyMonth" => $talentInfo["identifyMonth"],
             "oldCertificateStartTime" => $talentInfo["certificateGetTime"],
             "oldCertificateOutTime" => $talentInfo["certificateExpireTime"],
-            "newIdentifyMonth" => $info["year"] . "-12-31"
+            "newIdentifyMonth" => $info["year"] . "-12-31",
+            "newIdentifyGetTime" => $info["year"] . "-12-31"
         ];
         $totalMonth = \DateUtil::getMonthBetweenDates($info["year"] . "-01-01", $info["year"] . "-12-31");
         /*         * 获取上一年度有效的人才层次 */