Merge branch 'Haozi' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/PersonnelController.php

@@ -55,11 +55,10 @@ class PersonnelController extends Controller
     public function makeOrUpdateLaborReport($userDutyCheck,$remark){
         $checkedAtDate=Carbon::parse($userDutyCheck->checked_at)->format('Y-m-d');
         $laborReport=LaborReport::where('user_id',$userDutyCheck->user_id)->where('created_at','like',$checkedAtDate.'%')->orderBy('id','desc')->first();
-        $laborReportService = app('LaborReportService');
+        /** @var LaborReportService $laborReportService */
+        $laborReportService=app(LaborReportService::class);
         if (!$laborReport&&$userDutyCheck->type=='登入'){
             $newReport=$userDutyCheck->makeEnteringRecord();
-            /** @var LaborReportService $laborReportService */
-            $laborReportService=app(LaborReportService::class);
             $laborReportService->addOrUpdateRemark($remark,$newReport->id);
             app('LogService')->log(__METHOD__,"进场创建临时工报表记录__".__FUNCTION__,json_encode([$userDutyCheck]));
             if ($newReport) event(new ImportEvent($newReport));
@@ -75,8 +74,6 @@ class PersonnelController extends Controller
             if ($laborReportYesterday){
                 $exportReport=$laborReportService->exportReplenishToCreateLaborReportData($laborReportYesterday,$userDutyCheck);
                 if ($exportReport->remark) $remark=$exportReport->remark.','.$remark;
-                /** @var LaborReportService $laborReportService */
-                $laborReportService=app(LaborReportService::class);
                 $laborReportService->addOrUpdateRemark($remark,$exportReport->id);
                 app('LogService')->log(__METHOD__,"补退场卡修改临时工报表记录__".__FUNCTION__,json_encode([$laborReportYesterday,$userDutyCheck]));
                 if ($exportReport) event(new ExportEvent($exportReport));
@@ -88,8 +85,6 @@ class PersonnelController extends Controller
             }
             $exportReport=$laborReportService->exportReplenishToCreateLaborReportData($laborReport,$userDutyCheck);
             if ($exportReport->remark) $remark=$exportReport->remark.','.$remark;
-            /** @var LaborReportService $laborReportService */
-            $laborReportService=app(LaborReportService::class);
             $laborReportService->addOrUpdateRemark($remark,$exportReport->id);
             app('LogService')->log(__METHOD__,"补退场卡修改临时工报表记录__".__FUNCTION__,json_encode([$laborReport,$userDutyCheck]));
             if ($exportReport) event(new ExportEvent($exportReport));

app/Http/Controllers/TestController.php

@@ -29,6 +29,7 @@ use App\InventoryAccount;
 use App\Jobs\OrderCreateInstantBill;
 use App\Jobs\OrderFreeze;
 use App\LaborReport;
+use App\LaborReportStatus;
 use App\Log;
 use App\Logistic;
 use App\Menu;
@@ -107,6 +108,7 @@ use App\StoreItems;
 use App\Supplier;
 use App\Unit;
 use App\User;
+use App\UserDutyCheck;
 use App\ValueStore;
 use App\Warehouse;
 use App\Waybill;
@@ -1637,22 +1639,10 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         }
     }
 
-    public function testUser()
-    {
-        $procurement=Procurement::query()->with('ownerMaterial.material')->find(1);
-        $material=$procurement->ownerMaterial->material;
-        $user=Auth::user();
-        $supplier=Supplier::query()
-            ->whereHas('user',function($query)use($user){
-            /** @var Builder $query */
-            return $query->where('id',$user['id']);
-            })
-            ->whereHas('material',function ($builder)use ($material){
-                /** @var Builder $builder */
-                return $builder->where('id',$material['id']);
-            })
-        ->first();
-        dd($supplier);
+    public function updateLaborReport()
+    {
+        UserDutyCheck::query()->find(13565)->update(['user_id'=>1004]);
+        LaborReportStatus::query()->find(26614)->update(['labor_report_id'=>6835]);
     }
 
     public function cleanLaborsCache()

app/Http/Controllers/UserDutyCheckController.php

@@ -77,8 +77,8 @@ class UserDutyCheckController extends Controller
     {
         $importAndExportQRCodeType = $request->input('importAndExportQRCodeType');
         $mobile_phone = $request->input('mobile_phone');
-        $this->validator($request)->validate();
-        $userDetail = UserDetail::where('mobile_phone', $mobile_phone)->first();
+        $this->validatorPhone($request)->validate();
+        $userDetail = UserDetail::query()->where('mobile_phone', $mobile_phone)->first();
         if (!$userDetail) return redirect('personnel/checking-in/userDutyCheck/createUserDetail/' . $mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
         if (Cache::has('dutyCheckTokenUser_'.$userDetail->user_id)) return "<h1 style='color: red;text-align:center'>请使用原有设备进行打卡,如无法使用原有设备请联系管理人员解绑设备!</h1>";
         if($importAndExportQRCodeType=='import') return redirect('personnel/checking-in/userDutyCheck/updateUserLaborCompanies/' . $userDetail->mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
@@ -265,7 +265,7 @@ class UserDutyCheckController extends Controller
         $validator = Validator::make($request->input(), [
             'full_name' => ['filled'],
             'gender' => ['filled'],
-            'mobile_phone' => ['required', 'integer', 'digits:11'],
+            'mobile_phone' => ['required', 'integer', 'digits:11','unique:user_details,mobile_phone'],
             'identity_number' => ['filled', 'identity_cards', 'unique:user_details,identity_number'],
             'labor_company_id' => ['filled'],
         ], [
@@ -283,6 +283,19 @@ class UserDutyCheckController extends Controller
         ]);
         return $validator;
     }
+    public function validatorPhone(Request $request)
+    {
+        $validator = Validator::make($request->input(), [
+            'mobile_phone' => ['required', 'integer', 'digits:11'],
+        ], [
+            'required' => ':attribute 为必填项',
+            'integer' => ':attribute 数字类型',
+            'digits' => ':attribute 必须是11位',
+        ], [
+            'mobile_phone' => '手机号',
+        ]);
+        return $validator;
+    }
 
     //扫工作组二维码
     public function clock(Request $request)
@@ -342,7 +355,7 @@ class UserDutyCheckController extends Controller
     public function 绑定临时工并进组(Request $request){
         $userWorkgroupID = $request->input('userWorkgroupID');
         $mobile_phone = $request->input('mobile_phone');
-        $userDetail = UserDetail::where('mobile_phone', $mobile_phone)->first();
+        $userDetail = UserDetail::query()->where('mobile_phone', $mobile_phone)->first();
         $userLaborToken=$userDetail->getDutyCheckToken(config('users.token_check_in_expire_minutes'));
         $dateNow = Carbon::now()->format('Y-m-d');
         $userDutyCheck = UserDutyCheck::where('user_id', $userDetail->user_id)->where('checked_at', 'like', $dateNow. '%')->orderBy('id', 'desc')->first();