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-21 09:50:05 +08:00
parent 77ae2a3902
commit 2860bbcfd3
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ class ContractController extends BaseApiController
} else { } else {
$query = Contract::where("type",1)->where('party_b',$this->userInfo['company_id']); $query = Contract::where("type",1)->where('party_b',$this->userInfo['company_id']);
} }
$query->where('status',1);
$count = $query->count(); $count = $query->count();
$contract = $query->with(['party_a_info','party_b_info','contract_type'])->page($page)->limit($limit)->select(); $contract = $query->with(['party_a_info','party_b_info','contract_type'])->page($page)->limit($limit)->select();
// ->each(function ($item, $key) { // ->each(function ($item, $key) {

20
app/api/controller/IndexController.php
View File

@ -97,14 +97,20 @@ class IndexController extends BaseApiController
if($a){ if($a){
$find=Db::name('contract')->where('id',$a['id'])->find(); $find=Db::name('contract')->where('id',$a['id'])->find();
if($find){ if($find){
Db::name('contract')->where('id',$a['id'])->update(['status'=>1]); if($find['signing_timer']==0){
if($find['type']==1){ Db::name('contract')->where('id',$a['id'])->update(['signing_timer'=>1]);
Db::name('company')->where('id',$find['party_a'])->update(['status'=>1,'is_contract'=>1]); return true;
Db::name('company')->where('id',$find['party_b'])->update(['status'=>1,'is_contract'=>1]); }else if($find['signing_timer']==1){
}else{ Db::name('contract')->where('id',$a['id'])->update(['status'=>1,'signing_timer'=>2]);
Db::name('company')->where('id',$find['party_a'])->update(['status'=>1,'is_contract'=>1]); if($find['type']==1){
Db::name('user')->where('id',$find['party_b'])->update(['is_contract'=>1]); Db::name('company')->where('id',$find['party_a'])->update(['status'=>1,'is_contract'=>1]);
Db::name('company')->where('id',$find['party_b'])->update(['status'=>1,'is_contract'=>1]);
}else{
Db::name('company')->where('id',$find['party_a'])->update(['status'=>1,'is_contract'=>1]);
Db::name('user')->where('id',$find['party_b'])->update(['is_contract'=>1]);
}
} }
} }
} }

2
vendor/ebaoquan/junziqian_sdk vendored

@ -1 +1 @@
Subproject commit 1294ea49ff9ecc4532821f8798304816cbf8dd74 Subproject commit 9acc82cd23d807280ddd29df2117e7890094d049