|
...
|
...
|
@@ -59,7 +59,6 @@ class MonthProjectCount extends Command |
|
|
|
* @time :2024/1/8 9:05
|
|
|
|
*/
|
|
|
|
public function count($project_id,$url,$is_upgrade = 0){
|
|
|
|
$data = [];
|
|
|
|
$list = DB::connection('custom_mysql')->table('gl_customer_visit')
|
|
|
|
->select(DB::raw('DATE_FORMAT(updated_date, "%Y-%m") as month'))
|
|
|
|
->orderBy('month', 'asc')
|
|
...
|
...
|
@@ -83,7 +82,7 @@ class MonthProjectCount extends Command |
|
|
|
} else {
|
|
|
|
$data = [];
|
|
|
|
}
|
|
|
|
$list = $this->fillMissingMonths($data);
|
|
|
|
$list = $data;
|
|
|
|
foreach ($list as $v){
|
|
|
|
$arr = [];
|
|
|
|
$monthCountModel = new MonthCount();
|
|
...
|
...
|
@@ -195,38 +194,4 @@ class MonthProjectCount extends Command |
|
|
|
$arr['referrer_port'] = json_encode($referrer_port);
|
|
|
|
return $arr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :补齐月份
|
|
|
|
* @name :fillMissingMonths
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2024/8/14 11:11
|
|
|
|
*/
|
|
|
|
public function fillMissingMonths($dates) {
|
|
|
|
// 将字符串日期转换为 Carbon 对象
|
|
|
|
$carbonDates = array_map(function($date) {
|
|
|
|
return Carbon::createFromFormat('Y-m', $date);
|
|
|
|
}, $dates);
|
|
|
|
// 排序日期,确保列表按时间顺序排列
|
|
|
|
usort($carbonDates, function($a, $b) {
|
|
|
|
return $a->gt($b);
|
|
|
|
});
|
|
|
|
// 用于存储完整日期的数组
|
|
|
|
$completeDates = [];
|
|
|
|
// 遍历日期列表,补齐中间缺失的月份
|
|
|
|
for ($i = 0; $i < count($carbonDates) - 1; $i++) {
|
|
|
|
$current = $carbonDates[$i];
|
|
|
|
$next = $carbonDates[$i + 1];
|
|
|
|
// 将当前月份加入完整日期数组
|
|
|
|
array_push($completeDates, $current->format('Y-m'));
|
|
|
|
// 循环补齐中间缺失的月份
|
|
|
|
while ($current->addMonth()->lt($next)) {
|
|
|
|
array_push($completeDates, $current->format('Y-m'));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 加入最后一个月份
|
|
|
|
array_push($completeDates, $carbonDates[count($carbonDates) - 1]->format('Y-m'));
|
|
|
|
return $completeDates;
|
|
|
|
}
|
|
|
|
} |
...
|
...
|
|