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

增加批量导入组织成员

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-07-11 17:08:31 +08:00
parent 2c3a5bdd8a
commit 0f4208a2cd
7 changed files with 208 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
application/common/Model/DepartmentMember.php
View File

@ -3,6 +3,12 @@
namespace app\common\Model;
use Exception;
use service\RandomService;
use think\db\exception\DataNotFoundException;
use think\db\exception\ModelNotFoundException;
use think\exception\DbException;
/**
* 部门成员
* Class ProjectMember
@ -18,9 +24,9 @@ class DepartmentMember extends CommonModel
* @param int $isOwner 是否拥有者
* @param int $isPrincipal 是否负责人
* @return DepartmentMember|MemberAccount
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws DataNotFoundException
* @throws ModelNotFoundException
* @throws DbException
*/
public function inviteMember($accountCode, $departmentCode = '', $isOwner = 0, $isPrincipal = 0)
{
@ -28,11 +34,11 @@ class DepartmentMember extends CommonModel
if ($departmentCode) {
$department = Department::where(['code' => $departmentCode])->find();
if (!$department) {
throw new \Exception('该部门不存在', 1);
throw new Exception('该部门不存在', 1);
}
$hasJoined = self::where(['account_code' => $accountCode, 'department_code' => $departmentCode])->find();
if ($hasJoined) {
throw new \Exception('已加入该部门', 2);
throw new Exception('已加入该部门', 2);
}
$data = [
'code' => createUniqueCode('departmentMember'),
@ -53,8 +59,8 @@ class DepartmentMember extends CommonModel
} else {
try {
$result = MemberAccount::inviteMember($accountCode, $orgCode);
} catch (\Exception $e) {
throw new \Exception($e->getMessage(), 3);
} catch (Exception $e) {
throw new Exception($e->getMessage(), 3);
}
return $result;
}
@ -64,20 +70,20 @@ class DepartmentMember extends CommonModel
* @param $accountCode
* @param $departmentCode
* @return bool
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws DataNotFoundException
* @throws ModelNotFoundException
* @throws DbException
*/
public function removeMember($accountCode, $departmentCode)
{
$orgCode = getCurrentOrganizationCode();
$department = Department::where(['code' => $departmentCode])->find();
if (!$department) {
throw new \Exception('该部门不存在', 1);
throw new Exception('该部门不存在', 1);
}
$hasJoined = self::where(['account_code' => $accountCode, 'department_code' => $departmentCode])->find();
if (!$hasJoined) {
throw new \Exception('尚未加入该部门', 2);
throw new Exception('尚未加入该部门', 2);
}
$result = $hasJoined->delete();
$department_codes = self::where(['account_code' => $accountCode, 'organization_code' => $orgCode])->column('department_code');
@ -86,4 +92,88 @@ class DepartmentMember extends CommonModel
MemberAccount::update(['department_code' => $department_codes], ['code' => $accountCode]);
return $result;
}
/**
* 导入成员
* @param \think\File $file
* @return bool
* @throws Exception
*/
public function uploadFile(\think\File $file)
{
try {
$data = importExcel($file->getInfo()['tmp_name']);
} catch (Exception $e) {
return error('201', $e->getMessage());
}
$count = 0;
if ($data) {
$organizationCode = getCurrentOrganizationCode();
foreach ($data as $key => $item) {
if ($key > 3) {
$name = trim($item['A']);
$email = trim($item['B']);
$departments = trim($item['C']);
$position = trim($item['D']);
$mobile = trim($item['E']);
$password = trim($item['F']);
$description = trim($item['G']);
$member = Member::where(['email' => $email])->find();
if (!$member) {
//注册新账号
$memberData = [
'email' => $email,
'name' => $name,
'account' => RandomService::alnumLowercase(),
'avatar' => 'https://static.vilson.xyz/cover.png',
'status' => 1,
'code' => createUniqueCode('member'),
'password' => $password ? md5($password) : '',
// 'mobile' => $mobile,
];
try {
$result = Member::createMember($memberData);
} catch (Exception $e) {
return error(1, $e->getMessage());
}
$member = Member::get($result->id);
$memberAccount = MemberAccount::inviteMember($member['code'], $organizationCode, $position, $mobile, '', $description);
if (!isError($memberAccount)) {
$count++;
}
} else {
$memberAccount = MemberAccount::where(['member_code' => $member['code'], 'organization_code' => $organizationCode])->find();
}
if ($departments) {
$departmentList = explode(';', $departments);
if ($departmentList) {
foreach ($departmentList as $departmentItems) {
$departmentNames = explode('/', $departmentItems);
if ($departmentNames) {
$department = null;
$pcode = '';
foreach ($departmentNames as $key => $departmentName) {
$department = Department::where(['name' => $departmentNames, 'pcode' => $pcode, 'organization_code' => $organizationCode])->find();
if (!$department) {
break;
}
$pcode = $department['code'];
}
if ($department) {
try {
$this->inviteMember($memberAccount['code'], $department['code']);
} catch (Exception $e) {
return error(2, $e->getMessage());
}
}
}
}
}
}
}
}
}
return $count;
}
}

36
application/common/Model/Member.php
View File

@ -2,12 +2,18 @@
namespace app\common\Model;
use Exception;
use PDOStatement;
use service\JwtService;
use service\NodeService;
use service\RandomService;
use think\Db;
use think\db\exception\DataNotFoundException;
use think\db\exception\ModelNotFoundException;
use think\exception\DbException;
use think\exception\PDOException;
use think\File;
use think\Model;
class Member extends CommonModel
{
@ -23,7 +29,17 @@ class Member extends CommonModel
$list = MemberAccount::where(['member_code' => $member['code']])->order('id asc')->select()->toArray();
$organizationList = [];
if ($list) {
foreach ($list as $item) {
foreach ($list as &$item) {
$departments = '';
$departmentCodes = $item['department_code'];
if ($departmentCodes) {
$departmentCodes = explode(',', $departmentCodes);
foreach ($departmentCodes as $departmentCode) {
$department = Department::where(['code' => $departmentCode])->field('name')->find();
$departments .= "{$department['name']} ";
}
}
$item['department'] = $departments;
$organization = Organization::where(['code' => $item['organization_code']])->find();
if ($organization) {
$organizationList[] = $organization;
@ -51,9 +67,9 @@ class Member extends CommonModel
/**
* @param $memberData
* @return Member
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws DataNotFoundException
* @throws ModelNotFoundException
* @throws DbException
*/
public static function createMember($memberData)
{
@ -128,10 +144,10 @@ class Member extends CommonModel
/**
* 钉钉登录
* @param $userInfo
* @return Member|array|PDOStatement|string|\think\Model|null
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @return Member|array|PDOStatement|string|Model|null
* @throws DataNotFoundException
* @throws ModelNotFoundException
* @throws DbException
*/
public static function dingtalkLogin($userInfo)
{
@ -186,8 +202,8 @@ class Member extends CommonModel
* @param File $file
* @return array|bool
* @throws \think\Exception
* @throws \think\exception\PDOException
* @throws \Exception
* @throws PDOException
* @throws Exception
*/
public function uploadImg(File $file)
{

39
application/common/Model/MemberAccount.php
View File

@ -2,8 +2,13 @@
namespace app\common\Model;
use Exception;
use service\NodeService;
use think\Db;
use think\db\exception\DataNotFoundException;
use think\db\exception\ModelNotFoundException;
use think\exception\DbException;
use think\exception\PDOException;
use think\File;
class MemberAccount extends CommonModel
@ -13,9 +18,9 @@ class MemberAccount extends CommonModel
/**
* 获取当前用户菜单
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws DataNotFoundException
* @throws ModelNotFoundException
* @throws DbException
*/
public static function getAuthMenuList()
{
@ -29,12 +34,16 @@ class MemberAccount extends CommonModel
* 邀请成员
* @param $memberCode
* @param $organizationCode
* @param string $position
* @param string $mobile
* @param string $department
* @param string $description
* @return MemberAccount
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws DataNotFoundException
* @throws DbException
* @throws ModelNotFoundException
*/
public static function inviteMember($memberCode, $organizationCode)
public static function inviteMember($memberCode, $organizationCode, $position = '', $mobile = '', $department = '', $description = '')
{
$hasJoined = MemberAccount::where(['member_code' => $memberCode, 'organization_code' => $organizationCode])->find();
if ($hasJoined) {
@ -50,8 +59,9 @@ class MemberAccount extends CommonModel
$authId = $auth['id'];//权限id
}
$data = [
'position' => '资深工程师',
'department' => '某某公司－某某某事业群－某某平台部－某某技术部',
'position' => $position,
'department' => $department ?? '某某公司－某某某事业群－某某平台部－某某技术部',
'description' => $description ?? '',
'code' => createUniqueCode('memberAccount'),
'member_code' => $memberCode,
'organization_code' => $organizationCode,
@ -60,6 +70,7 @@ class MemberAccount extends CommonModel
'status' => 1,
'create_time' => nowTime(),
'name' => $memberDate['name'],
'mobile' => $mobile,
'email' => $memberDate['email'],
];
return MemberAccount::create($data);
@ -69,8 +80,8 @@ class MemberAccount extends CommonModel
* @param File $file
* @return array|bool
* @throws \think\Exception
* @throws \think\exception\PDOException
* @throws \Exception
* @throws PDOException
* @throws Exception
*/
public function uploadImg(File $file)
{
@ -100,7 +111,7 @@ class MemberAccount extends CommonModel
/**
* @param $accountCode
* @return bool
* @throws \Exception
* @throws Exception
*/
public function del($accountCode)
{
@ -116,9 +127,9 @@ class MemberAccount extends CommonModel
DepartmentMember::where(['account_code' => $accountCode, 'organization_code' => $orgCode])->delete();
}
Db::commit();
} catch (\Exception $e) {
} catch (Exception $e) {
Db::rollback();
throw new \Exception($e->getMessage(), 201);
throw new Exception($e->getMessage(), 201);
}
return true;
}

1
application/common/Model/Project.php
View File

@ -65,6 +65,7 @@ class Project extends CommonModel
'name' => $name,
'description' => $description,
'organization_code' => $orgCode,
'task_board_theme' => 'simple',
'cover' => FileService::getFilePrefix() . 'static/image/default/project-cover.png'
];
$result = self::create($project);

39
application/project/controller/DepartmentMember.php
View File

@ -5,7 +5,12 @@ namespace app\project\controller;
use app\common\Model\Member;
use app\common\Model\MemberAccount;
use controller\BasicApi;
use Exception;
use think\db\exception\DataNotFoundException;
use think\db\exception\ModelNotFoundException;
use think\exception\DbException;
use think\facade\Request;
use think\response\Download;
/**
* 部门成员
@ -21,7 +26,7 @@ class DepartmentMember extends BasicApi
}
/**
* @throws \think\exception\DbException
* @throws DbException
*/
public function index()
{
@ -46,9 +51,9 @@ class DepartmentMember extends BasicApi
/**
* 邀请成员查询
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws DataNotFoundException
* @throws ModelNotFoundException
* @throws DbException
*/
public function searchInviteMember()
{
@ -119,7 +124,7 @@ class DepartmentMember extends BasicApi
}
try {
$this->model->inviteMember($data['accountCode'], $data['departmentCode']);
} catch (\Exception $e) {
} catch (Exception $e) {
$this->error($e->getMessage(), $e->getCode());;
}
$this->success('');
@ -136,9 +141,31 @@ class DepartmentMember extends BasicApi
}
try {
$this->model->removeMember($data['accountCode'], $data['departmentCode']);
} catch (\Exception $e) {
} catch (Exception $e) {
$this->error($e->getMessage(), $e->getCode());;
}
$this->success('');
}
/**
* 下载导入成员模板
* @return Download
*/
public function _downloadTemplate()
{
return download(env('root_path') . 'data/template/importMember.xlsx', '批量导入成员模板.xlsx');
}
/**
* 上传文件
*/
public function uploadFile()
{
$count = $this->model->uploadFile(Request::file('file'));
if (isError($count)) {
$this->error($count['msg']);
}
$this->success('', $count);
}
}

22
application/project/controller/Index.php
View File

@ -3,6 +3,7 @@
namespace app\project\controller;
use app\common\Model\CommonModel;
use app\common\Model\Department;
use app\common\Model\Member;
use app\common\Model\MemberAccount;
use app\common\Model\Notify;
@ -58,6 +59,18 @@ class Index extends BasicApi
$member = getCurrentMember();
$memberAccount = MemberAccount::where(['member_code' => $member['code'], 'organization_code' => $organizationCode])->find();
$member = Member::where(['account' => $member['account']])->order('id asc')->find()->toArray();
$departments = '';
$departmentCodes = $memberAccount['department_code'];
if ($departmentCodes) {
$departmentCodes = explode(',', $departmentCodes);
foreach ($departmentCodes as $departmentCode) {
$department = Department::where(['code' => $departmentCode])->field('name')->find();
$departments .= "{$department['name']} ";
}
}
$member['position'] = $memberAccount['position'];
$member['department'] = $departments;
$member['account_id'] = $memberAccount['id'];
$member['is_owner'] = $memberAccount['is_owner'];
$member['authorize'] = $memberAccount['authorize'];
@ -66,7 +79,7 @@ class Index extends BasicApi
setCurrentOrganizationCode($organizationCode);
$list = MemberAccount::getAuthMenuList();
$this->success('', $list);
$this->success('', ['menuList' => $list, 'member' => $member]);
}
$this->error('请选择组织');
}
@ -101,6 +114,10 @@ class Index extends BasicApi
$params = Request::only('mobile,mail,idcard,name,realname,avatar,id');
$memberModel = new Member();
$result = $memberModel->_edit($params, ['id' => Request::post('id')]);
if (isset($params['avatar'])) {
$member = Member::get($params['id']);
MemberAccount::update(['avatar' => $params['avatar']], ['member_code' => $member['code']]);
}
if ($result) {
$this->success('基本信息更新成功');
}
@ -114,6 +131,9 @@ class Index extends BasicApi
*/
public function editPassword()
{
var_dump(11);
die;
$memberModel = new Member();
$params = Request::only('password,newPassword,confirmPassword,id');
$member = $memberModel->field('password')->get($params['id'])->toArray();

BIN
data/template/importMember.xlsx Normal file
View File

Binary file not shown.