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-07 11:28:56 +08:00
parent e2a8664abb
commit 474f1858c1
11 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/adminapi/controller/auth/AdminController.php
View File

@ -166,7 +166,10 @@ class AdminController extends BaseAdminController
if ($result && $result['contract'] && $result['contract']['file'] != '') {
$data = [
'name' => $result['name'] . '合同',
'signatories' => [['fullName' => $result['name'], 'identityType' => 1, 'identityCard' => $result['id_card'], 'mobile' => $result['account'], 'noNeedVerify' => 1, 'signLevel' => 1]],
'signatories' => [
['fullName' => $result['name'], 'identityType' => 1, 'identityCard' => $result['id_card'], 'mobile' => $result['account'], 'noNeedVerify' => 1, 'signLevel' => 1],
['fullName' => $result['contract']['party_a_info']['company_name'], 'identityType' => 12, 'identityCard' => $result['contract']['party_a_info']['organization_code'], 'email' => $result['contract']['party_a_info']['master_email'], 'noNeedVerify' => 1, 'signLevel' => 1]
],
'url' => $result['contract']['file']
];
$res = app(JunziqianController::class)->Signing($data,$result['contract']['id']);

5
app/adminapi/controller/user/UserController.php
View File

@ -112,7 +112,10 @@ class UserController extends BaseAdminController
}
$data = [
'name' => $result['nickname'] . '的合同',
'signatories' => [['fullName' => $result['nickname'], 'identityType' => 1, 'identityCard' => $result['id_card'], 'mobile' => $result['mobile'], 'noNeedVerify' => 1, 'signLevel' => 1]],
'signatories' => [
['fullName' => $result['nickname'], 'identityType' => 1, 'identityCard' => $result['id_card'], 'mobile' => $result['mobile'], 'noNeedVerify' => 1, 'signLevel' => 1],
['fullName' => $result['contract']['party_a_info']['company_name'], 'identityType' => 12, 'identityCard' => $result['contract']['party_a_info']['organization_code'], 'email' => $result['contract']['party_a_info']['master_email'], 'noNeedVerify' => 1, 'signLevel' => 1]
],
'url' => $result['contract']['file']
];
$res = app(JunziqianController::class)->Signing($data,$result['contract']['id']);

4
app/adminapi/logic/auth/AdminLogic.php
View File

