From 5604d7076e4a6460a13f2acb5f736dd6dfca60c8 Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 9 Jan 2025 11:50:36 +0700 Subject: [PATCH] no message --- .../Controllers/DisciplineResultController.cs | 48 ++++++++++++++----- .../Requests/ReportExecuteRequest.cs | 2 + .../PlacementAppointmentController.cs | 10 ++++ .../Controllers/PlacementController.cs | 14 +++++- .../Controllers/PlacementOfficerController.cs | 5 +- .../Controllers/PlacementReceiveController.cs | 4 +- .../PlacementRepatriationController.cs | 2 + .../PlacementTransferController.cs | 5 +- .../Requests/ReportExecuteRequest.cs | 2 + .../Controllers/RetirementOtherController.cs | 6 ++- .../Controllers/RetirementOutController.cs | 4 +- .../Controllers/RetirementResignController.cs | 4 ++ .../RetirementResignEmployeeController.cs | 4 ++ .../Requests/ReportExecuteRequest.cs | 2 + 14 files changed, 92 insertions(+), 20 deletions(-) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 9662aa45..22f8335e 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -824,6 +824,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers mouthSalaryAmount = r.mouthSalaryAmount, isGovernment = false, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -922,6 +924,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers mouthSalaryAmount = r.mouthSalaryAmount, isGovernment = false, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1021,17 +1025,17 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers .ToListAsync(); var report_data = (from p in data - join r in req.refIds - on p.Id.ToString() equals r.refId - select new - { - fullName = $"{r.Prefix}{r.FirstName} {r.LastName}", - positionname = p.Position, - positionno = p.PosNo, - organizationname = p.Organization, - salary = r.Amount, - RemarkHorizontal = r.RemarkHorizontal - }).ToList(); + join r in req.refIds + on p.Id.ToString() equals r.refId + select new + { + fullName = $"{r.Prefix}{r.FirstName} {r.LastName}", + positionname = p.Position, + positionno = p.PosNo, + organizationname = p.Organization, + salary = r.Amount, + RemarkHorizontal = r.RemarkHorizontal + }).ToList(); var result = new List(); @@ -1039,8 +1043,10 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { - result.Add(new { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { + result.Add(new + { fullName = _null, positionname = r.RemarkHorizontal, positionno = _null, @@ -1095,6 +1101,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers mouthSalaryAmount = r.mouthSalaryAmount, isGovernment = false, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1209,6 +1217,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers mouthSalaryAmount = r.mouthSalaryAmount, isGovernment = false, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1321,6 +1331,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1433,6 +1445,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1545,6 +1559,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1657,6 +1673,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1769,6 +1787,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1897,6 +1917,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, profileType = p.profileType, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-leave-discipline"; diff --git a/BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs b/BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs index 2c685ac6..5ed2cb4a 100644 --- a/BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs +++ b/BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs @@ -18,5 +18,7 @@ namespace BMA.EHR.Discipline.Service.Requests public double? amount { get; set; } public double? positionSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; } + public string? refCommandCode { get; set; } + public string? refCommandName { get; set; } } } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 610b0e7f..51bec560 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -919,6 +919,8 @@ namespace BMA.EHR.Placement.Service.Controllers templateDoc = r.templateDoc, posmasterId = p.posmasterId, positionId = p.positionId, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1132,6 +1134,8 @@ namespace BMA.EHR.Placement.Service.Controllers templateDoc = r.templateDoc, posmasterId = p.posmasterId, positionId = p.positionId, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1333,6 +1337,8 @@ namespace BMA.EHR.Placement.Service.Controllers templateDoc = r.templateDoc, posmasterId = p.posmasterId, positionId = p.positionId, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1539,6 +1545,8 @@ namespace BMA.EHR.Placement.Service.Controllers templateDoc = r.templateDoc, posmasterId = p.posmasterId, positionId = p.positionId, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1764,6 +1772,8 @@ namespace BMA.EHR.Placement.Service.Controllers templateDoc = r.templateDoc, posmasterId = p.posmasterId, positionId = p.positionId, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 651ab875..dd75b93a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1735,7 +1735,9 @@ namespace BMA.EHR.Placement.Service.Controllers positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName, refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", templateDoc = r.templateDoc, - isGovernment = true + isGovernment = true, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }, bodyPosition = new { @@ -2040,7 +2042,9 @@ namespace BMA.EHR.Placement.Service.Controllers positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName, refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", templateDoc = r.templateDoc, - isGovernment = true + isGovernment = true, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }, bodyPosition = new { @@ -2285,6 +2289,8 @@ namespace BMA.EHR.Placement.Service.Controllers templateDoc = r.templateDoc, posmasterId = p.posmasterId, positionId = p.positionId, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -2514,6 +2520,8 @@ namespace BMA.EHR.Placement.Service.Controllers templateDoc = r.templateDoc, posmasterId = p.posmasterId, positionId = p.positionId, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -2732,6 +2740,8 @@ namespace BMA.EHR.Placement.Service.Controllers templateDoc = r.templateDoc, posmasterId = p.posmasterId, positionId = p.positionId, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 217a2d06..94684221 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -628,7 +628,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null, @@ -685,6 +686,8 @@ namespace BMA.EHR.Placement.Service.Controllers positionLevel = p.PositionLevelOld, refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", templateDoc = r.templateDoc, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 731564a2..3ec81c32 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -1089,7 +1089,9 @@ namespace BMA.EHR.Placement.Service.Controllers positionType = p.posTypeName == null ? string.Empty : p.posTypeName, positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName, refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", - templateDoc = r.templateDoc + templateDoc = r.templateDoc, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }, bodyPosition = new { diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index 48c4e553..cd90224f 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -511,6 +511,8 @@ namespace BMA.EHR.Placement.Service.Controllers positionLevel = p.PositionLevelOld, refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", templateDoc = r.templateDoc, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 045be807..90e61efe 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -838,7 +838,8 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null, @@ -903,6 +904,8 @@ namespace BMA.EHR.Placement.Service.Controllers leaveReason = "โอนออก", dateLeave = r.commandAffectDate, isLeave = true, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs b/BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs index 999b663d..ddfe4004 100644 --- a/BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs +++ b/BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs @@ -19,5 +19,7 @@ namespace BMA.EHR.Placement.Service.Requests public double? amountSpecial { get; set; } public double? positionSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; } + public string? refCommandCode { get; set; } + public string? refCommandName { get; set; } } } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index bcc5d787..6bfb98e4 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -794,6 +794,8 @@ namespace BMA.EHR.Retirement.Service.Controllers leaveReason = _null, dateLeave = _null, isGovernment = true, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -1001,7 +1003,9 @@ namespace BMA.EHR.Retirement.Service.Controllers isLeave = false, leaveReason = _null, dateLeave = _null, - isGovernment = true + isGovernment = true, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index b6468e2b..cb6c5399 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -547,7 +547,9 @@ namespace BMA.EHR.Retirement.Service.Controllers isLeave = true, leaveReason = "ให้ออกจากราชการ", dateLeave = r.commandAffectDate, - isGovernment = false + isGovernment = false, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 960075ed..9d55c91d 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -2460,6 +2460,8 @@ namespace BMA.EHR.Retirement.Service.Controllers isGovernment = false, leaveReason = "ออกจากราชการ", dateLeave = r.commandAffectDate, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -2645,6 +2647,8 @@ namespace BMA.EHR.Retirement.Service.Controllers isLeave = false, leaveReason = _null, dateLeave = _null, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 001a020c..a86d1250 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -2403,6 +2403,8 @@ namespace BMA.EHR.Retirement.Service.Controllers isGovernment = false, leaveReason = "ออกจากราชการ", dateLeave = r.commandAffectDate, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; @@ -2588,6 +2590,8 @@ namespace BMA.EHR.Retirement.Service.Controllers isLeave = false, leaveReason = _null, dateLeave = _null, + refCommandCode = r.refCommandCode, + refCommandName = r.refCommandName, }).ToList(); var baseAPIOrg = _configuration["API"]; diff --git a/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs b/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs index cf161c9c..c90e92ca 100644 --- a/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs +++ b/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs @@ -19,5 +19,7 @@ namespace BMA.EHR.Retirement.Service.Requests public double? amountSpecial { get; set; } public double? positionSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; } + public string? refCommandCode { get; set; } + public string? refCommandName { get; set; } } }