小高薪

app/Service/AuxiliaryAccountService.php

@@ -34,6 +34,12 @@ class AuxiliaryAccountService extends Service
         if(! empty($data['month'])) $model->where('month', $data['month']);
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
 
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('month','>=',$return[0]);
+            $model->where('month','<=',$return[1]);
+        }
+
         return $model;
     }
 

app/Service/DeviceDepreciationService.php

@@ -162,6 +162,11 @@ class DeviceDepreciationService extends Service
             ->select($field)
             ->orderby('id', 'desc');
 
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('month','>=',$return[0]);
+            $model->where('month','<=',$return[1]);
+        }
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {

app/Service/DeviceWorkService.php

@@ -172,6 +172,11 @@ class DeviceWorkService extends Service
             ->select($field)
             ->orderby('id', 'desc');
 
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('month','>=',$return[0]);
+            $model->where('month','<=',$return[1]);
+        }
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
@@ -563,6 +568,11 @@ class DeviceWorkService extends Service
             ->select($field)
             ->orderby('id', 'desc');
 
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('order_time','>=',$return[0]);
+            $model->where('order_time','<=',$return[1]);
+        }
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
@@ -570,6 +580,14 @@ class DeviceWorkService extends Service
             $model->where('crt_time','>=',$return[0]);
             $model->where('crt_time','<=',$return[1]);
         }
+        if (!empty($data['item_title'])) {
+            $models = Item::Clear($user,$data);
+            $id = $models->where('del_time',0)
+                ->where('title', 'LIKE', '%'.$data['item_title'].'%')
+                ->pluck('id')
+                ->all();
+            $model->whereIn('item_id', $id);
+        }
 
         return $model;
     }

app/Service/ExpenseClaimsService.php

@@ -29,6 +29,11 @@ class ExpenseClaimsService extends Service
             ->orderby('id', 'desc');
         if(! empty($data['month'])) $model->where('month', $data['month']);
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('month','>=',$return[0]);
+            $model->where('month','<=',$return[1]);
+        }
 
         return $model;
     }

app/Service/PLeaveOverService.php

@@ -180,6 +180,11 @@ class PLeaveOverService extends Service
             $model->where('crt_time','>=',$return[0]);
             $model->where('crt_time','<=',$return[1]);
         }
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('order_time','>=',$return[0]);
+            $model->where('order_time','<=',$return[1]);
+        }
 
         return $model;
     }

app/Service/PersonSalaryService.php

@@ -162,6 +162,11 @@ class PersonSalaryService extends Service
             ->select($field)
             ->orderby('id', 'desc');
 
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('month','>=',$return[0]);
+            $model->where('month','<=',$return[1]);
+        }
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {

app/Service/PersonWorkService.php

@@ -171,6 +171,11 @@ class PersonWorkService extends Service
             ->select($field)
             ->orderby('id', 'desc');
 
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('month','>=',$return[0]);
+            $model->where('month','<=',$return[1]);
+        }
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
@@ -545,6 +550,11 @@ class PersonWorkService extends Service
             ->select($field)
             ->orderby('id', 'desc');
 
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('order_time','>=',$return[0]);
+            $model->where('order_time','<=',$return[1]);
+        }
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
@@ -552,6 +562,14 @@ class PersonWorkService extends Service
             $model->where('crt_time','>=',$return[0]);
             $model->where('crt_time','<=',$return[1]);
         }
+        if (!empty($data['item_title'])) {
+            $models = Item::Clear($user,$data);
+            $id = $models->where('del_time',0)
+                ->where('title', 'LIKE', '%'.$data['item_title'].'%')
+                ->pluck('id')
+                ->all();
+            $model->whereIn('item_id', $id);
+        }
 
         return $model;
     }

app/Service/RuleSetService.php

@@ -224,6 +224,11 @@ class RuleSetService extends Service
             $model->where('crt_time','>=',$return[0]);
             $model->where('crt_time','<=',$return[1]);
         }
+        if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['time']);
+            $model->where('month','>=',$return[0]);
+            $model->where('month','<=',$return[1]);
+        }
 
         return $model;
     }