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 15:23:15 +08:00
parent 3b8dcdf1e5
commit 993b1384c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/CompanyController.php
View File

@ -196,7 +196,7 @@ class CompanyController extends BaseApiController
$find=Company::where('id',$this->userInfo['company_id'])->field('is_contract,shareholder_money,village')->find()->toArray();
if($find &&$find['is_contract']==1){
$contract=Contract::where('party_b',$this->userInfo['company_id'])->field('contract_url,create_time')->find();
$find['contract_url']='https://worker-task.lihaink.cn/uploads/contract/'.$contract['contract_url'];
$find['contract_url']='https://worker-task.lihaink.cn'.$contract['contract_url'];
$find['contract_time']=$contract['create_time'];
$village_info=Company::where('village',$find['village'])->where('company_type',17)->find();
if($village_info){

4
app/common/logic/task_template/TaskTemplateLogic.php
View File

@ -62,12 +62,12 @@ class TaskTemplateLogic extends BaseLogic
return false;
}
$money_two=TaskTemplate::where('company_id', $params['company_id'])->sum('money_two');
if($money_two+$params['money']>200){
if($money_two+$params['money_two']>200){
self::setError('任务模板二阶段合计金额不能大于任务调度金额');
return false;
}
$money_three=TaskTemplate::where('company_id', $params['company_id'])->sum('money_three');
if($money_three+$params['money']>200){
if($money_three+$params['money_three']>200){
self::setError('任务模板长期合计金额不能大于任务调度金额');
return false;
}