|
|
@@ -109,7 +109,7 @@ class LaborReportsCountingRecordService
|
|
|
switch ($unit) {
|
|
|
case '日':
|
|
|
$query = LaborReport::query()
|
|
|
- ->selectRaw("DATE_FORMAT(created_at,'%Y-%m-%d') as date_target, count(DISTINCT user_id) as counter");
|
|
|
+ ->selectRaw("DATE_FORMAT(created_at,'%Y-%m-%d') as date_target, count(DISTINCT enter_number ) as counter");
|
|
|
foreach ($dateList as $startOfWeek) {
|
|
|
$query->orWhere(function ($query) use ($startOfWeek) {
|
|
|
$query->whereDate('created_at', $startOfWeek);
|
|
|
@@ -123,7 +123,7 @@ class LaborReportsCountingRecordService
|
|
|
});
|
|
|
break;
|
|
|
case '月':
|
|
|
- $query = LaborReport::query()->selectRaw("DATE_FORMAT(created_at,'%Y-%m') as date_target, count(DISTINCT user_id) as counter");
|
|
|
+ $query = LaborReport::query()->selectRaw("DATE_FORMAT(created_at,'%Y-%m') as date_target, count(DISTINCT enter_number ) as counter");
|
|
|
foreach ($dateList as $date) {
|
|
|
$query->orWhere(function ($query) use ($date) {
|
|
|
$year = Str::of($date)->explode('-')[0];
|
|
|
@@ -139,7 +139,7 @@ class LaborReportsCountingRecordService
|
|
|
});
|
|
|
break;
|
|
|
case '年':
|
|
|
- $query = LaborReport::query()->selectRaw("DATE_FORMAT(created_at,'%Y') as date_target, count(DISTINCT user_id) as counter");
|
|
|
+ $query = LaborReport::query()->selectRaw("DATE_FORMAT(created_at,'%Y') as date_target, count(DISTINCT enter_number ) as counter");
|
|
|
foreach ($dateList as $date) {
|
|
|
$query->orWhere(function ($query) use ($date) {
|
|
|
$year = Str::of($date)->explode('-')[0];
|