Browse Source

小高薪

cqp 2 tháng trước cách đây
mục cha
commit
472e66f6dd

+ 1 - 0
app/Model/DailyDwOrderDetails.php

@@ -10,4 +10,5 @@ class DailyDwOrderDetails extends DataScopeBaseModel
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
+    const employee_column = 'crt_id';
 }

+ 1 - 1
app/Model/DailyPwOrderDetails.php

@@ -10,5 +10,5 @@ class DailyPwOrderDetails extends DataScopeBaseModel
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
-    const employee_column = 'employee_id';
+    const employee_column = 'crt_id';
 }

+ 6 - 4
app/Service/DeviceWorkService.php

@@ -413,7 +413,7 @@ class DeviceWorkService extends Service
             DailyDwOrderDetails::where('del_time',0)
                 ->where('main_id', $model->id)
                 ->update(['del_time' => $time]);
-            $this->saveDetailDaily($model->id, $time, $data);
+            $this->saveDetailDaily($model->id, $time, $data, $user);
 
             DB::commit();
         }catch (\Exception $exception){
@@ -443,7 +443,7 @@ class DeviceWorkService extends Service
             $model->top_depart_id = $data['top_depart_id'];
             $model->save();
 
-            $this->saveDetailDaily($model->id, time(), $data);
+            $this->saveDetailDaily($model->id, time(), $data, $user);
 
             DB::commit();
         }catch (\Exception $exception){
@@ -454,7 +454,7 @@ class DeviceWorkService extends Service
         return [true, ''];
     }
 
-    private function saveDetailDaily($id, $time, $data){
+    private function saveDetailDaily($id, $time, $data, $user){
         if(! empty($data['details'])){
             $unit = [];
             foreach ($data['details'] as $value){
@@ -469,7 +469,8 @@ class DeviceWorkService extends Service
                     'crt_time' => $time,
                     'top_depart_id' => $value['top_depart_id'],
                     'order_time' => $data['order_time'] ?? 0,
-                    'item_id' => $data['item_id']
+                    'item_id' => $data['item_id'],
+                    'crt_id' => $user['id'],
                 ];
             }
             if(! empty($unit)) DailyDwOrderDetails::insert($unit);
@@ -1271,6 +1272,7 @@ class DeviceWorkService extends Service
                         'crt_time'        => $now,
                         'order_time'    => $orderTimestamp,
                         'item_id'    => $itemId,
+                        'crt_id'     => $user['id'],
                     ];
                 }
                 DB::table('daily_dw_order_details')->insert($insertDetails);

+ 2 - 5
app/Service/ImportService.php

@@ -2600,8 +2600,7 @@ class ImportService extends Service
                     $detail['main_id']       = $mainId;
                     $detail['top_depart_id'] = $user['top_depart_id'];
                     $detail['crt_time']      = $time;
-                    $detail['upd_time']      = $time;
-                    $detail['del_time']      = 0;
+                    $detail['crt_id']      = $user['id'];
                     $insertDetails[] = $detail;
                 }
                 if (!empty($insertDetails)) {
@@ -2867,8 +2866,7 @@ class ImportService extends Service
                     $detail['main_id']       = $mainId;
                     $detail['top_depart_id'] = $user['top_depart_id'];
                     $detail['crt_time']      = $time;
-                    $detail['upd_time']      = $time;
-                    $detail['del_time']      = 0;
+                    $detail['crt_id']      = $user['id'];
                     $insertDetails[] = $detail;
                 }
                 if (!empty($insertDetails)) {
@@ -3533,7 +3531,6 @@ class ImportService extends Service
         return [!empty($errors) ? implode('|', $errors) : "", $update_map, $dbEmps];
     }
 
-    // 项目费用报销单月度导入 ------------------------------
     // 项目费用报销单月度导入 ------------------------------
     public function feeOrderImport($array, $user, $other_param)
     {

+ 5 - 3
app/Service/PersonWorkService.php

@@ -395,7 +395,7 @@ class PersonWorkService extends Service
             DailyPwOrderDetails::where('del_time',0)
                 ->where('main_id', $model->id)
                 ->update(['del_time' => $time]);
-            $this->saveDetailDaily($model->id, $time, $data);
+            $this->saveDetailDaily($model->id, $time, $data, $user);
 
             DB::commit();
         }catch (\Exception $exception){
@@ -425,7 +425,7 @@ class PersonWorkService extends Service
             $model->top_depart_id = $data['top_depart_id'];
             $model->save();
 
-            $this->saveDetailDaily($model->id, time(), $data);
+            $this->saveDetailDaily($model->id, time(), $data, $user);
 
             DB::commit();
         }catch (\Exception $exception){
@@ -436,7 +436,7 @@ class PersonWorkService extends Service
         return [true, ''];
     }
 
-    private function saveDetailDaily($id, $time, $data){
+    private function saveDetailDaily($id, $time, $data, $user){
         if(! empty($data['details'])){
             $unit = [];
             foreach ($data['details'] as $value){
@@ -452,6 +452,7 @@ class PersonWorkService extends Service
                     'top_depart_id' => $value['top_depart_id'],
                     'order_time' =>  $data['order_time'] ?? 0,
                     'item_id' =>  $data['item_id'],
+                    'crt_id' =>  $user['id'],
                 ];
             }
             if(! empty($unit)) DailyPwOrderDetails::insert($unit);
@@ -1334,6 +1335,7 @@ class PersonWorkService extends Service
                         'crt_time'        => $now,
                         'item_id'        => $itemId,
                         'order_time'    => $orderTimestamp,
+                        'crt_id'        => $user['id'],
                     ];
                 }