yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 移除无用字段

Browse Source
This commit is contained in:
liguoyang
2024-02-22 16:02:19 +08:00
parent 82f942ed13
commit f4acba8c6b
9 changed files with 44 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
View File

@@ -155,57 +155,5 @@ public class GainfosController : ControllerBase
{
return await _gainfoService.GetGainfoDetailTaskAsync(request);
}
/// <summary>
/// 获取近七天入职人数及列表
/// </summary>
/// <returns></returns>
[HttpGet("weeknumber")]
public async Task<Dictionary<string, Pagination<GainfoDetailResponse>>> GetWeekNumberAsync([FromQuery] WeekNumberRequest request)
{
// 从请求头中获取 Token
string token = HttpContext.Request.Headers["Authorization"].ToString().Replace("Bearer ", "");
return await _gainfoService.GetWeekNumberAsync(request,token);
}
/// <summary>
/// 获取近七天离职人数及列表
/// </summary>
/// <returns></returns>
[HttpGet("weeknumberdimission")]
public async Task<Dictionary<string, Pagination<GainfoDetailResponse>>> GetDimissionWeekNumberAsync([FromQuery] WeekNumberRequest request)
{
// 从请求头中获取 Token
string token = HttpContext.Request.Headers["Authorization"].ToString().Replace("Bearer ", "");
return await _gainfoService.GetDimissionWeekNumberAsync(request,token);
}
/// <summary>
/// 获取基地在职、离职、考勤数
/// </summary>
/// <returns></returns>
[HttpGet("gainfonumbers")]
public async Task<GainfoGainfoNumbersResponse> GetGainfoNumbersAsync()
{
// 从请求头中获取 Token
string token = HttpContext.Request.Headers["Authorization"].ToString().Replace("Bearer ", "");
return await _gainfoService.GetGainfoNumbersAsync(token);
}
/// <summary>
/// 获取本基地管理员列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("administrator")]
public async Task<Pagination<GainfoDetailResponse>> GetAdministratorAsync([FromQuery] WeekNumberRequest request)
{
// 从请求头中获取 Token
string token = HttpContext.Request.Headers["Authorization"].ToString().Replace("Bearer ", "");
return await _gainfoService.GetAdministratorAsync(request,token);
}
}

5
Src/Dlhis.Basic/Organization/Request/GainfoSaveRequest.cs
View File

@@ -110,11 +110,6 @@ public class GainfoSaveRequest : IValidatableObject
/// </summary>
public string Werks { get; set; }
/// <summary>
/// 在职状态
/// </summary>
public string Employed { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (GainfoStatus.HasValue && GainfoStatus == GainfoStatusEnumType.Leave)

5
Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
View File

@@ -105,10 +105,5 @@ namespace Dlhis.Basic.Organization.Response
/// 民族代码
/// </summary>
public string NationName { get; set; }
/// <summary>
/// 是否在职
/// </summary>
public bool IsActive { get; set; }
}
}

13
Src/Dlhis.Basic/Organization/Response/GainfoListResponse.cs
View File

@@ -1,9 +1,7 @@
using Dlhis.Entity.Basic.Enums;
using SqlSugar;
using SqlSugar.DbConvert;
namespace Dlhis.Basic.Organization.Response
{
namespace Dlhis.Basic.Organization.Response;
public class GainfoListResponse
{
/// <summary>
@@ -50,11 +48,4 @@ namespace Dlhis.Basic.Organization.Response
/// 身份证地址
/// </summary>
public string Address { get; set; }
/// <summary>
/// 在职状态
/// </summary>
public string Employed { get; set; }
}
}

5
Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs
View File

@@ -112,9 +112,4 @@ public class GainfoPageResponse
/// 人事范围
/// </summary>
public string Werks { get; set; }
/// <summary>
/// 在职状态
/// </summary>
public string Employed { get; set; }
}

8
Src/Dlhis.Basic/Organization/Services/IGainfoService.cs
View File

@@ -31,12 +31,4 @@ public interface IGainfoService : IScopeDependency
Task<Pagination<GainfoListResponse>> GetGainfoListTaskAsync(GainfoListRequest request);
Task<GainfoDetailResponse> GetGainfoDetailTaskAsync(GainfoDetailRequest request);
Task<Dictionary<string, Pagination<GainfoDetailResponse>>> GetWeekNumberAsync(WeekNumberRequest request, string token);
Task<Dictionary<string, Pagination<GainfoDetailResponse>>> GetDimissionWeekNumberAsync([FromQuery] WeekNumberRequest request, string token);
Task<GainfoGainfoNumbersResponse> GetGainfoNumbersAsync(string token);
Task<Pagination<GainfoDetailResponse>> GetAdministratorAsync(WeekNumberRequest request,string token);
}

48
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -333,10 +333,10 @@ public class GainfoService : IGainfoService
DepartmentNo = de.No,
DepartmentName = de.Name,
Address = ga.Address,
Employed = ga.Employed
}).ToPageListAsync(request);
return page;
}
/// <summary>
/// 档案详情
/// </summary>
@@ -373,8 +373,8 @@ public class GainfoService : IGainfoService
Marital = ga.Marital,
CountryName = type2.Display,
NationName = type3.Display,
IsActive = ga.Employed == "Active" ? true : false,
}).FirstAsync();
return info;
}
@@ -425,11 +425,8 @@ public class GainfoService : IGainfoService
Marital = ga.Marital,
CountryName = type2.Display,
NationName = type3.Display,
IsActive = ga.Employed == "Active" ? true : false,
}).ToPageListAsync(request);
//var infos = await _gainfoStore.Queryable(GainfoStatusEnumType.Working)
// .Where(ga => ga.CreateTime.ToString("yyyy-MM-dd") == time)
// .ToPageListAsync(request);
dic[time] = infos;
}
return dic;
@@ -481,7 +478,6 @@ public class GainfoService : IGainfoService
Marital = ga.Marital,
CountryName = type2.Display,
NationName = type3.Display,
IsActive = ga.Employed == "Active" ? true : false,
}).ToPageListAsync(request);
dic[time] = infos;
}
@@ -514,44 +510,6 @@ public class GainfoService : IGainfoService
return res;
}
public async Task<Pagination<GainfoDetailResponse>> GetAdministratorAsync( WeekNumberRequest request, string token)
{
var werks = GetClaimValueFromToken(token, "tenant");
var info = await _gainfoStore.Queryable(GainfoStatusEnumType.Working)
.LeftJoin<DepartmentEntity>((ga, de) => ga.DepartmentNo == de.No)
.LeftJoin<BasicTypeEntity>((ga, de, type) => ga.Native == type.Code && type.Type == "native")
.LeftJoin<PositionEntity>((ga, de, type, posi) => ga.Position == posi.Name)
.LeftJoin<BasicTypeEntity>((ga, de, type, posi, type2) => ga.CountryNo == type2.Code && type2.Type == "country")
.LeftJoin<BasicTypeEntity>((ga, de, type, posi, type2, type3) => ga.Nation == type3.Code && type3.Type == "nation")
.Where(ga => ga.Werks == werks && ga.IdentityUserId != 0)
.Select((ga, de, type, posi, type2, type3) => new GainfoDetailResponse
{
No = ga.No,
SapNo = ga.SapNo,
Name = ga.Name,
Code = ga.Code,
DepartmentName = de.Name,
IdClass = ga.IdClass,
IdNo = ga.IdNo,
Gender = ga.Gender,
NativeName = type.Display,
Address = ga.Address,
Birthday = ga.Birthday,
Phone = ga.Phone,
Position = ga.Position,
Grade = posi.Grade,
Degree = ga.Degree,
Werks = ga.Werks,
CostId = ga.CostId,
Marital = ga.Marital,
CountryName = type2.Display,
NationName = type3.Display,
IsActive = ga.Employed == "Active" ? true : false,
}).ToPageListAsync(request);
return info;
}
//-------------------------------------------help methods ------------------------------------------------
/// <summary>

3
Src/Dlhis.Basic/Packs/SqlSugarPack.cs
View File

@@ -1,5 +1,4 @@
using Dlhis.Entity.Basic.Entity;
using Kurisu.AspNetCore;
using Kurisu.AspNetCore;
using Kurisu.AspNetCore.Startup;
using Kurisu.SqlSugar.Extensions;
using SqlSugar;

6
Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
View File

@@ -148,12 +148,6 @@ public class GainfoEntity : SugarBaseEntity
/// </summary>
public string CostId { get; set; }
/// <summary>
/// 在职状态
/// </summary>
[SugarColumn(ColumnDescription = "在职状态")]
public string Employed { get; set; }
/// <summary>
/// 身份认证用户Id
/// </summary>