Merge branch 'Haozi'

app/Http/Controllers/LaborCompanyController.php

@@ -32,7 +32,7 @@ class LaborCompanyController extends Controller
         $this->validatorCreate($request->all())->validate();
         $laborCompany=new LaborCompany($request->all());
         $laborCompany->save();
-        app('LaborCompanyService')->createAuthority($laborCompany);//创建劳务所创建对应权限
+        app('LaborCompanyService')->createRole($laborCompany);
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/laborCompany/create')->with('successTip',"成功录入劳务所“{$request->input('name')}”");
     }
@@ -84,7 +84,7 @@ class LaborCompanyController extends Controller
         $this->validatorUpdate($request->all())->validate();
         $laborCompany->fill($request->all());
         $laborCompany->update();
-        app('LaborCompanyService')->updateAuthority($laborCompany);
+        app('LaborCompanyService')->updateRole($laborCompany);
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/laborCompany/')->with('successTip',"成功修改劳务所“{$laborCompany['name']}”！");
     }

app/Providers/AppServiceProvider.php

@@ -182,6 +182,7 @@ use App\Services\WorkOrderService;
 use App\Services\WorkOrderTypeService;
 use App\Services\OrderPackageRemarkService;
 use App\Services\MeasureMonitorService;
+use App\Services\LaborCompanyService;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -247,6 +248,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('InventoryCompareService', InventoryCompareService::class);
         app()->singleton('InventoryDailyLogService', InventoryDailyLogService::class);
         app()->singleton('JDDeliveryService',JDDeliveryService::class);
+        app()->singleton('LaborCompanyService',LaborCompanyService::class);
         app()->singleton('LaborReportsCountingRecordService', LaborReportsCountingRecordService::class);
         app()->singleton('LogService', LogService::class);
         app()->singleton('LogisticAliJiSuApiService',LogisticAliJiSuApiService::class);
@@ -307,7 +309,6 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('OwnerReportService', OwnerReportService::class);
         app()->singleton('OwnerService', OwnerService::class);
         app()->singleton('OwnerStoragePriceModelService', OwnerStoragePriceModelService::class);
-        app()->singleton('PDDDeliveryService',PDDDeliveryService::class);
         app()->singleton('OwnerStoreFeeDetailService',OwnerStoreFeeDetailService::class);
         app()->singleton('OwnerStoreFeeReportService',OwnerStoreFeeReportService::class);
         app()->singleton('OwnerStoreOutFeeDetailService',OwnerStoreOutFeeDetailService::class);
@@ -315,6 +316,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('OwnerSundryFeeDetailService',OwnerSundryFeeDetailService::class);
         app()->singleton('OwnerWayBillFeeDetailService',OwnerWayBillFeeDetailService::class);
         app()->singleton('OwnerWaybillSettlementBillService',OwnerWaybillSettlementBillService::class);
+        app()->singleton('PDDDeliveryService',PDDDeliveryService::class);
         app()->singleton('PackageService', PackageService::class);
         app()->singleton('PackageStatisticsService', PackageStatisticsService::class);
         app()->singleton('PrintPartImageService',PrintPartImageService::class);

app/Services/LaborCompanyService.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Services;
+
+use App\Role;
+use App\Traits\ServiceAppAop;
+use App\LaborCompany;
+use Illuminate\Support\Facades\DB;
+
+class LaborCompanyService
+{
+    use ServiceAppAop;
+    protected $modelClass=LaborCompany::class;
+
+    public function createRole($laborCompany)
+    {
+       $role=Role::query()->firstOrCreate(['name'=>$laborCompany->name]);
+       DB::table('role_labor_company')->updateOrInsert(['role_id'=>$role->id,'labor_company_id'=>$laborCompany->id]);
+    }
+
+    public function updateRole($laborCompany)
+    {
+        $role_id=DB::table('role_labor_company')->where('labor_company_id',$laborCompany->id)->value('role_id');
+        Role::query()->where('id',$role_id)->update(['name'=>$laborCompany->name]);
+    }
+
+}