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-12 15:58:06 +08:00
parent 1891507c77
commit 05313f8c18
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/common/logic/contract/ContractLogic.php
View File

@ -125,8 +125,11 @@ class ContractLogic extends BaseLogic
$field = ['id,company_name,company_type,company_type company_type_name,organization_code, $field = ['id,company_name,company_type,company_type company_type_name,organization_code,
province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,master_phone,master_name, province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,master_phone,master_name,
qualification']; qualification'];
$company = Company::where(['id' => $data['party_b']])->field($field)->find(); $company = Company::where(['id' => $data['party_b']])->field($field)->find()->toArray();
$company['qualification'] = json_decode($company['qualification'], true); $company['qualification'] = json_decode($company['qualification'], true);
if($company['qualification'] && isset($company['qualification']['other_qualifications'])){
$company['qualification']['other_qualifications']=json_decode($company['qualification']['other_qualifications'],true);
}
return $company; return $company;
} else { } else {
$filed = ['id,id_card,avatar,nickname,sex,mobile, $filed = ['id,id_card,avatar,nickname,sex,mobile,
@ -134,6 +137,9 @@ class ContractLogic extends BaseLogic
qualification']; qualification'];
$user = User::where('id', $data['party_b'])->field($filed)->find(); $user = User::where('id', $data['party_b'])->field($filed)->find();
$user['qualification'] = json_decode($user['qualification'], true); $user['qualification'] = json_decode($user['qualification'], true);
if($user['qualification'] && isset($user['qualification']['other_qualifications'])){
$user['qualification']['other_qualifications']=json_decode($user['qualification']['other_qualifications'],true);
}
return $user; return $user;
} }
}) })
@ -143,6 +149,9 @@ class ContractLogic extends BaseLogic
qualification']; qualification'];
$company = Company::where(['id' => $data['party_a']])->field($field)->find(); $company = Company::where(['id' => $data['party_a']])->field($field)->find();
$company['qualification'] = json_decode($company['qualification'], true); $company['qualification'] = json_decode($company['qualification'], true);
if($company['qualification'] && isset($company['qualification']['other_qualifications'])){
$company['qualification']['other_qualifications']=json_decode($company['qualification']['other_qualifications'],true);
}
return $company; return $company;
}) })
->withAttr('area_manager_name', function ($value, $data) { ->withAttr('area_manager_name', function ($value, $data) {

6
app/common/logic/task_scheduling/TaskSchedulingLogic.php
View File

@ -38,7 +38,11 @@ class TaskSchedulingLogic extends BaseLogic
*/ */
public static function add(array $params): bool public static function add(array $params): bool
{ {
TaskScheduling::where('company_id', $params['company_id']) $find=TaskScheduling::where('company_id', $params['company_id'])->find();
if($find){
self::setError('该公司已添加,请勿重复添加');
return false;
}
try { try {
TaskScheduling::create([ TaskScheduling::create([
'create_user_id' => $params['create_user_id'], 'create_user_id' => $params['create_user_id'],