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

insignia report 4
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
kittapath 2025-02-13 18:24:24 +07:00
parent 764a27fbd5
commit ea34087f11
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1588,11 +1588,18 @@ namespace BMA.EHR.Application.Repositories.Reports
var data = await data_insigniaQuery.Select(x => new var data = await data_insigniaQuery.Select(x => new
{ {
CitizenId = x.CitizenId, CitizenId = x.CitizenId,
Prefix = x.Prefix,
FullName = $"{x.Prefix}{x.FirstName} {x.LastName}", FullName = $"{x.Prefix}{x.FirstName} {x.LastName}",
PosTypeName = x.PosTypeName, PosTypeName = x.PosTypeName,
PosLevelName = x.PosLevelName, PosLevelName = x.PosLevelName,
Position = x.Position, Position = x.Position,
Root = x.Root Root = x.Root,
OrganizationOrganizationReceive = x.OrganizationOrganizationReceive,
OrganizationOrganizationSend = x.OrganizationOrganizationSend,
IsApprove = x.IsApprove == true ? "ได้รับ" : "ไม่ได้รับ",
RequestInsignia = x.RequestInsignia.Name,
Number = x.Number,
DatePayment = x.DatePayment,
}).ToListAsync(); }).ToListAsync();
return data; return data;

14
BMA.EHR.Insignia/Controllers/InsigniaReportController.cs
View file

@ -331,24 +331,34 @@ namespace BMA.EHR.Insignia.Service.Controllers
try try
{ {
var insignalPeriod = await _repository.GetKhr4TotalReport(req.roundId, type, req.node, req.nodeId); var insignalPeriod = await _repository.GetKhr4TotalReport(req.roundId, type, req.node, req.nodeId);
var nameNote = await _repository.GetNameInsigniaNote(req.roundId); var year = await _repository.GetYearInsigniaNote(req.roundId);
var detailList = new List<dynamic>(); var detailList = new List<dynamic>();
var row = 1; var row = 1;
var org = ""; var org = "";
var number = "";
var citizenId = "0"; var citizenId = "0";
foreach (var _data in insignalPeriod) foreach (var _data in insignalPeriod)
{ {
citizenId = _data.GetType().GetProperty("CitizenId").GetValue(_data); citizenId = _data.GetType().GetProperty("CitizenId").GetValue(_data);
org = _data.GetType().GetProperty("Root").GetValue(_data); org = _data.GetType().GetProperty("Root").GetValue(_data);
number = _data.GetType().GetProperty("Number").GetValue(_data);
var datePayment = _data.GetType().GetProperty("DatePayment").GetValue(_data);
detailList.Add(new detailList.Add(new
{ {
row = row.ToString().ToThaiNumber(), row = row.ToString().ToThaiNumber(),
citizenId = citizenId.ToString().ToThaiNumber(), citizenId = citizenId.ToString().ToThaiNumber(),
prefix = _data.GetType().GetProperty("Prefix").GetValue(_data),
fullName = _data.GetType().GetProperty("FullName").GetValue(_data), fullName = _data.GetType().GetProperty("FullName").GetValue(_data),
posTypeName = _data.GetType().GetProperty("PosTypeName").GetValue(_data), posTypeName = _data.GetType().GetProperty("PosTypeName").GetValue(_data),
posLevelName = _data.GetType().GetProperty("PosLevelName").GetValue(_data), posLevelName = _data.GetType().GetProperty("PosLevelName").GetValue(_data),
position = _data.GetType().GetProperty("Position").GetValue(_data), position = _data.GetType().GetProperty("Position").GetValue(_data),
root = _data.GetType().GetProperty("Root").GetValue(_data), root = _data.GetType().GetProperty("Root").GetValue(_data),
organizationOrganizationReceive = _data.GetType().GetProperty("OrganizationOrganizationReceive").GetValue(_data),
organizationOrganizationSend = _data.GetType().GetProperty("OrganizationOrganizationSend").GetValue(_data),
isApprove = _data.GetType().GetProperty("IsApprove").GetValue(_data),
requestInsignia = _data.GetType().GetProperty("RequestInsignia").GetValue(_data),
number = number == null ? "" : number.ToString().ToThaiNumber(),
datePayment = datePayment == null ? "" : datePayment.ToThaiShortDate().ToThaiNumber(),
}); });
row = row + 1; row = row + 1;
} }
@ -362,7 +372,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
{ {
profileType = type == "employee" ? "ลูกจ้างประจำ" : "ข้าราชการสามัญกรุงเทพมหานคร", profileType = type == "employee" ? "ลูกจ้างประจำ" : "ข้าราชการสามัญกรุงเทพมหานคร",
org = org, org = org,
name = nameNote, year = year,
date = date, date = date,
data = detailList, data = detailList,
} }