cqp 6 mēneši atpakaļ
vecāks
revīzija
8b19d1c71d

+ 5 - 1
app/Service/RdGenerateDeviceService.php

@@ -113,6 +113,9 @@ class RdGenerateDeviceService extends Service
         $rdToDevicesMap = []; // order_number => ['device_ids' => [], 'crt_time' => ...]
 
         foreach ($slots as $day => $projectGroups) {
+            // 1. 获取当月第一天的时间戳
+            $belongMonth = strtotime(date('Y-m-01', $day));
+
             $baseCrtTime = $day + 59400; // 创建时间从 16:30 开始递增
             $sequence = 0;
 
@@ -141,7 +144,8 @@ class RdGenerateDeviceService extends Service
                         'total_hours' => 60,
                         'order_number' => $orderNumber,
                         'type' => RD::type_two,
-                        'del_time' => 0
+                        'del_time' => 0,
+                        'belong_month' => $belongMonth,
                     ];
 
                     $rdToDevicesMap[$orderNumber] = [

+ 6 - 2
app/Service/RdGenerateService.php

@@ -255,6 +255,9 @@ class RdGenerateService extends Service
 
         $crtTime = Carbon::createFromTimestamp($dayTime)->setTime(16, 30)->addSeconds(mt_rand(0, 1800))->timestamp;
 
+        // 获取 order_time 所在月份的第一天凌晨 00:00:00 的时间戳
+        $belongMonth = Carbon::createFromTimestamp($dayTime)->startOfMonth()->timestamp;
+
         $rowData = [
             'crt_id' => $employeeId,
             'crt_time' => $crtTime,
@@ -266,8 +269,9 @@ class RdGenerateService extends Service
             'end_time_min' => $end->minute,
             'total_hours' => $minutes,
             'order_number' => 'RD' . date('Ymd', $dayTime) . mt_rand(1000, 9999) . substr(uniqid(), -3),
-            'type' => 1,
-            'del_time' => 0
+            'type' => RD::type_one,
+            'del_time' => 0,
+            'belong_month' => $belongMonth,
         ];
 
         return [