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

更新

Browse Source
This commit is contained in:
mkm 2023-08-24 12:07:04 +08:00
parent 1792656101
commit 6303fa6294
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/adminapi/lists/informationg/UserInformationgLists.php
View File

@ -58,6 +58,7 @@ class UserInformationgLists extends BaseAdminDataLists implements ListsSearchInt
->field(['id','create_user_id','company_id','area_id','area_id area_name','street_id','street_id street_name','village_id','village_id village_name', 'brigade_id','brigade_id brigade_name', 'address', 'name', 'phone', 'sex', 'age','update_time','create_time','status']) ->field(['id','create_user_id','company_id','area_id','area_id area_name','street_id','street_id street_name','village_id','village_id village_name', 'brigade_id','brigade_id brigade_name', 'address', 'name', 'phone', 'sex', 'age','update_time','create_time','status'])
->append(['extend']) ->append(['extend'])
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->limit($this->limitOffset, $this->limitLength)
->select() ->select()
->toArray(); ->toArray();
return $lists; return $lists;

6
app/api/controller/RemoteController.php
View File

@ -110,9 +110,9 @@ class RemoteController extends BaseApiController
$time=strtotime($start_time)+86399; $time=strtotime($start_time)+86399;
$end_time=date('Y-m-d H:i:s',$time); $end_time=date('Y-m-d H:i:s',$time);
} }
if(isset($arr['start_time']) && $arr['end_time']){ if(isset($querys['start_time']) && isset($querys['end_time'])){
$start_time = $arr['start_time']; $start_time = $querys['start_time'];
$end_time = $arr['end_time']; $end_time = $querys['end_time'];
} }
$parmas = [ $parmas = [

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

@ -73,8 +73,8 @@ class TaskController extends BaseApiController
} }
$company = Company::where('id', $task['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足 $company = Company::where('id', $task['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
$find = App(RemoteController::class)->shang_date_total_price($company); $find = App(RemoteController::class)->shang_date_total_price($company);
$parmas['start_time']=$company['start_time']; $parmas['start_time']=date('Y-m-d',$task['start_time']);
$parmas['end_time']=$company['end_time']; $parmas['end_time']=$task['end_time'].' 23:59:59';
$list = App(RemoteController::class)->shang_date_list($company, 1, $parmas); $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
if ($find != false) { if ($find != false) {
$find['list'] = $list; $find['list'] = $list;