@ -250,9 +250,9 @@ class AdminLogic extends BaseLogic
})
->find();
if (empty($admin['contract']['party_a'])) {
$admin['contract']['party_a_name'] = '';
$admin['contract']['party_a_info'] = '';
} else {
$admin['contract']['party_a_name'] = Company::where(['id' => $admin['contract']['party_a']])->value('company_name');
$admin['contract']['party_a_info'] = Company::where(['id' => $admin['contract']['party_a']])->field('id,company_name,organization_code,master_name,master_phone,master_email')->find();
}
if ($action == 'detail') {
return $admin;

28
app/adminapi/logic/contract/ContractLogic.php
View File

@ -17,6 +17,8 @@ namespace app\adminapi\logic\contract;
use app\common\model\contract\Contract;
use app\common\logic\BaseLogic;
use app\common\model\Company;
use app\common\model\user\User;
use think\facade\Db;
@ -118,28 +120,26 @@ class ContractLogic extends BaseLogic
$data = Db::name('contract')->where('id', $params['id'])
->withAttr('party_b_info', function ($value, $data) {
if ($data['type'] == 1) {
$filed=['id,company_name,company_type,organization_code,province,city,area,street,address,qualification'];
$company=Db::name('company')->where('id', $data['party_b'])->field($filed)
->withAttr('company_type_name', function ($value, $data) {
return Db::name('dict_data')->where('id', $data['company_type'])->value('name');
})
->find();
$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,
qualification'];
$company=Company::where(['id'=> $data['party_b']])->field($field)->find();
$company['qualification']=json_decode($company['qualification'],true);
return $company;
} else {
$filed=['id,avatar,nickname,sex,mobile,province,city,area,street,village,brigade,address,qualification'];
$user= Db::name('user')->where('id', $data['party_b'])->field($filed)->find();
$filed=['id,avatar,nickname,sex,mobile,
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,
qualification'];
$user= User::where('id', $data['party_b'])->field($filed)->find();
$user['qualification']=json_decode($user['qualification'],true);
return $user;
}
})
->withAttr('party_a_info', function ($value, $data) {
$filed=['id,company_name,company_type,organization_code,province,city,area,street,address,qualification'];
$company=Db::name('company')->where('id', $data['party_a'])
->withAttr('company_type_name', function ($value, $data) {
return Db::name('dict_data')->where('id', $data['company_type'])->value('name');
})
->field($filed)->find();
$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,
qualification'];
$company=Company::where(['id'=> $data['party_a']])->field($field)->find();
$company['qualification']=json_decode($company['qualification'],true);
return $company;

2
app/adminapi/logic/user/UserLogic.php
View File

@ -52,7 +52,7 @@ class UserLogic extends BaseLogic
// $user->sex = $user->getData('sex');
$user['qualification']=json_decode($user->qualification,true);
if($user->is_contract==1){
$user['contract']=Contract::where(['type'=>2,'party_b'=>$userId])->with(['partyA','contractType'])->find();
$user['contract']=Contract::where(['type'=>2,'party_b'=>$userId])->with(['partyAInfo','contractType'])->find();
}
return $user->toArray();
}

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

@ -110,7 +110,7 @@ class CompanyController extends BaseApiController
}
$query = User::where($wehre);
$count = $query->count();
$users = $query->page($page)->limit($limit)->with(['company' => function ($query) {
$users = $query->order('id', 'desc')->page($page)->limit($limit)->with(['company' => function ($query) {
$query->field('id,company_name');
}])->append(['province_name', 'city_name', 'area_name', 'street_name'])
->field('id,avatar,real_name,account,mobile as phone,province,city,area,street,company_id,qualification,nickname,is_contract,is_captain')

9
app/common/logic/CompanyLogic.php
View File

@ -181,8 +181,8 @@ class CompanyLogic extends BaseLogic
$data['admin_name'] = Db::name('admin')->where('id', $data['admin_id'])->value('name');
$data['area_manager_name'] = Db::name('admin')->where('id', $data['area_manager'])->value('name');
$data['contract'] = Db::name('contract')->where('party_b', $data['id'])
->withAttr('party_a_name', function ($value, $data) {
return Db::name('company')->where('id', $data['party_a'])->value('company_name');
->withAttr('party_a_info', function ($value, $data) {
return Db::name('company')->where('id', $data['party_a'])->field('id,company_name,organization_code,master_name,master_email,master_phone')->find();
})
->find();
}
@ -240,7 +240,10 @@ class CompanyLogic extends BaseLogic
if ($result && $result['contract'] && $result['contract']['file'] != '') {
$data = [
'name' => $result['company_name'] . '合同',
'signatories' => [['fullName' => $result['company_name'], 'identityType' => 12, 'identityCard' => $result['organization_code'], 'email' => $result['master_email'], 'noNeedVerify' => 1, 'signLevel' => 1]],
'signatories' => [
['fullName' => $result['company_name'], 'identityType' => 12, 'identityCard' => $result['organization_code'], 'email' => $result['master_email'], 'noNeedVerify' => 1, 'signLevel' => 1],
['fullName' => $result['contract']['party_a_info']['company_name'], 'identityType' => 12, 'identityCard' => $result['contract']['party_a_info']['organization_code'], 'email' => $result['contract']['party_a_info']['master_email'], 'noNeedVerify' => 1, 'signLevel' => 1]
],
'url' => $result['contract']['file']
];
$res = app(JunziqianController::class)->Signing($data, $result['contract']['id']);

7
app/common/logic/UserLogic.php
View File

@ -54,7 +54,7 @@ class UserLogic extends BaseLogic
// $user->sex = $user->getData('sex');
$user['qualification'] = json_decode($user->qualification, true);
// if ($user->is_contract == 1) {
$user['contract'] = Contract::where(['type' => 2, 'party_b' => $userId])->with(['partyA', 'contractType'])->find();
$user['contract'] = Contract::where(['type' => 2, 'party_b' => $userId])->with(['partyAInfo', 'contractType'])->find();
// }
return $user->toArray();
}
@ -148,7 +148,10 @@ class UserLogic extends BaseLogic
}
$data = [
'name' => $result['nickname'] . '的合同',
'signatories' => [['fullName' => $result['nickname'], 'identityType' => 1, 'identityCard' => $result['id_card'], 'mobile' => $result['mobile'], 'noNeedVerify' => 1, 'signLevel' => 1]],
'signatories' => [
['fullName' => $result['nickname'], 'identityType' => 1, 'identityCard' => $result['id_card'], 'mobile' => $result['mobile'], 'noNeedVerify' => 1, 'signLevel' => 1],
['fullName' => $result['contract']['party_a_info']['company_name'], 'identityType' => 12, 'identityCard' => $result['contract']['party_a_info']['organization_code'], 'email' => $result['contract']['party_a_info']['master_email'], 'noNeedVerify' => 1, 'signLevel' => 1]
],
'url' => $result['contract']['file']
];
$res = app(JunziqianController::class)->Signing($data, $result['contract']['id']);

8
app/common/model/Company.php
View File

@ -27,10 +27,10 @@ class Company extends BaseModel
protected $name = 'company';
// public function getCompanyTypeAttr($value)
// {
// return DictData::where('id', $value)->value('name');
// }
public function getCompanyTypeNameAttr($value)
{
return DictData::where('id', $value)->value('name');
}
public function getProvinceNameAttr($value)
{

4
app/common/model/contract/Contract.php
View File

@ -44,6 +44,10 @@ class Contract extends BaseModel
{
return $this->hasOne(Company::class, 'id', 'company_id');
}
public function partyAInfo()
{
return $this->hasOne(Company::class, 'id', 'party_a')->filed('id,company_name,organization_code,master_name,master_phone,master_email');
}
public function partyA()
{
return $this->hasOne(Company::class, 'id', 'party_a')->bind(['party_a_name'=>'company_name']);

1
app/common/model/informationg/UserInformationg.php
View File

@ -107,6 +107,7 @@ class UserInformationg extends BaseModel
$a = json_decode($v['data'], true);
$arr = [
'id' => $v['category_child'],
'update_time'=>$v['update_time'],
'datas' => $a
];
if ($a) {