From 4468858d1e45850dada5ca3b6e0e6b569aa3a397 Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Thu, 21 Sep 2023 09:40:47 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9Atext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/31-ประกาศเกษียณข้าราชการ-1.trdp | Bin 28735 -> 28715 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp b/BMA.EHR.Report.Service/Reports/31-ประกาศเกษียณข้าราชการ-1.trdp index 6d1f46845bb5244fa741c48030a7f702fd936120..9f497b2898e2c3f190b2eb8c41fb50fd2cef8102 100644 GIT binary patch delta 1553 zcmV+s2JZR4-~p@P0S!<~0|XQR000O8<4iTN4U=dM<4iSI^TsZ%fdv2n7n7}MGk;xA z+(s0AuhjoAa;2($h`ru#8a5G>5TXECu_RF+-QCGz)oWY!Y(x@8Ds3c4KOS02D~c2e zP?fY*q?VS{`)~YHdgqR3J?k|r2+|^C#&>4!Irq+;;~A!}ulF4CkOracxed+K3mTzr z+w0hFx1sgfgDZ9I`n7l8nO>p37k@Bv-|nzA7*}ieG_q{~R>*i~Lz}mpkZNRs+TAqwm42TRn7c z;NQ^jhdri#&vN=yZ!X`|Wc&yy3E;~jeE`jxUgj^Wp5M?4yw$QFVT1lUK2@uwaTkVBV=^#d4K0rL;^;7r{)nTEI68`> zS8?<#j<(VAI*xYZD8jBo{N0zsp#2**!18AteH%w##DnLu3!YyoBgJ&^vl$OQkE5UB z=mk#v9S7_pV%FjN@2$^Wg~!ZQoCDqe#Dgv5v`ON@mwYw{ykuBDhJQPR-Yv9mYN=2foy0u?&mno@sL>0B@|^nS0*ZY zRS^o3_Y+4yVC}ucs=V~A_;nn;!A-x3#^a0cG>*;*{DNC!3xA(GNc%OSOy2xw-l5zv z#KHY-O4uEY<|W3ri)lCp3+(0Z2o8^s*%3nQr#m(td>;>B?vL;!=x8q=8-e6(Stq>t8tT2t(SD`F(~gu#GyRYQh|4mhB{}Kycn0jNxr*F8NVGjy$&}!BfZKvcCYA`6_<2TL>yyNl@5TR2TBnVXgBpg*IQd>`|aR3ELFT z74&lXM08WHlr-R8MD97aJkvQXefh zWd-s`w6k!z7mG_$iCNF-z<{6+x3s%1Y;^}t9nx@d2^moe_1-w|c`Us*%2X9cFNY(8 zOvy*ZK!0B?%J^M1BuzN+1h;J$BAS6>U9{Xz*tY!PJya4{vVyMdrkWuQcjY2+8Y>DV zQ8m0Z>oMl_k{4qbr|MA%rz9mzn7P&(rA$si%SvArva$3wtq#B3OICcnB&!LU*n-P^ zn|Z;gF2WH}b`Wu$S0SNb^{>D)AYquaiGYaO&xE#!kd*OUo zGZ`bfvF-;n6#x5a47DQ1t>PiEBx|7LJoz6{dW4Y^GIl8-u>4B7=MUm{$ccmSq%?7q zkQa?~!{@M-#%uoqP)h>@6aWAK2ms?uHIsmD?gQgYHIs2~M-AglHCOY-F0FwD000-0 z#cwYm<4iSIhBU>Uq5uE@?*IS*6951J0000000000003WZ0F#hz6q6}%5C%?f00000 D@S5o< delta 1567 zcmV+)2H^Rt-~qqj0S!<~0|XQR000O81Aa5H4U=dM1Aa4C)=h%fl?4C*V3VzAGk@)G z+e8@uj>P|PG7^Fhv*WxrEZNkub)D9BQIl=rqe*Uwg=1UxW$HFfqA)2PFCU;3R4Pqs zE3^Tc1ceUgzww{K-E+S9d~ugn+n}o4^W(ec_q_h@u8qr^LkHc%L1=q!Q#18~hOpc9 zdbZndY9n&@!h&}B(!1|8Hn8sn1b^MJdt^Z8)w)9sty@Ff)Jodq~W{$sS_!g#$O_ycVX%^1Oo!r)Z%DAj*jB!k2uxzKx?V;>i>7i9WxQX7c4!&p4iZ9!EdL z(NkFXJ51OEL{;JY?`>YWNFR$AVGaHKPdwQMo5m=fe92Zbz&8xb=6^7S^y@arw{kQy zZBK=q$B7OO0gLPW8Bn%B`QPwL!+ZjRBO#fhqlYb8eM3wrpXi@pE8xBJNE9~Vbydr&YQ&0e(XsoK zhCaqFRiT}|&}pAxR)42HIZM$eF(kB8%`|)H9Ds~ft zCv?R=5(Yd6ghP1!3+5ezOS>YzkHHEU1CPj@a0L^~b`n-VujWa41axgJYq?a;d$W?mVm8z&dX;ZTr=XYhO1++ouAr1&2gNMtwSQA!gp!rzbTDXYpU5A%yvqqA>`Z9vgeWX zb~Npj>>VgG$rLy;2Iy*I!fs?CYSE27xM91!rnX4)vue4$uxt6#+m=LcaF7eQyX2N)Bv1SA_HxnE}(pk?*g6;@cq z+Fe*Rr}f+P%GxDfkZpf@5)vN}zqPT_VbNT&*k#n1Gkb*$out?lbOkQ4XX;+^o(7@6aWAK2mk|qGm~s??gImU zGm~9!M-2mhGgsD4g4dM=003ZUq5uE@?*IS*6951J0000000000 R00487|8FJ+Vs8Kd007s5@_7IN From 56e4a63432b466302f3224d5b439b84c249612cd Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 21 Sep 2023 10:39:24 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?= =?UTF-8?q?=E0=B8=B4=E0=B8=A7=E0=B8=A3=E0=B8=B5=E0=B9=88=20=E0=B9=80?= =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=8A=20=E0=B8=82=E0=B8=A3=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/InsigniaReportRepository.cs | 42 +++++++++---------- .../Controllers/RetirementController.cs | 6 +-- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index f9558467..c93ac4f9 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -642,15 +642,15 @@ namespace BMA.EHR.Application.Repositories.Reports InsigniaInitial = r.RequestInsignia.ShortName, InsigniaName = r.RequestInsignia.Name, ProfileId = r.Profile.Id, - CitizenId = r.Profile.CitizenId, + CitizenId = r.Profile.CitizenId == null ? null : r.Profile.CitizenId.ToThaiNumber(), FullName = $"{r.Profile.Prefix?.Name}{r.Profile.FirstName} {r.Profile.LastName}", ShowProfileId = r.Profile.Id, Type = r.Profile.PositionType == null ? "-" : r.Profile.PositionType.Name, AcademicStanding = "", Level = r.Profile.PositionLevel == null ? "-" : r.Profile.PositionLevel.Name, - DateStart = r.Profile.DateStart == null ? null : r.Profile.DateStart.Value.ToThaiShortDate(), - SalaryAmount = r.Profile.Salaries.Count() == 0 ? 0 : - r.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount, + DateStart = r.Profile.DateStart == null ? null : r.Profile.DateStart.Value.ToThaiShortDate().ToThaiNumber(), + SalaryAmount = r.Profile.Salaries.Count() == 0 ? "-" : + Convert.ToInt32(r.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount).ToNumericText().ToThaiNumber(), InsigniaRecv = "", InsigniaRecvDate = "", InsigniaRequest = r.RequestInsignia.ShortName, @@ -911,23 +911,23 @@ namespace BMA.EHR.Application.Repositories.Reports .ToListAsync(); foreach (var insigniaPeriod in insigniaPeriods) { - if (insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date) - { - await _repositoryNoti.PushNotificationAsync( - Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"), - $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", - $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", - "", - true - ); - await _repositoryNoti.PushNotificationAsync( - Guid.Parse("08db721d-adff-47b0-8762-41cd5c991001"), - $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", - $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", - "", - true - ); - } + // if (insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date) + // { + await _repositoryNoti.PushNotificationAsync( + Guid.Parse("08db721d-ade4-480e-8d84-0853946a0ea5"), + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round} {insigniaPeriod.EndDate.AddDays(-insigniaPeriod.Amount).Date}", + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round} {DateTime.Now.Date}", + "", + true + ); + await _repositoryNoti.PushNotificationAsync( + Guid.Parse("08db721d-adff-47b0-8762-41cd5c991001"), + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", + "", + true + ); + // } } } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index f8ff68d2..d9dfd9d9 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -640,9 +640,9 @@ namespace BMA.EHR.Retirement.Service.Controllers } var num = 1; - var old_retire = retire.RetirementProfiles.OrderByDescending(x => x.Order).FirstOrDefault(); - if (old_retire != null) - num = old_retire.Order + 1; + // var old_retire = retire.RetirementProfiles.OrderByDescending(x => x.Order).FirstOrDefault(); + // if (old_retire != null) + // num = old_retire.Order + 1; var data = new RetirementProfile { From 84e6cfcf6a9e8a01b6fee7597a2897d46bca461b Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Thu, 21 Sep 2023 10:39:32 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9Atext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ร4 บัญชีแสดงคุณสมบัติของข้าราชการซึ่งเสนอขอเครื่องราชฯ.trdp | Bin 3590 -> 3588 bytes .../44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp | Bin 2678 -> 2677 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/BMA.EHR.Report.Service/Reports/42-แบบ ขร4 บัญชีแสดงคุณสมบัติของข้าราชการซึ่งเสนอขอเครื่องราชฯ.trdp b/BMA.EHR.Report.Service/Reports/42-แบบ ขร4 บัญชีแสดงคุณสมบัติของข้าราชการซึ่งเสนอขอเครื่องราชฯ.trdp index 7c370803e4888360e3d9eb316dd24f019cbf8663..d7eb4a756d919b75c87f65881121b0bbb7a8c06f 100644 GIT binary patch delta 3236 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 WP&Jdj4I2TEliCd?25}7l0001%C?Vhg delta 3238 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 Y18#>hle`TZ0g;o~4JHP24FCWD00=oBR{#J2 diff --git a/BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp b/BMA.EHR.Report.Service/Reports/44-บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ.trdp index 4b14992dd46bea414bccb459589bbfe8a5988eb3..dd9302cdbbce912d825364c72c7430689f06e1d2 100644 GIT binary patch delta 2335 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 F005?NhnxTa delta 2336 zcmV+*3E%eh6!sJsP)h>@6aWAK2mq{wGFOH(P=L7z006F$7c+nVZ_`E;|9#T_2P>1% zs%cK_ByBoU5G^Vo2CACEv>#1#q*fg}bDUB36JoGP73)TYG+JQJe`D=0 z+1>M<Gwq9kWxI+_HU2&Yo7ujrcc?H$ArtBaC+4`!yY}KOL0*3@5zc%bs^L163N)@bw+$2| zamKu5I<(Q!MX93M+KrYeT}8L>AoTBWt}@whGSaMN1Ov%-$Ys0fbukJVOK8oRwbq#Y zl%iZzrU{>n@0>h21tR?t-NZ>!o+rsAtAPv2({;^gVLm)}%X43P?gP)g@42tN_PXaj z_uPk`yWxMiKX~q;=RWq_J@~y(YPNrb=S|Pu_1pumeaCa}!Slaf8`pmU4WWqC$H`Yf za2FnSApZ|Y{^GTNmOS?-&wT?eakIP7;3*XU6Qc469v*w`?>%>)a6q_RhgNrip@UH6 zbw8Pr&Y3j>k1)ry=lDWXa+#1Qnerqe(sPDh!?1syL#Bi5?pkp=U8r1UYMj@MW|tmC zx+FPNdp#6dlGR*3tk1lh&nq2$Vuh=LI;Ui%OQE}<&@FiI)$yz6wm~qPAT5%4>XWte zr}59Z)1P|oGpKbx(BZ^?cm5psKSWs`(%(dfCLr$+0I&~`@R73*W8Pz#J|uz)dw{$R zA4Pu>9`F+)5GslQ;X46#0I_~Prn;U5lw)viP7q~As~XsMh_TtRi3r%Dza(cWGEHO z(5nPSj$_q>q(5MqSoEbqQ+>Ov_ws!3-lrcVl{ z3*&tdQ3c2CqL4A@JUxe`C>No;IOcyS7aq6s>9sP&d8aH1&L_tj=ZhHS_9~C^^t^rI z&|J=nUJ#ajxC-7I`UR0oUvxBFO?IH}TQR`(ajl6ZDimHBF9!mF;@s#Ij?#=YE@vZe zdohQ$iERF@v}hCAOZMUf)+tikvSf{kA+X z+Z}?bmYDl^E2nr58`80Egge^^_qCz#YVmto{EpURKZ^xyZ}>FNG4qZyijV z+gW1yq*m6)Q9C@CJztXw#72J#&&1NYMU$lA0skr~#cmww4+FckVXT^ya!KLdWlkxR zePK&rw-31Vf%pL2TwVfReUtqztf{Xsv;o1-q5#ErAP}CPc|6fNWc?3%REV*K^t&}C zyEm#re}jnolM6b>zkl@xbk}){ExnEy!B~kzP~W%yWA_H7kSae^Ixc&Iz?yZmy&(dWgjeBxc3IeA_X~_0m%rAk>DG|= z+Q{BEN032Vgmd~h9`k<&BsrH;0zDS+=FfQ_^Dfsz_C6jnhqZ3MhtyJb;w)teVLN7a z-!9me679yv7sKO;h_Uol4DMYCZ-PA!hbnmXvR zf+0KTMit!CpE5yp>b#V+rjnd!DLGMr8e=VE5nvv{zQP|3rc1nmAslQP1OcUD<2R{EL*np~Nf`U)8a`mzhHj#0U@l)ig9LOUGMOrH zLMwz!&?UJLNKAi`^TlHLRCVf`mgSu8>AJYv!+TM}WwPh~CHr(fTfjrFBP^n({58_- zOJ);`P1hEXty@(YIt|Aoiqk`Ww0and*qNO_Bz4glwkQ|75Sq-MTj(bM(Rc3e6^3da z!;t&bAS94LTq2=#g0I~nxa*3sP%aD>ftKhHI2bw8#o_NQlR#w4gPReOWg#N9PI{*qT{wF5^5l zjppz$bhBl(noyH*$@;pY*)=_Mgk~An=oEp;L(h9^XvOyDO>jUApQX#$Fwt^0%&wmW z5~-{pFlMM;s4XlMSSB5iCfVl_&0Irk!2`>Yzg));Z3L60dlSv9D2IC0; G0002aFK1~0 From 37f474943ded0f748876bd7851d378f9cd23fab6 Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Thu, 21 Sep 2023 12:05:46 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=81?= =?UTF-8?q?=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93=E0=B9=82=E0=B8=AB=E0=B8=A5?= =?UTF-8?q?=E0=B8=94=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C.docx=20=E0=B9=84?= =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Report.Service/Controllers/RetireReportController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs index 4e8ce7d1..4987498e 100644 --- a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs @@ -102,7 +102,7 @@ namespace BMA.EHR.Report.Service.Controllers { report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); } - report.ReportParameters["Type"].Value = returnfile != "ยกเลิกประกาศเกษียณข้าราชการ.pdf" && returnfile != "แก้ไขประกาศเกษียณข้าราชการ.pdf" && returnfile != "ยกเลิกประกาศเกษียณลูกจ้างประจำ.pdf" && returnfile != "แก้ไขประกาศเกษียณลูกจ้างประจำ.pdf" ? "1" : "0"; + report.ReportParameters["Type"].Value = (returnfile != "ยกเลิกประกาศเกษียณข้าราชการ.pdf" && returnfile != "ยกเลิกประกาศเกษียณข้าราชการ.docx") && (returnfile != "แก้ไขประกาศเกษียณข้าราชการ.pdf" && returnfile != "แก้ไขประกาศเกษียณข้าราชการ.docx") && (returnfile != "ยกเลิกประกาศเกษียณลูกจ้างประจำ.pdf" && returnfile != "ยกเลิกประกาศเกษียณลูกจ้างประจำ.docx") && (returnfile != "แก้ไขประกาศเกษียณลูกจ้างประจำ.pdf" && returnfile != "แก้ไขประกาศเกษียณลูกจ้างประจำ.docx") ? "1" : "0"; var _profileList = new List(); var _count=0; var tmpOc1 = string.Empty;