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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-10-05 11:15:05 +07:00
commit 5cf4a7ae2e
6 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -573,7 +573,8 @@ namespace BMA.EHR.Application.Repositories.Commands
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PlacementCommandIssuer = r.Command.PlacementCommandIssuer,
PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(),
PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber()
PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
Subject = $"เรื่อง {r.Command.CommandSubject}",
})
.ToListAsync();
if (raw_data == null)
@ -608,7 +609,8 @@ namespace BMA.EHR.Application.Repositories.Commands
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PlacementCommandIssuer = r.Command.PlacementCommandIssuer,
PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(),
PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber()
PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
Subject = $"เรื่อง {r.Command.CommandSubject}",
})
.ToListAsync();
if (raw_data == null)
@ -898,7 +900,8 @@ namespace BMA.EHR.Application.Repositories.Commands
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber()
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber(),
Subject = $"เรื่อง {r.Command.CommandSubject}",
})
.ToList();
@ -952,7 +955,8 @@ namespace BMA.EHR.Application.Repositories.Commands
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber()
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber(),
Subject = $"เรื่อง {r.Command.CommandSubject}",
})
.ToList();

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

@ -6695,9 +6695,9 @@ namespace BMA.EHR.Application.Repositories.Commands
Double MonthSalaryAmount = 0;
if (profile != null && profile.Salaries.Count() > 0)
{
SalaryAmount = placementProfile.Amount == null || placementProfile.Amount == 0 ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value : 0;
PositionSalaryAmount = placementProfile.PositionSalaryAmount == null || placementProfile.PositionSalaryAmount == 0 ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount.Value : 0;
MonthSalaryAmount = placementProfile.MouthSalaryAmount == null || placementProfile.MouthSalaryAmount == 0 ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().MouthSalaryAmount.Value : 0;
SalaryAmount = placementProfile.Amount == null || placementProfile.Amount == 0 ? (profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount != null ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value : 0) : 0;
PositionSalaryAmount = placementProfile.PositionSalaryAmount == null || placementProfile.PositionSalaryAmount == 0 ? (profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount != null ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount.Value : 0) : 0;
MonthSalaryAmount = placementProfile.MouthSalaryAmount == null || placementProfile.MouthSalaryAmount == 0 ? (profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().MouthSalaryAmount != null ? profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().MouthSalaryAmount.Value : 0) : 0;
}
return new PlacementSalaryResponse

1
BMA.EHR.Application/Responses/Reports/CommandType11Response.cs
View file

@ -23,5 +23,6 @@
public string PlacementCommandNo { get; set; } = string.Empty;
public string PlacementCommandDate { get; set; } = string.Empty;
public string Subject { get; set; } = string.Empty;
}
}

1
BMA.EHR.Application/Responses/Reports/CommandType18Response.cs
View file

@ -39,5 +39,6 @@
public string ConclusionFireDate { get; set; } = string.Empty;
public string ConclusionFireResolution { get; set; } = string.Empty;
public string Subject { get; set; } = string.Empty;
}
}

6
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
View file

@ -522,8 +522,8 @@ namespace BMA.EHR.Placement.Service.Controllers
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpPut("report/{commandTypeId:length(36)}")]
public async Task<ActionResult<ResponseObject>> PostToReport([FromBody] PlacementProfileRequest req, Guid commandTypeId)
[HttpPost("report")]
public async Task<ActionResult<ResponseObject>> PostToReport([FromBody] PlacementProfileRequest req)
{
foreach (var item in req.Id)
{
@ -533,7 +533,7 @@ namespace BMA.EHR.Placement.Service.Controllers
if (uppdated == null)
continue;
uppdated.CommandType = await _context.CommandTypes.FindAsync(commandTypeId);
// uppdated.CommandType = await _context.CommandTypes.FindAsync(commandTypeId);
uppdated.Status = "REPORT";
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
uppdated.LastUpdateUserId = UserId ?? "";

6
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -310,6 +310,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
if (!req.Type.Trim().ToUpper().Contains("EMPLOYEE") && !req.Type.Trim().ToUpper().Contains("OFFICER"))
return Error("ประเภทพ้นราชการไม่ถูกต้อง");
if (req.Year == 0)
{
req.Year = DateTime.Now.Year;
if (req.Year > 2500)
req.Year = req.Year - 543;
}
var round = 1;
var retire = await _context.RetirementPeriods