hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

add dna

Browse source
This commit is contained in:
kittapath 2025-02-05 17:48:58 +07:00
parent dbe6916782
commit 5ea175ca77
61 changed files with 66329 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

1118
BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
View file

File diff suppressed because it is too large Load diff

114
BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
View file

@ -776,40 +776,40 @@ namespace BMA.EHR.Application.Repositories.Reports
.Where(x => x.RequestInsignia.InsigniaType != null)
.Where(x => x.RequestInsignia.InsigniaType.Name == "เหรียญบำเหน็จในราชการ");
if (type == "officer")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType == "officer");
}
else if (type == "employee")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType == "employee");
}
if (type == "officer")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType == "officer");
}
else if (type == "employee")
{
data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType == "employee");
}
switch (node)
{
case 0:
data_insigniaQuery = data_insigniaQuery.Where(r => r.RootId == nodeId);
break;
switch (node)
{
case 0:
data_insigniaQuery = data_insigniaQuery.Where(r => r.RootDnaId == nodeId);
break;
case 1:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child1Id == nodeId);
break;
case 1:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child1DnaId == nodeId);
break;
case 2:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child2Id == nodeId);
break;
case 2:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child2DnaId == nodeId);
break;
case 3:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child3Id == nodeId);
break;
case 3:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child3DnaId == nodeId);
break;
case 4:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child4Id == nodeId);
break;
case 4:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child4DnaId == nodeId);
break;
default:
break;
}
default:
break;
}
var data = await data_insigniaQuery
.Select(x => new
{
@ -909,7 +909,7 @@ namespace BMA.EHR.Application.Repositories.Reports
&& r.Status == "PENDING"
&& r.RequestInsignia.InsigniaType != null
&& r.RequestInsignia.InsigniaType.Name != "เหรียญบำเหน็จในราชการ"
select new
select new
{
Male = r.Gender == "ชาย" ? 1 : 0,
Female = r.Gender == "หญิง" ? 1 : 0,
@ -920,7 +920,7 @@ namespace BMA.EHR.Application.Repositories.Reports
.Include(x => x.Request)
.ThenInclude(x => x.Period)
.Include(x => x.Request)
/*.ThenInclude(x => x.Organization)*/
/*.ThenInclude(x => x.Organization)*/
.Include(x => x.RequestInsignia)
.ThenInclude(x => x.InsigniaType)
.Where(r => r.Request.Period == period
@ -941,23 +941,23 @@ namespace BMA.EHR.Application.Repositories.Reports
switch (node)
{
case 0:
dataQuery = dataQuery.Where(r => r.RootId == nodeId);
dataQuery = dataQuery.Where(r => r.RootDnaId == nodeId);
break;
case 1:
dataQuery = dataQuery.Where(r => r.Child1Id == nodeId);
dataQuery = dataQuery.Where(r => r.Child1DnaId == nodeId);
break;
case 2:
dataQuery = dataQuery.Where(r => r.Child2Id == nodeId);
dataQuery = dataQuery.Where(r => r.Child2DnaId == nodeId);
break;
case 3:
dataQuery = dataQuery.Where(r => r.Child3Id == nodeId);
dataQuery = dataQuery.Where(r => r.Child3DnaId == nodeId);
break;
case 4:
dataQuery = dataQuery.Where(r => r.Child4Id == nodeId);
dataQuery = dataQuery.Where(r => r.Child4DnaId == nodeId);
break;
default:
@ -1069,7 +1069,7 @@ namespace BMA.EHR.Application.Repositories.Reports
.Where(x => x.IsApprove == true)
.Where(x => x.Status == "PENDING")
.Where(x => x.RequestInsignia.InsigniaType != null);
/*.Where(x => x.RequestInsignia.InsigniaType.Name == "เหรียญบำเหน็จในราชการ");*/
/*.Where(x => x.RequestInsignia.InsigniaType.Name == "เหรียญบำเหน็จในราชการ");*/
if (type == "officer")
{
@ -1083,23 +1083,23 @@ namespace BMA.EHR.Application.Repositories.Reports
switch (node)
{
case 0:
data_insigniaQuery = data_insigniaQuery.Where(r => r.RootId == nodeId);
data_insigniaQuery = data_insigniaQuery.Where(r => r.RootDnaId == nodeId);
break;
case 1:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child1Id == nodeId);
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child1DnaId == nodeId);
break;
case 2:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child2Id == nodeId);
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child2DnaId == nodeId);
break;
case 3:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child3Id == nodeId);
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child3DnaId == nodeId);
break;
case 4:
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child4Id == nodeId);
data_insigniaQuery = data_insigniaQuery.Where(r => r.Child4DnaId == nodeId);
break;
default:
@ -1145,22 +1145,22 @@ namespace BMA.EHR.Application.Repositories.Reports
}
}*/
var insignia = data.Select((r, index) => new
{
RowNo = (index + 1).ToNumericText().ToThaiNumber(),
FullName = r.FullName,
RequestInsigniaName = r.RequestInsigniaName,
ResultY1APR = "-",
ResultY1OCT = "-",
ResultY2APR = "-",
ResultY2OCT = "-",
ResultY3APR = "-",
ResultY3OCT = "-",
ResultY4APR = "-",
ResultY4OCT = "-",
ResultY5APR = "-",
ResultY5OCT = "-",
Remark = "",
}).ToList();
{
RowNo = (index + 1).ToNumericText().ToThaiNumber(),
FullName = r.FullName,
RequestInsigniaName = r.RequestInsigniaName,
ResultY1APR = "-",
ResultY1OCT = "-",
ResultY2APR = "-",
ResultY2OCT = "-",
ResultY3APR = "-",
ResultY3OCT = "-",
ResultY4APR = "-",
ResultY4OCT = "-",
ResultY5APR = "-",
ResultY5OCT = "-",
Remark = "",
}).ToList();
return insignia;
}

