From ae513bbbd57b54b2dc581699f77d4a2ab1211f68 Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 17 Jan 2025 14:20:44 +0700 Subject: [PATCH] test retire --- .../Controllers/RetirementResignController.cs | 28 ++++--------------- .../RetirementResignEmployeeController.cs | 28 ++++--------------- 2 files changed, 12 insertions(+), 44 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index d917c6fc..30e8c04f 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -877,44 +877,28 @@ namespace BMA.EHR.Retirement.Service.Controllers [HttpPost()] public async Task> Post([FromForm] RetirementResignRequest req) { - // var profile = await _context.Profiles - // .Include(x => x.PositionLevel) - // .Include(x => x.PositionType) - // .Include(x => x.PosNo) - // .Include(x => x.Salaries) - // .Include(x => x.Position) - // .Include(x => x.Prefix) - // .FirstOrDefaultAsync(x => x.KeycloakId == Guid.Parse(UserId)); - // if (profile == null) - // return Error(GlobalMessages.DataNotFound, 404); - var Remark = req.Remark; if (req.Reason != null) { switch (req.Reason.Trim().ToLower()) { - case "CAREER": Remark = $"ประกอบอาชีพอื่น ({req.Remark})"; break; - case "MOVE": Remark = $"รับราชการสังกัดอื่น ({req.Remark})"; break; - case "FAMILY": Remark = $"ดูแลบิดามารดา ({req.Remark})"; break; - case "EDUCATION": Remark = $"ศึกษาต่อ ({req.Remark})"; break; - case "OTHER": Remark = $"อื่น ๆ ({req.Remark})"; break; + case "CAREER": Remark = $"ประกอบอาชีพอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + case "MOVE": Remark = $"รับราชการสังกัดอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + case "FAMILY": Remark = $"ดูแลบิดามารดา" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + case "EDUCATION": Remark = $"ศึกษาต่อ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + case "OTHER": Remark = $"อื่น ๆ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + default: Remark = req.Reason.Trim().ToLower(); break; } } var retirementResign = new RetirementResign { - // Profile = profile, Location = req.Location, SendDate = DateTime.Now, ActiveDate = req.ActiveDate, Reason = req.Reason, ReasonResign = Remark, Remark = req.Remark, - // AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount, - // PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name, - // PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name, - // PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, - // OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", IsActive = true, CreatedFullName = FullName ?? "System Administrator", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 27b4cc93..e14161cb 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -820,43 +820,27 @@ namespace BMA.EHR.Retirement.Service.Controllers [HttpPost()] public async Task> Post([FromForm] RetirementResignEmployeeRequest req) { - // var profile = await _context.Profiles - // .Include(x => x.PositionLevel) - // .Include(x => x.PositionType) - // .Include(x => x.PosNo) - // .Include(x => x.Salaries) - // .Include(x => x.Position) - // .Include(x => x.Prefix) - // .FirstOrDefaultAsync(x => x.KeycloakId == Guid.Parse(UserId)); - // if (profile == null) - // return Error(GlobalMessages.DataNotFound, 404); - var Remark = req.Remark; if (req.Reason != null) { switch (req.Reason.Trim().ToLower()) { - case "CAREER": Remark = $"ประกอบอาชีพอื่น ({req.Remark})"; break; - case "MOVE": Remark = $"รับราชการสังกัดอื่น ({req.Remark})"; break; - case "FAMILY": Remark = $"ดูแลบิดามารดา ({req.Remark})"; break; - case "EDUCATION": Remark = $"ศึกษาต่อ ({req.Remark})"; break; - case "OTHER": Remark = $"อื่น ๆ ({req.Remark})"; break; + case "CAREER": Remark = $"ประกอบอาชีพอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + case "MOVE": Remark = $"รับราชการสังกัดอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + case "FAMILY": Remark = $"ดูแลบิดามารดา" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + case "EDUCATION": Remark = $"ศึกษาต่อ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + case "OTHER": Remark = $"อื่น ๆ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; + default: Remark = "test"; break; } } var retirementResignEmployee = new RetirementResignEmployee { - // Profile = profile, Location = req.Location, SendDate = DateTime.Now, ActiveDate = req.ActiveDate, Reason = req.Reason, ReasonResign = Remark, Remark = req.Remark, - // AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount, - // PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name, - // PositionTypeOld = profile.PositionType == null ? null : profile.PositionType.Name, - // PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, - // OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", IsActive = true, CreatedFullName = FullName ?? "System Administrator",