add messge leave in between
This commit is contained in:
parent
f70fbff8f0
commit
0c32520802
1 changed files with 3 additions and 4 deletions
|
|
@ -13,12 +13,11 @@ using BMA.EHR.Leave.Service.DTOs.LeaveRequest;
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Newtonsoft.Json.Linq;
|
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using Swashbuckle.AspNetCore.Annotations;
|
using Swashbuckle.AspNetCore.Annotations;
|
||||||
using System.Security.Claims;
|
|
||||||
using System.Net.Http.Headers;
|
using System.Net.Http.Headers;
|
||||||
using BMA.EHR.Domain.Models.MetaData;
|
using System.Security.Claims;
|
||||||
|
|
||||||
namespace BMA.EHR.Leave.Service.Controllers
|
namespace BMA.EHR.Leave.Service.Controllers
|
||||||
{
|
{
|
||||||
|
|
@ -987,7 +986,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
SumDateWork = sumWorkDay,
|
SumDateWork = sumWorkDay,
|
||||||
TotalDate = totalDay,
|
TotalDate = totalDay,
|
||||||
SumDateHoliday = sumWeekend,
|
SumDateHoliday = sumWeekend,
|
||||||
Message = message,
|
Message = !isBetween ? message : "ไม่สามารถทำการลาได้ เนื่องจากมีวันลาในช่วงที่เคยทำการขอลาไปแล้ว",
|
||||||
};
|
};
|
||||||
|
|
||||||
return Success(result);
|
return Success(result);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue