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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chenbo 2023-09-06 13:51:29 +08:00
commit fec7a7f2c6
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/adminapi/lists/contract/ContractLists.php
View File

@ -59,14 +59,14 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
$params=$this->request->param(); $params=$this->request->param();
$where=[]; $where=[];
if ($this->adminInfo['root'] != 1) { if ($this->adminInfo['root'] != 1) {
if($this->adminInfo['role_id'][0]==10){ // if($this->adminInfo['role_id'][0]==10){
if(isset($params['type']) && $params['type']==1){ // if(isset($params['type']) && $params['type']==1){
$where[] = ['check_status', '=',1]; // $where[] = ['check_status', '=',1];
}else{ // }else{
$where[] = ['status', '=',0]; // $where[] = ['status', '=',0];
$where[] = ['check_status', 'in',[2,3]]; // $where[] = ['check_status', 'in',[2,3]];
} // }
} // }
} }
if(isset($params['company_id']) && $params['company_id']!=''){ if(isset($params['company_id']) && $params['company_id']!=''){
$arr= Company::where('company_name','like','%'.$params['company_id'].'%')->column('id'); $arr= Company::where('company_name','like','%'.$params['company_id'].'%')->column('id');

5
app/common/logic/task/TaskLogic.php
View File

@ -171,11 +171,6 @@ class TaskLogic extends BaseLogic
'transaction' => ['arr' => ['day_money' => $user_count_money, 'total_price' => 0]] 'transaction' => ['arr' => ['day_money' => $user_count_money, 'total_price' => 0]]
]; ];
$data['extend'] = json_encode($extend); $data['extend'] = json_encode($extend);
// if($user_count_money<$v['transaction_pool']){
// TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>bcsub($v['transaction_pool'],$user_count_money,2)]);
// }else{
// TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>0]);
// }
} }
$task_id = (new Task())->insertGetId($data); $task_id = (new Task())->insertGetId($data);
TaskSchedulingPlan::where('id', $TaskSchedulingPlan['id'])->update(['task_id' => $task_id, 'is_execute' => 1]); TaskSchedulingPlan::where('id', $TaskSchedulingPlan['id'])->update(['task_id' => $task_id, 'is_execute' => 1]);