From 293c238d8499ae0d688897e42346fac27f523861 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 23 Jan 2024 09:40:56 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=83=E0=B8=AB?= =?UTF-8?q?=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A=20=20LeaveTotal=20?= =?UTF-8?q?=E0=B8=A1=E0=B8=B2=E0=B8=88=E0=B8=B2=E0=B8=81=20Request=20?= =?UTF-8?q?=E0=B9=81=E0=B8=97=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LeaveRequestController.cs | 31 ++++++++++++------- .../LeaveRequest/CreateLeaveRequestDto.cs | 2 ++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs index ad46b175..30cbdc8a 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs @@ -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 ?? "", diff --git a/BMA.EHR.Leave.Service/DTOs/LeaveRequest/CreateLeaveRequestDto.cs b/BMA.EHR.Leave.Service/DTOs/LeaveRequest/CreateLeaveRequestDto.cs index a1bc2a56..aa7d390c 100644 --- a/BMA.EHR.Leave.Service/DTOs/LeaveRequest/CreateLeaveRequestDto.cs +++ b/BMA.EHR.Leave.Service/DTOs/LeaveRequest/CreateLeaveRequestDto.cs @@ -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; }