|
@@ -125,6 +125,73 @@ namespace OASystem.API.Controllers
|
|
|
return Ok(JsonView(view));
|
|
|
}
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 申请注册 数据Data
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="dto"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ //[Authorize]
|
|
|
+ [HttpPost]
|
|
|
+ [Route("register/daraSource")]
|
|
|
+ public async Task<IActionResult> RegisterDataSource()
|
|
|
+ {
|
|
|
+ string sql = string.Format(@"Select sc.Id CompanyId,sc.CompanyName,sd.Id DepId,sd.DepName,sjp.Id JobId,sjp.JobName From Sys_Company sc
|
|
|
+ Left Join Sys_Department sd On sd.IsDel = 0 And sc.Id = sd.CompanyId
|
|
|
+ Left Join Sys_JobPost sjp On sjp.IsDel = 0 And sjp.DepId = sd.Id
|
|
|
+ Where sc.IsDel = 0");
|
|
|
+
|
|
|
+ var companyDetails = _loginRep._sqlSugar.SqlQueryable<CompanyDetailsView>(sql).ToList();
|
|
|
+
|
|
|
+ List<CompanyDetailsView1> detailsView1 = new List<CompanyDetailsView1>();
|
|
|
+
|
|
|
+ if (companyDetails.Count > 0)
|
|
|
+ {
|
|
|
+ var companyDetails1 = companyDetails.GroupBy(it => it.CompanyId).Select(it => it.First()).ToList();
|
|
|
+
|
|
|
+
|
|
|
+ detailsView1 = companyDetails1.Select(it =>
|
|
|
+ {
|
|
|
+ CompanyDetailsView1 itemCompany = new CompanyDetailsView1();
|
|
|
+ List<DepDetailsView> depDetailsView = new List<DepDetailsView>();
|
|
|
+
|
|
|
+ var companyDetails2 = companyDetails.GroupBy(it => it.DepId).Select(it => it.First()).ToList();
|
|
|
+ //部门
|
|
|
+ depDetailsView = companyDetails2.Where(depIt => depIt.CompanyId == it.CompanyId).Select(depIt => {
|
|
|
+
|
|
|
+ DepDetailsView depDetails = new DepDetailsView();
|
|
|
+ List<JobDetailsView> jobDetails = new List<JobDetailsView>();
|
|
|
+
|
|
|
+ //岗位
|
|
|
+ jobDetails = companyDetails.Where(jobIt => jobIt.DepId == depIt.DepId).Select(jobIt => {
|
|
|
+
|
|
|
+ JobDetailsView jobDetail = new JobDetailsView() {
|
|
|
+ JobId = jobIt.JobId,
|
|
|
+ JobName = jobIt.JobName,
|
|
|
+ };
|
|
|
+
|
|
|
+ return jobDetail;
|
|
|
+ }).ToList();
|
|
|
+
|
|
|
+ depDetails.DepId = depIt.DepId;
|
|
|
+ depDetails.DepName = depIt.DepName;
|
|
|
+ depDetails.SubJob = jobDetails;
|
|
|
+ return depDetails;
|
|
|
+ }).ToList();
|
|
|
+
|
|
|
+ itemCompany.CompanyId = it.CompanyId;
|
|
|
+ itemCompany.CompanyName = it.CompanyName;
|
|
|
+ itemCompany.SubDep = depDetailsView;
|
|
|
+ return itemCompany;
|
|
|
+ }).ToList();
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ return Ok(new { Code = 200, Msg = "查询成功!", Data = detailsView1 });
|
|
|
+ }
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 申请注册
|
|
|
/// </summary>
|
|
@@ -137,26 +204,26 @@ namespace OASystem.API.Controllers
|
|
|
{
|
|
|
#region 企业微信添加员工
|
|
|
|
|
|
- string lastName = dto.CnName.Substring(0, 1);
|
|
|
- string lastNamePy = string.Empty;
|
|
|
- if (PinyinHelper.IsChinese(Convert.ToChar(lastName)))
|
|
|
- {
|
|
|
- lastNamePy = PinyinHelper.GetPinyin(lastName);
|
|
|
- }
|
|
|
-
|
|
|
- string userId = string.Format("{0}.{1}", dto.EnName, lastNamePy.ToLower());
|
|
|
- Create_Request request = new Create_Request()
|
|
|
- {
|
|
|
- userid = userId,
|
|
|
- name = dto.CnName,
|
|
|
- mobile = dto.Phone,
|
|
|
- department = new List<long>() { dto.DepId },
|
|
|
- position = dto.JobPostId.ToString(),
|
|
|
- gender = dto.Sex == 0 ? 1 : dto.Sex == 1 ? 2 : 1,
|
|
|
- biz_mail = dto.Email
|
|
|
- };
|
|
|
+ //string lastName = dto.CnName.Substring(0, 1);
|
|
|
+ //string lastNamePy = string.Empty;
|
|
|
+ //if (PinyinHelper.IsChinese(Convert.ToChar(lastName)))
|
|
|
+ //{
|
|
|
+ // lastNamePy = PinyinHelper.GetPinyin(lastName);
|
|
|
+ //}
|
|
|
|
|
|
- var qiYeWeChatCreateData = await _qiYeWeChatApiServic.CreateAsync(request);
|
|
|
+ //string userId = string.Format("{0}.{1}", dto.EnName, lastNamePy.ToLower());
|
|
|
+ //Create_Request request = new Create_Request()
|
|
|
+ //{
|
|
|
+ // userid = userId,
|
|
|
+ // name = dto.CnName,
|
|
|
+ // mobile = dto.Phone,
|
|
|
+ // department = new List<long>() { dto.DepId },
|
|
|
+ // position = dto.JobPostId.ToString(),
|
|
|
+ // gender = dto.Sex == 0 ? 1 : dto.Sex == 1 ? 2 : 1,
|
|
|
+ // biz_mail = dto.Email
|
|
|
+ //};
|
|
|
+
|
|
|
+ //var qiYeWeChatCreateData = await _qiYeWeChatApiServic.CreateAsync(request);
|
|
|
#endregion
|
|
|
|
|
|
|