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

แก้ไข

Browse source 
- format response
- ส่ง noti โดยมีการแนบลิงค์
This commit is contained in:
Suphonchai Phoonsawat 2025-04-24 10:59:31 +07:00
parent 19c30e69df
commit 92847e6be2
6 changed files with 211 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
View file

@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OfficeOpenXml.ConditionalFormatting;
using Swashbuckle.AspNetCore.Annotations;
using System.Security.Claims;
@ -102,15 +103,40 @@ namespace BMA.EHR.Leave.Service.Controllers
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
var result = await _leaveBeginningRepository.GetAllByYearAsync(req.Year);
var resData = await _leaveBeginningRepository.GetAllByYearAsync(req.Year);
if (req.Type != Guid.Empty)
result = result.Where(x => x.LeaveTypeId == req.Type).ToList();
resData = resData.Where(x => x.LeaveTypeId == req.Type).ToList();
if (req.Keyword != "")
result = result.Where(x => x.FirstName!.Contains(req.Keyword) || x.LastName!.Contains(req.Keyword)).ToList();
resData = resData.Where(x => x.FirstName!.Contains(req.Keyword) || x.LastName!.Contains(req.Keyword)).ToList();
var result = new List<object>();
foreach (var item in resData)
{
result.Add(new
{
item.Id,
item.ProfileId,
item.Prefix,
item.FirstName,
item.LastName,
item.LeaveTypeId,
LeaveTypeCode = item.LeaveType?.Code,
LeaveType = item.LeaveType?.Name,
item.LeaveYear,
item.LeaveDays,
item.LeaveDaysUsed,
item.CreatedAt,
item.CreatedFullName,
item.LastUpdatedAt,
item.LastUpdateFullName
});
}
var pageResult = result.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
return Success(new { data = pageResult, total = result.Count });
}
catch (Exception ex)
@ -212,9 +238,9 @@ namespace BMA.EHR.Leave.Service.Controllers
var profile = await _userProfileRepository.GetProfileByProfileIdAsync(req.ProfileId, AccessToken);
if(profile == null)
if (profile == null)
{
return Error("ไม่พบข้อมูลข้าราชการหรือลูกจ้าง", StatusCodes.Status404NotFound);
return Error("ไม่พบข้อมูลข้าราชการหรือลูกจ้าง", StatusCodes.Status404NotFound);
}
leaveBeginning.LeaveTypeId = req.LeaveTypeId;
@ -288,7 +314,7 @@ namespace BMA.EHR.Leave.Service.Controllers
return Success();
}
catch(Exception ex)
catch (Exception ex)
{
return Error(ex);
}