diff --git a/app/adminapi/lists/user/UserLists.php b/app/adminapi/lists/user/UserLists.php index bd1299e7c..f3f2247e9 100755 --- a/app/adminapi/lists/user/UserLists.php +++ b/app/adminapi/lists/user/UserLists.php @@ -16,6 +16,7 @@ namespace app\adminapi\lists\user; use app\adminapi\lists\BaseAdminDataLists; use app\common\enum\user\UserTerminalEnum; use app\common\lists\ListsExcelInterface; +use app\common\model\contract\Contract; use app\common\model\user\User; use think\facade\Db; @@ -68,7 +69,11 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface ->limit($this->limitOffset, $this->limitLength) ->field($field) ->order('id desc') - ->select()->toArray(); + ->select()->each(function($item, $key){ + $find= Contract::where('type',2)->where('party_b',$item['id'])->field('id,party_a,party_b,check_status')->find(); + $item['contract'] = $find; + }) + ->toArray(); foreach ($lists as &$item) { $item['channel'] = UserTerminalEnum::getTermInalDesc($item['channel']); diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 1ce408545..a96d29fd0 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -88,7 +88,7 @@ class CompanyController extends BaseApiController $count = $query->count(); $users = $query->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')->select()->each(function($item,$key){ + }])->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')->select()->each(function($item,$key){ if($item['qualification']!=''){ $item['qualification']=json_decode($item['qualification'],true); } @@ -101,7 +101,7 @@ class CompanyController extends BaseApiController $query = User::where('id', $id); $user = $query->with(['company' => function ($query) { $query->field('id,company_name'); - }])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,sex,avatar,nickname name,account,mobile phone,id_card,qualification,province,city,area,street,is_contract,company_id')->find()->toArray(); + }])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,sex,avatar,nickname name,account,mobile phone,id_card,qualification,province,city,area,street,is_contract,company_id,is_captain')->find()->toArray(); $contract = Contract::whereRaw("(type=1 and party_b={$user['company_id']}) or (type=2 and party_b={$user['id']})")->append(['contract_type_name'])->find(); $user['contract'] = $contract; // $roleIds = AdminRole::where('admin_id', $user['id'])->column('role_id'); diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php index 9dec243b7..5733c45d6 100644 --- a/app/api/controller/InformationController.php +++ b/app/api/controller/InformationController.php @@ -23,6 +23,9 @@ class InformationController extends BaseApiController return $this->success('ok', $res->toArray()); } + /** + * 添加 + */ public function add() { $param = Request()->param(); @@ -34,7 +37,10 @@ class InformationController extends BaseApiController } return $this->success('成功'); } - + + /** + * 详情 + */ public function details(){ $param = Request()->param(); $res = UserInformationg::details($param['id']); @@ -43,4 +49,30 @@ class InformationController extends BaseApiController } return $this->success('成功',$res->toArray()); } + + /** + * 商机更新 + */ + public function opportunity_update(){ + $param = Request()->param(); + foreach ($param['datas'] as $k => $v) { + $res = UserInformationg::informationg_demand($v,$param['id'],$this->userId); + } + if ($res != true) { + return $this->fail( BaseLogic::getError()); + } + return $this->success('成功'); + } + + /** + * 编辑 + */ + public function edit(){ + $param = Request()->param(); + $res = UserInformationg::edit($param); + if ($res != true) { + return $this->fail( BaseLogic::getError()); + } + return $this->success('成功'); + } } diff --git a/app/api/controller/LoginController.php b/app/api/controller/LoginController.php index 55ada8cb1..b3db5dfa0 100755 --- a/app/api/controller/LoginController.php +++ b/app/api/controller/LoginController.php @@ -17,6 +17,7 @@ namespace app\api\controller; use app\api\validate\{LoginAccountValidate, RegisterValidate, WebScanLoginValidate, WechatLoginValidate}; use app\api\logic\LoginLogic; use app\Request; +use app\api\logic\UserLogic; /** * 登录注册 @@ -56,6 +57,16 @@ class LoginController extends BaseApiController return $this->fail(LoginLogic::getError()); } + public function setInfo() + { + $params=Request()->param(); + $result = UserLogic::setInfo($params['user_id'], ['field'=>'is_captain','value'=>$params['is_captain']]); + if (false === $result) { + return $this->fail(UserLogic::getError()); + } + return $this->success('操作成功', [], 1, 1); + } + /** * @notes 账号密码/手机号密码/手机号验证码登录 * @return \think\response\Json diff --git a/app/api/logic/LoginLogic.php b/app/api/logic/LoginLogic.php index c7e5f2dd9..cb33c4500 100755 --- a/app/api/logic/LoginLogic.php +++ b/app/api/logic/LoginLogic.php @@ -61,6 +61,7 @@ class LoginLogic extends BaseLogic User::create([ 'sn' => $userSn, 'avatar' => $avatar, + 'is_captain' => $params['is_captain'], 'nickname' =>$params['nickname'], 'account' => $params['account'], 'mobile' => $params['account'], diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 7d43af528..4cd88165e 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -91,7 +91,7 @@ class UserInformationg extends BaseModel 'status' => 1, 'information_id' => $id, ]; - UserInformationgDemand::create($data); + return UserInformationgDemand::create($data); } public static function details($id) diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index fca1757bb..ed981af02 100755 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -22,6 +22,7 @@ use app\common\model\BaseModel; use app\common\service\FileService; use think\model\concern\SoftDelete; use app\common\model\Company; +use app\common\model\contract\Contract; use think\facade\Db; /** * 用户模型 @@ -183,7 +184,6 @@ class User extends BaseModel { return $this->hasOne(Company::class, 'id', 'company_id')->field(['id','company_name','admin_id']); } - public function getCityNameAttr($value) { return Db::name('geo_city')->where(['city_code' => $this->city])->value('city_name');