13
BMA.EHR.Application/Requests/InsigniaResultSet.cs
View file

@ -52,7 +52,20 @@ namespace BMA.EHR.Application.Requests
public double? Amount { get; set; }
public double? PositionSalaryAmount { get; set; }
public Guid? RootId { get; set; }
public Guid? RootDnaId { get; set; }
public string? Root { get; set; }
public Guid? Child1Id { get; set; }
public Guid? Child1DnaId { get; set; }
public string? Child1 { get; set; }
public Guid? Child2Id { get; set; }
public Guid? Child2DnaId { get; set; }
public string? Child2 { get; set; }
public Guid? Child3Id { get; set; }
public Guid? Child3DnaId { get; set; }
public string? Child3 { get; set; }
public Guid? Child4Id { get; set; }
public Guid? Child4DnaId { get; set; }
public string? Child4 { get; set; }
public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();
}

5
BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdDto.cs
View file

@ -54,6 +54,11 @@ namespace BMA.EHR.Application.Responses.Profiles
public Guid? Child2Id { get; set; }
public Guid? Child3Id { get; set; }
public Guid? Child4Id { get; set; }
public Guid? RootDnaId { get; set; }
public Guid? Child1DnaId { get; set; }
public Guid? Child2DnaId { get; set; }
public Guid? Child3DnaId { get; set; }
public Guid? Child4DnaId { get; set; }
public double? Amount { get; set; }
public double? PositionSalaryAmount { get; set; }
public string? Commander { get; set; }

13
BMA.EHR.Application/Responses/Profiles/GetProfileByRootIdDto.cs
View file

@ -49,6 +49,19 @@ namespace BMA.EHR.Application.Responses.Profiles
public double? Amount { get; set; }
public double? PositionSalaryAmount { get; set; }
public Guid? RootId { get; set; }
public Guid? RootDnaId { get; set; }
public string? Root { get; set; }
public Guid? Child1Id { get; set; }
public Guid? Child1DnaId { get; set; }
public string? Child1 { get; set; }
public Guid? Child2Id { get; set; }
public Guid? Child2DnaId { get; set; }
public string? Child2 { get; set; }
public Guid? Child3Id { get; set; }
public Guid? Child3DnaId { get; set; }
public string? Child3 { get; set; }
public Guid? Child4Id { get; set; }
public Guid? Child4DnaId { get; set; }
public string? Child4 { get; set; }
}
}