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

แก้ให้รับ LeaveTotal มาจาก Request แทนการคำนวน

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-01-23 09:40:56 +07:00
parent e86c9c5dc1
commit 293c238d84
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
View file

@ -142,11 +142,18 @@ namespace BMA.EHR.Leave.Service.Controllers
var sumHoliday = await _holidayRepository.GetHolidayCountAsync(req.LeaveStartDate, req.LeaveEndDate, category);
var sumWeekend = _holidayRepository.GetWeekEndCount(req.LeaveStartDate, req.LeaveEndDate, category);
var leaveTotal = 0.0;
if (req.LeaveRange != "ALL")
leaveTotal = 0.5;
else
leaveTotal = sumLeave - sumHoliday - sumWeekend;
// var leaveTotal = 0.0;
// if (req.LeaveRange != "ALL")
// leaveTotal = 0.5;
// else
// {
// switch (leaveType.Code.ToUpper().Trim())
// {
// case "LV-001":
// }
// leaveTotal = sumLeave - sumHoliday - sumWeekend;
// }
var leaveRequest = new LeaveRequest
{
@ -159,7 +166,7 @@ namespace BMA.EHR.Leave.Service.Controllers
LeaveAddress = req.LeaveAddress ?? "",
LeaveNumber = req.LeaveNumber ?? "",
//LeaveTotal = req.LeaveStartDate.DiffDay(req.LeaveEndDate),
LeaveTotal = leaveTotal,
LeaveTotal = req.LeaveTotal, // แก้ไขให้รับค่ามาจาก request แทน
LeaveSalaryText = req.LeaveSalaryText ?? "",
@ -362,11 +369,11 @@ namespace BMA.EHR.Leave.Service.Controllers
var sumHoliday = await _holidayRepository.GetHolidayCountAsync(req.LeaveStartDate, req.LeaveEndDate, category);
var sumWeekend = _holidayRepository.GetWeekEndCount(req.LeaveStartDate, req.LeaveEndDate, category);
var leaveTotal = 0.0;
if (req.LeaveRange != "ALL")
leaveTotal = 0.5;
else
leaveTotal = sumLeave - sumHoliday - sumWeekend;
// var leaveTotal = 0.0;
// if (req.LeaveRange != "ALL")
// leaveTotal = 0.5;
// else
// leaveTotal = sumLeave - sumHoliday - sumWeekend;
var leaveRequest = new LeaveRequest
{
@ -380,7 +387,7 @@ namespace BMA.EHR.Leave.Service.Controllers
LeaveAddress = req.LeaveAddress ?? "",
LeaveNumber = req.LeaveNumber ?? "",
//LeaveTotal = req.LeaveStartDate.DiffDay(req.LeaveEndDate),
LeaveTotal = leaveTotal,
LeaveTotal = req.LeaveTotal, // change to get value from request
LeaveSalaryText = req.LeaveSalaryText ?? "",

2
BMA.EHR.Leave.Service/DTOs/LeaveRequest/CreateLeaveRequestDto.cs
View file

@ -17,6 +17,8 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public string? LeaveRange { get; set; } = "ALL";
public double LeaveTotal { get; set; } = 0.0;
public string? LeaveAddress { get; set; }
public string? LeaveNumber { get; set; }