代码优化
This commit is contained in:
@@ -21,7 +21,12 @@ public class OnboardingEmployeePageInput : BasePageInput
|
||||
public long? CompanyId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 岗位 Id;为空时表示公司级配置。
|
||||
/// 入职业务部门 Id。
|
||||
/// </summary>
|
||||
public long? DepartmentId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 岗位 Id。
|
||||
/// </summary>
|
||||
public long? PositionId { get; set; }
|
||||
}
|
||||
|
||||
@@ -1,33 +1,61 @@
|
||||
namespace SimpleAdmin.Application;
|
||||
|
||||
/// <summary>仅展示审核通过后创建的正式员工档案;入职资料的来源任务可追溯。</summary>
|
||||
/// <summary>
|
||||
/// 实现正式员工档案查询业务能力。
|
||||
/// 实现正式员工档案查询业务能力,仅展示审核通过后创建的正式员工。
|
||||
/// </summary>
|
||||
public class OnboardingEmployeeService : IOnboardingEmployeeService
|
||||
{
|
||||
private readonly SqlSugarScope _db;
|
||||
public OnboardingEmployeeService() => _db = DbContext.DB;
|
||||
|
||||
public OnboardingEmployeeService()
|
||||
{
|
||||
_db = DbContext.DB;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 分页查询审核通过后生成的正式员工档案。
|
||||
/// </summary>
|
||||
public Task<SqlSugarPagedList<ObEmployee>> Page(OnboardingEmployeePageInput input) => _db.Queryable<ObEmployee>()
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.EmployeeName), x => x.EmployeeName.Contains(input.EmployeeName) || x.IdCardNumber.Contains(input.EmployeeName))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), x => x.Phone.Contains(input.Phone))
|
||||
.WhereIF(input.CompanyId.HasValue, x => x.CompanyId == input.CompanyId.Value)
|
||||
.WhereIF(input.PositionId.HasValue, x => x.PositionId == input.PositionId.Value)
|
||||
.OrderByDescending(x => x.CreateTime).ToPagedListAsync(input.PageNum, input.PageSize);
|
||||
public Task<SqlSugarPagedList<ObEmployee>> Page(OnboardingEmployeePageInput input)
|
||||
{
|
||||
return _db.Queryable<ObEmployee>()
|
||||
.WhereIF(
|
||||
!string.IsNullOrWhiteSpace(input.EmployeeName),
|
||||
item => item.EmployeeName.Contains(input.EmployeeName)
|
||||
|| item.IdCardNumber.Contains(input.EmployeeName))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), item => item.Phone.Contains(input.Phone))
|
||||
.WhereIF(input.CompanyId.HasValue, item => item.CompanyId == input.CompanyId.Value)
|
||||
.WhereIF(input.DepartmentId.HasValue, item => item.DepartmentId == input.DepartmentId.Value)
|
||||
.WhereIF(input.PositionId.HasValue, item => item.PositionId == input.PositionId.Value)
|
||||
.OrderByDescending(item => item.CreateTime)
|
||||
.ToPagedListAsync(input.PageNum, input.PageSize);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查询正式员工及其来源任务、合同和审核记录。
|
||||
/// </summary>
|
||||
public async Task<OnboardingEmployeeDetailOutput> Detail(BaseIdInput input)
|
||||
{
|
||||
var employee = await _db.Queryable<ObEmployee>().InSingleAsync(input.Id) ?? throw Oops.Bah("正式员工不存在");
|
||||
var employee = await _db.Queryable<ObEmployee>().InSingleAsync(input.Id)
|
||||
?? throw Oops.Bah("正式员工不存在");
|
||||
var task = await _db.Queryable<ObOnboardingTask>().FirstAsync(x => x.EmployeeId == employee.Id);
|
||||
var contracts = task == null ? new List<ObTaskContract>() : await _db.Queryable<ObTaskContract>().Where(x => x.TaskId == task.Id).ToListAsync();
|
||||
var audits = task == null ? new List<ObTaskAudit>() : await _db.Queryable<ObTaskAudit>().Where(x => x.TaskId == task.Id).OrderByDescending(x => x.AuditedAt).ToListAsync();
|
||||
return new OnboardingEmployeeDetailOutput { Employee = employee, Task = task, Contracts = contracts, Audits = audits };
|
||||
var contracts = task == null
|
||||
? new List<ObTaskContract>()
|
||||
: await _db.Queryable<ObTaskContract>()
|
||||
.Where(item => item.TaskId == task.Id)
|
||||
.ToListAsync();
|
||||
var audits = task == null
|
||||
? new List<ObTaskAudit>()
|
||||
: await _db.Queryable<ObTaskAudit>()
|
||||
.Where(item => item.TaskId == task.Id)
|
||||
.OrderByDescending(item => item.AuditedAt)
|
||||
.ToListAsync();
|
||||
|
||||
return new OnboardingEmployeeDetailOutput
|
||||
{
|
||||
Employee = employee,
|
||||
Task = task,
|
||||
Contracts = contracts,
|
||||
Audits = audits
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user