mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-09-23 15:12:57 +08:00
commit 768e789eca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/controller/TaskController.php
View File

@ -224,7 +224,7 @@ class TaskController extends BaseApiController
if( $parmas['terminus']['lnglat'][0]==null || $parmas['terminus']['lnglat'][0]<=0){
return $this->fail('定位不存在');
}
$res = App(RemoteController::class)->calculateDistance($task['extend']['terminus']['lnglat'][][0],$task['extend']['terminus']['lnglat'][][1], $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]);
$res = App(RemoteController::class)->calculateDistance($task['extend']['terminus']['lnglat'][0],$task['extend']['terminus']['lnglat'][1], $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]);
if($res>100){
return $this->fail('定位坐标大于100米，请重新打卡。'.$res.'米');
}
@ -238,7 +238,7 @@ class TaskController extends BaseApiController
if( $parmas['transfer']['lnglat'][0]==null || $parmas['transfer']['lnglat'][0]<=0){
return $this->fail('定位不存在');
}
$res = App(RemoteController::class)->calculateDistance($task['extend']['transfer']['lnglat'][][0],$task['extend']['transfer']['lnglat'][][1], $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]);
$res = App(RemoteController::class)->calculateDistance($task['extend']['transfer']['lnglat'][0],$task['extend']['transfer']['lnglat'][1], $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]);
if($res>100){
return $this->fail('定位坐标大于100米，请重新打卡。'.$res.'米');
}