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

เพิ่มฟิลด์สถานภาพ
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
Bright 2024-12-27 10:57:52 +07:00
parent 8566987275
commit ad70e8164c
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
View file

@ -259,6 +259,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
Oc = x.Oc, Oc = x.Oc,
Position = x.Position, Position = x.Position,
LastUpdatedAt = x.LastUpdatedAt, LastUpdatedAt = x.LastUpdatedAt,
profileType = x.profileType,
HistoryStatus = x.DisciplineComplaint_Appeal_Historys.Select(p => new HistoryStatus = x.DisciplineComplaint_Appeal_Historys.Select(p => new
{ {
Status = p.Status, Status = p.Status,
@ -298,6 +299,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
_data.Oc, _data.Oc,
_data.Position, _data.Position,
_data.LastUpdatedAt, _data.LastUpdatedAt,
_data.profileType,
_data.HistoryStatus, _data.HistoryStatus,
disciplineComplaint_Appeal_Docs, disciplineComplaint_Appeal_Docs,
}; };
@ -432,6 +434,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
ProfileId = req.ProfileId, ProfileId = req.ProfileId,
Position = req.Position, Position = req.Position,
Oc = req.Oc, Oc = req.Oc,
profileType = req.profileType,
CreatedFullName = FullName ?? "System Administrator", CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "", CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,
@ -631,8 +634,10 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
CitizenId = x.CitizenId, CitizenId = x.CitizenId,
ProfileId = x.ProfileId, ProfileId = x.ProfileId,
LastUpdatedAt = x.LastUpdatedAt, LastUpdatedAt = x.LastUpdatedAt,
profileType = x.profileType
}) })
.OrderByDescending(x => x.LastUpdatedAt) .OrderByDescending(x => x.profileType)
.ThenByDescending(x => x.LastUpdatedAt)
.Skip((page - 1) * pageSize) .Skip((page - 1) * pageSize)
.Take(pageSize) .Take(pageSize)
.ToList(); .ToList();

1
BMA.EHR.Discipline.Service/Requests/DisciplineComplaint_AppealRequest.cs
View file

@ -15,6 +15,7 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? Fullname { get; set; } public string? Fullname { get; set; }
public string? Position { get; set; } public string? Position { get; set; }
public string? Oc { get; set; } public string? Oc { get; set; }
public string? profileType { get; set; }
public List<FormFile>? File { get; set; } public List<FormFile>? File { get; set; }
} }
} }