高教津补贴计算改成认定算头月不算尾月

app/enterprise/controller/TalentAllowance.php

@@ -502,7 +502,14 @@ class TalentAllowance extends EnterpriseController {
         foreach ($typeList as $talentTypeChange) {
             $startTime = $talentTypeChange[$oldStartTimeField];
             $endTime = $talentTypeChange[$newStartTimeField];
-            $monthList = \DateUtil::getMonthBetweenDatesNotBegin($startTime, $endTime);
+            if (in_array($info["type"], [CommonConst::ENTERPRISE_GJ])) {
+                $monthList = \DateUtil::getMonthBetweenDatesNotEnd($startTime, $endTime);
+                if ($endTime == $year . "-12-31") {
+                    $monthList[] = $year . "-12";
+                }
+            } else {
+                $monthList = \DateUtil::getMonthBetweenDatesNotBegin($startTime, $endTime);
+            }
             if ($monthList) {
                 $monthList = array_intersect($monthList, $totalMonth);
             }

app/job/TalentAllowance.php

@@ -254,7 +254,14 @@ class TalentAllowance {
         foreach ($typeList as $talentTypeChange) {
             $startTime = $talentTypeChange[$oldStartTimeField];
             $endTime = $talentTypeChange[$newStartTimeField];
-            $monthList = \DateUtil::getMonthBetweenDatesNotBegin($startTime, $endTime);
+            if (in_array($info["type"], [\app\common\state\CommonConst::ENTERPRISE_GJ])) {
+                $monthList = \DateUtil::getMonthBetweenDatesNotEnd($startTime, $endTime);
+                if ($endTime == $year . "-12-31") {
+                    $monthList[] = $year . "-12";
+                }
+            } else {
+                $monthList = \DateUtil::getMonthBetweenDatesNotBegin($startTime, $endTime);
+            }
             if ($monthList) {
                 $monthList = array_intersect($monthList, $totalMonth);
             }