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

report 1-4 เำิม่หมายเหตุแนวนอน

Browse source
This commit is contained in:
Kittapath 2023-10-08 12:41:53 +07:00
parent 5530c2f9e4
commit 2da120f958
32 changed files with 51300 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
View file

@ -846,7 +846,8 @@ namespace BMA.EHR.Application.Repositories.Commands
ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Remark = p.Reason ?? ""
Remark = p.Reason ?? "",
RemarkHorizontal = p.RemarkHorizontal,
})
.ToList();

5
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -6705,6 +6705,8 @@ namespace BMA.EHR.Application.Repositories.Commands
SalaryAmount = placementProfile.Amount != null && placementProfile.Amount != 0 ? placementProfile.Amount.Value : SalaryAmount,
PositionSalaryAmount = placementProfile.PositionSalaryAmount != null && placementProfile.PositionSalaryAmount != 0 ? placementProfile.PositionSalaryAmount.Value : PositionSalaryAmount,
MonthSalaryAmount = placementProfile.MouthSalaryAmount != null && placementProfile.MouthSalaryAmount != 0 ? placementProfile.MouthSalaryAmount.Value : MonthSalaryAmount,
RemarkVertical = placementProfile.RemarkVertical == null ? "โดยมีเงื่อนไขว่าต้องปฏิบัติงานให้กรุงเทพมหานครเป็นระยะเวลาไม่น้อยกว่า ๕ ปี นับแต่วันที่ได้รับการบรรจุและแต่งตั้ง โดยห้ามโอนไปหน่วยงานหรือส่วนราชการอื่น เว้นเเต่ลาออกจากราชการ" : placementProfile.RemarkVertical,
RemarkHorizontal = placementProfile.RemarkHorizontal,
};
}
@ -6756,6 +6758,9 @@ namespace BMA.EHR.Application.Repositories.Commands
placementProfile.PositionSalaryAmount = req.PositionSalaryAmount;
placementProfile.MouthSalaryAmount = req.MonthSalaryAmount;
placementProfile.RemarkVertical = req.RemarkVertical;
placementProfile.RemarkHorizontal = req.RemarkHorizontal;
await _dbContext.SaveChangesAsync();
}
catch