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-30 10:25:31 +08:00
parent ab60544088
commit 94839048a5
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/api/controller/ContractController.php
View File

@ -22,26 +22,11 @@ class ContractController extends BaseApiController
if($this->userInfo['admin_id']==0){
$query = Contract::where("type",2)->where('party_b',$this->userId);
} else {
$query = Contract::where("type",1)->where('party_b',$this->userInfo['company_id']);
$query = Contract::where("type",1)->where('party_a|party_b',$this->userInfo['company_id']);
}
$query->where('status',1);
$count = $query->count();
$contract = $query->with(['party_a_info','party_b_info','contract_type'])->page($page)->limit($limit)->select();
// ->each(function ($item, $key) {
// $company_name= Db::name('company')->where('id', $item['party_a'])->value('company_name');
// $contract_type_name= Db::name('dict_data')->where('id', $item['contract_type'])->value('name');
// $datas=[
// 'id'=>$item['id'],
// 'company_name'=>$company_name,
// 'contract_type_name'=>$contract_type_name,
// ];
// $item->company=$datas;
// if ($item->type == 2) {
// $item['party_b_name'] = User::where('id', $item['party_b'])->value('name');
// } else {
// $item['party_b_name'] = Db::name('company')->where('id', $item['party_b'])->value('company_name');
// }
// });
return $this->success('success', ['count' => $count, 'data' => $contract]);
}

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

@ -7,6 +7,7 @@ use app\common\model\Company;
use app\common\model\company\CompanyProperty;
use app\common\model\informationg\UserInformationg;
use app\common\model\task\Task;
use app\common\model\task_template\TaskTemplate;
use app\common\model\user\User;
class TaskController extends BaseApiController
@ -58,6 +59,8 @@ class TaskController extends BaseApiController
$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,1,$param);
if ($find != false) {
$transaction_pool=TaskTemplate::where('id',$item['template_id'])->value('transaction_pool');
$find['transaction_pool']=$transaction_pool;
$res[$k]['extend']['transaction'] = $find;
Task::where('id',$item['id'])->update(['extend'=>json_encode(['transaction'=>$find],true)]);
} else {
@ -72,10 +75,12 @@ class TaskController extends BaseApiController
public function order_detail()
{
$parmas = $this->request->param();
$task=Task::where('id',$parmas['id'])->field('company_id,start_time,end_time,extend,type')->find();
$task=Task::where('id',$parmas['id'])->field('company_id,start_time,end_time,extend,type,template_id')->find();
if(!$task){
return $this->fail('任务不存在');
}
$transaction_pool=TaskTemplate::where('id',$task['template_id'])->value('transaction_pool');
$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);
$parmas['start_time']=date('Y-m-d',$task['start_time']);
@ -84,6 +89,7 @@ class TaskController extends BaseApiController
if ($task != false) {
$find['list'] = $list;
$find['extend']=$task['extend'];
$find['transaction_pool']=$transaction_pool;
return $this->success('ok', $find);
}
return $this->success('ok');