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-22 16:12:34 +08:00
parent 18900188f6
commit 89d996fba5
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,16 +11,25 @@ class RemoteController extends BaseApiController
public array $notNeedLogin = ['index']; public array $notNeedLogin = ['index'];
public function shang_date_total_price($company,$is_day=1) public function shang_date_total_price($company,$is_day=1,$arr)
{ {
if($is_day==1){ if($is_day==1){
$yesterday = date('Y-m-d'); $start_time = date('Y-m-d');
$time=strtotime($start_time)+86399;
$end_time=date('Y-m-d H:i:s',$time);
}else{ }else{
$yesterday = date('Y-m-d',strtotime('-1 day', time())); $start_time = date('Y-m-d',strtotime('-1 day', time()));
$time=strtotime($start_time)+86399;
$end_time=date('Y-m-d H:i:s',$time);
}
if(isset($arr['start_time']) && $arr['end_time']){
$start_time = $arr['start_time'];
$end_time = $arr['end_time'];
} }
$parmas = [ $parmas = [
"start_date" => $yesterday, "start_date" => $start_time,
"end_date" => $yesterday "end_date" => $end_time
]; ];
switch ($company['company_type']) { switch ($company['company_type']) {
case 18: case 18:

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

@ -30,16 +30,21 @@ class TaskController extends BaseApiController
} }
if (isset($param['date_time']) && $param['date_time'] != '') { if (isset($param['date_time']) && $param['date_time'] != '') {
$time = strtotime($param['date_time']); $time = strtotime($param['date_time']);
$param['start_time']=date('Y-m-d H:i:s',$time);
$end = $time + 86399; $end = $time + 86399;
$param['end_time']=date('Y-m-d H:i:s',$end);
$where[] = ['start_time', 'between', [$time, $end]]; $where[] = ['start_time', 'between', [$time, $end]];
} else { } else {
$time = strtotime(date('Y-m-d')); $time = strtotime(date('Y-m-d'));
$param['start_time']=date('Y-m-d H:i:s',$time);
$end = $time + 86399; $end = $time + 86399;
$param['end_time']=date('Y-m-d H:i:s',$end);
$where[] = ['start_time', 'between', [$time, $end]]; $where[] = ['start_time', 'between', [$time, $end]];
} }
if (isset($param['status']) && $param['status'] > 0) { if (isset($param['status']) && $param['status'] > 0) {
$where[] = ['status', '=', $param['status']]; $where[] = ['status', '=', $param['status']];
} }
halt($where);
$res = Task::where($where) $res = Task::where($where)
->field(['id', 'title', 'money', 'template_id', 'director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content', 'extend']) ->field(['id', 'title', 'money', 'template_id', 'director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content', 'extend'])
->page($page, 25) ->page($page, 25)
@ -48,7 +53,7 @@ class TaskController extends BaseApiController
foreach ($res as $k => $item) { foreach ($res as $k => $item) {
if ($item['type'] == 33) { if ($item['type'] == 33) {
$company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足 $company = Company::where('id', $item['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,1,$param);
if ($find != false) { if ($find != false) {
$res[$k]['extend']['transaction'] = $find; $res[$k]['extend']['transaction'] = $find;
} else { } else {