|
|
@@ -1089,7 +1089,7 @@ class PersonWorkService extends Service
|
|
|
* @param array $user 用户信息
|
|
|
* @return array
|
|
|
*/
|
|
|
- private function calculateDailyAllocation($monthStart, $topDepartId, $user)
|
|
|
+ private function calculateDailyAllocation1($monthStart, $topDepartId, $user)
|
|
|
{
|
|
|
$monthEnd = strtotime('+1 month', $monthStart) - 1;
|
|
|
$now = time();
|
|
|
@@ -1249,7 +1249,7 @@ class PersonWorkService extends Service
|
|
|
return ['status' => true, 'data' => $previewList];
|
|
|
}
|
|
|
|
|
|
- private function calculateDailyAllocation1($monthStart, $topDepartId, $user)
|
|
|
+ private function calculateDailyAllocation($monthStart, $topDepartId, $user)
|
|
|
{
|
|
|
$monthEnd = strtotime('+1 month', $monthStart) - 1;
|
|
|
$now = time();
|