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 12:00:27 +08:00
parent 474f1858c1
commit 62d68b853e
4 changed files with 92 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/lists/informationg/UserInformationgLists.php
View File

@ -55,7 +55,8 @@ class UserInformationgLists extends BaseAdminDataLists implements ListsSearchInt
public function lists(): array public function lists(): array
{ {
$lists = UserInformationg::where($this->searchWhere) $lists = UserInformationg::where($this->searchWhere)
->field(['id', 'area_id','area_id area_name','street_id','street_id street_name','village_id','village_id village_name', 'brigade_id','brigade_id brigade_name', 'address', 'name', 'phone', 'sex', 'age', 'status']) ->field(['id','create_user_id','company_id','area_id','area_id area_name','street_id','street_id street_name','village_id','village_id village_name', 'brigade_id','brigade_id brigade_name', 'address', 'name', 'phone', 'sex', 'age','update_time','status'])
->append(['extend'])
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()
->toArray(); ->toArray();

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

@ -72,6 +72,7 @@ class InformationController extends BaseApiController
if ($res != true) { if ($res != true) {
return $this->fail( BaseLogic::getError()); return $this->fail( BaseLogic::getError());
} }
UserInformationg::where('id',$param['id'])->update(['update_time'=>time()]);
return $this->success('成功'); return $this->success('成功');
} }

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

@ -237,6 +237,7 @@ class CompanyLogic extends BaseLogic
public static function Draftingcontracts($params) public static function Draftingcontracts($params)
{ {
$result = self::detail($params); $result = self::detail($params);
halt($result);
if ($result && $result['contract'] && $result['contract']['file'] != '') { if ($result && $result['contract'] && $result['contract']['file'] != '') {
$data = [ $data = [
'name' => $result['company_name'] . '合同', 'name' => $result['company_name'] . '合同',
@ -256,19 +257,30 @@ class CompanyLogic extends BaseLogic
return Db::name('dict_data')->where('id', $data['contract_type'])->value('name'); return Db::name('dict_data')->where('id', $data['contract_type'])->value('name');
})->find(); })->find();
if ($find) { if ($find) {
$data = array( $data = [
[
"applyNo" => $find['contract_no'], //TODO * "applyNo" => $find['contract_no'], //TODO *
"fullName" => $company['company_name'], //TODO * "fullName" => $result['contract']['party_a_info']['company_name'], //TODO *
"identityCard" => $company['organization_code'], //TODO * "identityCard" => $result['contract']['party_a_info']['organization_code'], //TODO *
"identityType" => 12, //TODO * "identityType" => 12, //TODO *
); "master_phone"=>$result['contract']['party_a_info']['master_phone']
],
[
"applyNo" => $find['contract_no'], //TODO *
"fullName" => $result['company_name'], //TODO *
"identityCard" => $result['organization_code'], //TODO *
"identityType" => 12, //TODO *
"master_phone"=>$result['master_phone']
]
];
foreach($data as $k=>$v){
$res = app(JunziqianController::class)->SigningLink($data); $res = app(JunziqianController::class)->SigningLink($data);
if ($res->success == true) { if ($res->success == true ) {
Db::name('contract')->where('id', $find['id'])->update(['url' => $res->data]); Db::name('contract')->where('id', $find['id'])->update(['url' => $res->data]);
//发送短信 //发送短信
$sms = [ $sms = [
'mobile' => $company['master_phone'], 'mobile' => $v['master_phone'],
'name' => $company['company_name'], 'name' => $v['company_name'],
'type' => '《' . $find['contract_type_name'] . '》', 'type' => '《' . $find['contract_type_name'] . '》',
'code' => 'api/Hetong/url?id=' . $find['id'], 'code' => 'api/Hetong/url?id=' . $find['id'],
'scene' => 'WQ' 'scene' => 'WQ'
@ -284,6 +296,7 @@ class CompanyLogic extends BaseLogic
} }
} }
} }
}
return true; return true;
} else { } else {
return self::setError($res->msg); return self::setError($res->msg);
@ -296,20 +309,39 @@ class CompanyLogic extends BaseLogic
//**发送短信 */ //**发送短信 */
public static function postsms($params) public static function postsms($params)
{ {
$company = Db::name('company')->where('id', $params['id'])->find(); $result = self::detail($params);
if ($company) { if ($result && $result['contract'] && $result['contract']['file'] != '') {
$find = Db::name('contract')->where('party_b', $company['id']) //发送短信
$data = [
[
"applyNo" => $result['contract_no'], //TODO *
"fullName" => $result['contract']['party_a_info']['company_name'], //TODO *
"identityCard" => $result['contract']['party_a_info']['organization_code'], //TODO *
"identityType" => 12, //TODO *
"master_phone"=>$result['contract']['party_a_info']['master_phone']
],
[
"applyNo" => $result['contract_no'], //TODO *
"fullName" => $result['company_name'], //TODO *
"identityCard" => $result['organization_code'], //TODO *
"identityType" => 12, //TODO *
"master_phone"=>$result['master_phone']
]
];
$find = Db::name('contract')->where('party_b', $params['id'])
->withAttr('contract_type_name', function ($value, $data) { ->withAttr('contract_type_name', function ($value, $data) {
return Db::name('dict_data')->where('id', $data['contract_type'])->value('name'); return Db::name('dict_data')->where('id', $data['contract_type'])->value('name');
}) })->find();
->find(); foreach($data as $k=>$v){
if ($find) { $res = app(JunziqianController::class)->SigningLink($data);
if ($res->success == true ) {
Db::name('contract')->where('id', $find['id'])->update(['url' => $res->data]);
//发送短信 //发送短信
$sms = [ $sms = [
'mobile' => $company['master_phone'], 'mobile' => $v['master_phone'],
'name' => $company['company_name'], 'name' => $v['company_name'],
'type' => '《' . $find['contract_type_name'] . '》', 'type' => '《' . $find['contract_type_name'] . '》',
'code' => 'api/Hetong/url?id='.$find['id'], 'code' => 'api/Hetong/url?id=' . $find['id'],
'scene' => 'WQ' 'scene' => 'WQ'
]; ];
$result = SmsLogic::contractUrl($sms); $result = SmsLogic::contractUrl($sms);
@ -318,6 +350,9 @@ class CompanyLogic extends BaseLogic
} else { } else {
return self::setError(SmsLogic::getError()); return self::setError(SmsLogic::getError());
} }
} else {
return self::setError($res->msg);
}
} }
} }
} }

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

@ -7,6 +7,7 @@ use think\facade\Db;
use think\facade\Log; use think\facade\Log;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\Company; use app\common\model\Company;
use app\common\model\user\User;
class UserInformationg extends BaseModel class UserInformationg extends BaseModel
{ {
@ -22,6 +23,16 @@ class UserInformationg extends BaseModel
return $this->hasOne(\app\common\model\informationg\UserInformationgDemand::class, 'information_id', 'id'); return $this->hasOne(\app\common\model\informationg\UserInformationgDemand::class, 'information_id', 'id');
} }
public function getExtendAttr($valur,$data){
$company_name=Company::where('id',$data['company_id'])->value('company_name');
$nickname=User::where('id',$data['create_user_id'])->value('nickname');
return [
'company_name'=>$company_name,
'nickname'=>$nickname
];
}
public static function list($param, $page = 1, $size = 10) public static function list($param, $page = 1, $size = 10)
{ {
return self::where($param)->with('company') return self::where($param)->with('company')