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

Merge pull request 'preview' (#187) from preview into master

Browse Source 
Reviewed-on: #187
This commit is contained in:
mkm 2024-01-02 11:22:53 +08:00
commit 40c0e562d5
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -829,12 +829,12 @@ class IndexController extends BaseApiController
public function getCompanyBankInfo()
{
$parmas = $this->request->param();
$company = Db::query("select company_name,qualification from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$parmas['street_code']], true)[0];
$company = Db::query("select company_name,qualification from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$parmas['street_code']], true);
if (empty($company)) {
return $this->success('成功', ['corporate_account'=> '22170201040004168', 'corporate_bank'=> '中国农业银行股份有限公司泸州石洞支行', 'company_name' => '泸州里海农业科技有限公司', 'corporate_bank_address'=> '泸州市龙马潭区张家祠东路竹林馨居东侧约60米']);
}
$company=$company[0];
$company['qualification'] = json_decode($company['qualification'], true);
if (!empty($company['qualification']['corporate_account']) && !empty($company['qualification']['corporate_bank'])) {

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

@ -57,13 +57,13 @@ class TaskTemplateLogic extends BaseLogic
}
}
if($params['type']==33){
$count=UserInformationg::where('company_id',$params['company_id'])->where('status',1)->count();
if($count<300){
self::setError('用户档案数量300不足，无法创建任务模板');
return false;
}
}
// if($params['type']==33){
// $count=UserInformationg::where('company_id',$params['company_id'])->where('status',1)->count();
// if($count<300){
// self::setError('用户档案数量300不足，无法创建任务模板');
// return false;
// }
// }
$moeny=TaskTemplate::where('company_id', $params['company_id'])->sum('money');
if($moeny+$params['money']>200){
@ -148,13 +148,13 @@ class TaskTemplateLogic extends BaseLogic
self::setError('已经有同一种任务类型了');
return false;
}
if($params['type']==33){
$count=UserInformationg::where('company_id',$params['company_id'])->where('status',1)->count();
if($count<300){
self::setError('用户档案数量300不足，无法创建任务模板');
return false;
}
}
// if($params['type']==33){
// $count=UserInformationg::where('company_id',$params['company_id'])->where('status',1)->count();
// if($count<300){
// self::setError('用户档案数量300不足，无法创建任务模板');
// return false;
// }
// }
$moeny=TaskTemplate::where('company_id', $params['company_id'])->sum('money');
if($moeny+$params['money']-$find['money']>$taskScheduleAmount){
self::setError('任务模板一阶段合计金额不能大于任务调度金额');