From 641e57eaad4b6c8c7c51250540af736ab3bf5af1 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 10 Aug 2023 12:54:07 +0700 Subject: [PATCH 1/4] =?UTF-8?q?fix=20bugs=20=E0=B9=81=E0=B8=AA=E0=B8=94?= =?UTF-8?q?=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=9C?= =?UTF-8?q?=E0=B8=B9=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=84=E0=B8=B3?= =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/Commands/CommandRepository.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index 6b7879b0..c0af212d 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -73,14 +73,14 @@ namespace BMA.EHR.Application.Repositories.Commands try { var result = new List(); - + // TODO : ต้องมา list คนตามประเภทอีกครั้งนึง // 1. หารายชื่อที่ถูกเลือกไปแล้ว ในประเภทเดียวกัน var otherCommandReceivers = await _dbContext.Set() .Include(x => x.Command) .ThenInclude(x => x.CommandType) - .Where(x => x.Command.CommandType.CommandCode.Trim().ToUpper() == "C-PM-01") - .Where(x => x.Id != command.Id) + .Where(x => x.Command.CommandType.CommandCode.Trim().ToUpper().StartsWith("C-PM")) + .Where(x => x.Command.Id != command.Id) .Select(x => x.CitizenId) .ToListAsync(); @@ -394,7 +394,6 @@ namespace BMA.EHR.Application.Repositories.Commands } } - #endregion #endregion From dbdd4a7be41700a138c26b7ba56b6376d7831877 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 11 Aug 2023 14:05:08 +0700 Subject: [PATCH 2/4] fix bug swap record --- .../Repositories/Commands/CommandRepository.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index c0af212d..e1fe44ef 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -614,12 +614,14 @@ namespace BMA.EHR.Application.Repositories.Commands try { var current = await _dbContext.Set() + .Include(c => c.Command) .FirstOrDefaultAsync(x => x.Id == personalId); if (current == null) throw new Exception(GlobalMessages.DataNotFound); var currentSeq = current.Sequence; + var commandID = current.Command!.Id; switch (direction.Trim().ToLower()) { @@ -627,8 +629,10 @@ namespace BMA.EHR.Application.Repositories.Commands { // get prev record var prev = await _dbContext.Set() - .OrderByDescending(x => x.Sequence) + .Include (c => c.Command) + .Where(x => x.Command.Id == commandID) .Where(x => x.Sequence < currentSeq) + .OrderByDescending(x => x.Sequence) .Take(1) .FirstOrDefaultAsync(); @@ -646,8 +650,10 @@ namespace BMA.EHR.Application.Repositories.Commands { // get next record var next = await _dbContext.Set() - .OrderBy(x => x.Sequence) + .Include(c => c.Command) + .Where(x => x.Command.Id == commandID) .Where(x => x.Sequence > currentSeq) + .OrderBy(x => x.Sequence) .Take(1) .FirstOrDefaultAsync(); From ecf982535b124ff9586669dc27513a8fbd11bb58 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 11 Aug 2023 16:46:56 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20seed=20data?= =?UTF-8?q?=20command=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Command.Service/SeedCommand.xlsx | Bin 10366 -> 11731 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/BMA.EHR.Command.Service/SeedCommand.xlsx b/BMA.EHR.Command.Service/SeedCommand.xlsx index 3d44e5302d8c6eb12b4e278581a226762978faf0..c06d66844aa883bde2dc433c8c403832e7c3dcc6 100644 GIT binary patch delta 4637 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 z Date: Wed, 16 Aug 2023 14:15:45 +0700 Subject: [PATCH 4/4] Correct Execute Command --- .../Commands/CommandRepository.cs | 55 ++++++++++++++++--- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index e1fe44ef..6cab8145 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -306,24 +306,61 @@ namespace BMA.EHR.Application.Repositories.Commands { Order = 1, Date = command.CommandAffectDate, - Amount = placementProfile.Amount, - PositionSalaryAmount = placementProfile.PositionSalaryAmount, - MouthSalaryAmount = placementProfile.MouthSalaryAmount, - + Amount = placementProfile.Amount == null ? 0 : placementProfile.Amount, + PositionSalaryAmount = placementProfile.PositionSalaryAmount == null ? 0 : placementProfile.PositionSalaryAmount, + MouthSalaryAmount = placementProfile.MouthSalaryAmount == null ? 0 : placementProfile.MouthSalaryAmount, + SalaryClass = "", SalaryRef = "บรรจุและแต่งตั้งผู้สอบแข่งขันได้วุฒิ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", OcId = oc == null ? Guid.Empty : oc.Id, - PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id, - PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id, + + PositionLevel = placementProfile.PositionLevel, PositionLineId = placementProfile.PositionLine!.Id, PositionTypeId = placementProfile.PositionType!.Id, OrganizationShortNameId = placementProfile.OrganizationPosition!.Organization!.OrganizationShortName!.Id, + PosNoId = positionNumber!.Id, CommandNo = $"{command.CommandNo}/{command.CommandYear}", - CommandTypeName = command.CommandType.Name + CommandTypeName = command.CommandType.Name, + + + PositionEmployeeGroupId = null, + PositionEmployeeLevelId = null, + PositionEmployeePositionId = null, + PositionEmployeePositionSideId = null, + PosNoEmployee = "", + + + PositionPathSideId = placementProfile.PositionPathSide! == null ? null : placementProfile.PositionPathSide!.Id, + PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive! == null ? null : placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id, + PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide! == null ? null : placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id, + + CreatedAt = DateTime.Now, + CreatedFullName = FullName, + CreatedUserId = UserId, + LastUpdatedAt = DateTime.Now, + LastUpdateFullName = FullName, + LastUpdateUserId = UserId, + }; + //if (placementProfile.PositionPathSide! != null) + //{ + // salary.PositionPathSideId = placementProfile.PositionPathSide!.Id; + //} + //else + + //if (placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive! != null) + //{ + // salary.PositionExecutiveId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutive!.Id; + //} + + //if (placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide! != null) + //{ + // salary.PositionExecutiveSideId = placementProfile.OrganizationPosition!.PositionMaster!.PositionExecutiveSide!.Id; + //} + // add profile position var profilePosition = new ProfilePosition { @@ -629,10 +666,10 @@ namespace BMA.EHR.Application.Repositories.Commands { // get prev record var prev = await _dbContext.Set() - .Include (c => c.Command) + .Include(c => c.Command) .Where(x => x.Command.Id == commandID) .Where(x => x.Sequence < currentSeq) - .OrderByDescending(x => x.Sequence) + .OrderByDescending(x => x.Sequence) .Take(1) .FirstOrDefaultAsync();