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

วินัยกำหนดให้ฟิวว่างได้ รายละเอียด

Browse source
This commit is contained in:
Kittapath 2024-01-11 09:25:42 +07:00
parent 2f733cd2a6
commit 4369c35f93
23 changed files with 9215 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -75,8 +75,10 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
DisciplinaryCaseFault = x.DisciplinaryCaseFault,//กรณีความผิด
Status = x.Status,//สถานะหรือผลการสอบสวน
CreatedAt = x.CreatedAt,//วันที่สร้างเรื่องสอบสวน
DisciplinaryDateStart = x.DisciplinaryDateStart,//
DisciplinaryDateEnd = x.DisciplinaryDateEnd,//
})
.OrderByDescending(x => x.CreatedAt)
.OrderByDescending(x => x.DisciplinaryDateStart)
.Skip((page - 1) * pageSize)
.Take(pageSize)
.ToList();
@ -632,7 +634,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
Name = sumExtend > 0 ? "ขยายครั้งที่" + sumExtend : "วันที่สอบสวน",
Num = sumExtend,
DaysExtend = data.DisciplinaryDaysExtend,
DateStart = sumExtend > 0 ? data.DisciplinaryDateEnd.Value.AddDays(data.DisciplinaryDaysExtend == null ? 0 : -(double)data.DisciplinaryDaysExtend) : data.DisciplinaryDateStart,
DateStart = sumExtend > 0 && data.DisciplinaryDateEnd != null ? data.DisciplinaryDateEnd.Value.AddDays(data.DisciplinaryDaysExtend == null ? 0 : -(double)data.DisciplinaryDaysExtend + 1) : data.DisciplinaryDateStart,
DateEnd = data.DisciplinaryDateEnd,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",