人事管理--修改临时工报表显示已退场功能

app/Services/InventoryCompareService.php

@@ -171,7 +171,21 @@ class InventoryCompareService
         return $inventoryCompares;
     }
 
-
+    /**
+     * @param array $params
+     * @return string $sql
+     */
+    public function getSql(array $params){
+        $this->conditionQueryInventoryCompare($params)
+            ->selectRaw("inventory_compares.mission_code,inventory_compares.custom_location,inventory_compares.quality,inventory_compares.amount_in_sys,inventory_compares.amount_in_compare,inventory_compares.differ,inventory_compares.created_at")
+            ->leftJoin('owners','inventory_compares.owner_id','owners.id')
+                ->selectRaw('owners.name owner_name')
+            ->leftJoin('commodities','inventory_compares.commodity_id','commodities.id')
+                ->selectRaw('commodities.name commodity_name,commodities.sku commodity_sku')
+            ->leftJoin('commodity_barcodes','commodity_barcodes.commodity_id','commodities.id')
+                ->selectRaw('commodity_barcodes.code commodity_barcode_code')
+            ->sql();
+    }
 
 
 //    public function createInventoryCompare($SKU,$LotAtt05,$amount,$ownerId){

app/Services/LaborReportService.php

@@ -29,12 +29,18 @@ class LaborReportService
         $user=Auth::user();
         $laborReports=LaborReport::query()->with(['user','userDutyCheck','userWorkgroup'])->orderBy('labor_reports.id','DESC');
         if (!($params["is_export"] ?? false)){
-            $laborReports = $laborReports->whereNotIn('labor_reports.id',function ($builder){
-                $builder->select('labor_report_id')->from('labor_report_statuses')->where('status','已退场')
-                    ->where('created_at','like',date('Y-m-d').'%');
+            $laborReports = $laborReports->whereNotIn('labor_reports.enter_number',function ($builder)use($params){
+                $builder->select('enter_number')->from('labor_reports')
+                    ->leftJoin('labor_report_statuses','labor_reports.id','labor_report_statuses.labor_report_id')
+                    ->where('labor_report_statuses.status','已退场');
+                if (!($params['created_at_start'] ?? false) ||!($params['created_at_end'] ?? false)){
+                    $builder->where('created_at','like',date('Y-m-d').'%');
+                }
             });
         }else unset($params['is_export']);
-        $laborReports->where('labor_reports.created_at','like',date('Y-m-d').'%');
+        if (!($params['created_at_start'] ?? false) ||!($params['created_at_end'] ?? false)){
+            $laborReports->where('labor_reports.created_at','like',date('Y-m-d').'%');
+        }
         $columnQueryRules=[
             'enter_number' => ['timeLimit' => 15],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],