From 422a8ca232b13e9773b86481fdeb35af62fcdf0f Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 28 Sep 2023 10:21:54 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2?= =?UTF-8?q?=E0=B8=99=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=82=E0=B8=AD=E0=B8=99?= =?UTF-8?q?=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?= =?UTF-8?q?=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=A5=E0=B9=88=E0=B8=B2=E0=B8=AD?= =?UTF-8?q?=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/CommandReportRepository.cs | 9 +++++---- .../Reports/CommandType13Response.cs | 2 ++ ...7-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp | Bin 2456 -> 2462 bytes 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index 309e14a0..e5c46c3b 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -235,7 +235,7 @@ namespace BMA.EHR.Application.Repositories.Commands var report_data = (from r in raw_data join p in _dbContext.Set() - .Include(x => x.PlacementEducations) + .Include(x => x.PlacementEducations) .Include(x => x.OrganizationPosition) .ThenInclude(x => x.Organization) .Include(x => x.PositionPath) @@ -644,10 +644,11 @@ namespace BMA.EHR.Application.Repositories.Commands PositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, PositionType = pf.PositionType == null ? "" : pf.PositionType.Name, PositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(), - Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(), - ReceiveOrganizationName = r.Command!.ReceiveOrganizationName + ReceiveOrganizationName = r.Command!.ReceiveOrganizationName, + Reason = p.Reason ?? "" }) .ToList(); @@ -824,7 +825,7 @@ namespace BMA.EHR.Application.Repositories.Commands PositionType = p.PositionTypeOld, PositionNumber = p.PositionNumberOld.ToThaiNumber(), ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), - Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Remark = p.Reason ?? "" }) diff --git a/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs index 93b0e921..f8e58468 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs @@ -23,5 +23,7 @@ public string ReceiveOrganizationName { get; set; } = string.Empty; public string ActiveDate { get; set; } = string.Empty; + + public string Reason { get; set; } = string.Empty; } } diff --git a/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp b/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp index 2bd12d36af651124b99f60864d088a2987fef006..a49c754dc3b884e3ac0508f46221e3ffd3aade6f 100644 GIT binary patch delta 2076 zcmV+%2;=vd6P^@6aWAK2mmxvJXc9$vQ6O!003u^7eg6IHVGt)cC%er0o&Ck zZB-#2Ogto39Xquhk#jJA&+iRY<|Z&qMb}!az?E1AXgyt4w0?^nTQ|aO6x5a6?0Bzo2*`1Oo84WB-XBF?rzF zhj(`1>koki@#3~ja}12HjJ~8PwUeMs+L=^A{(l0uT2?L>uajghi1_R8WaU<5kM+? zl1ielD6*`AXyG&hb~=~Bjh@u-D26n3r1hoiP@B}YFLU);C8_PjfL;rU5U96Y*X4a$ z^)^sdlZy0zR6uFWu6}DvlffQ*5X-c6bv)F9Fih->B-D*~X9cB}vmvCQ|axfI+0t zx^Bq8AP++?v#o1T@pav@^r07WU)cS>>sCfbR~0#bhh*3+y5UM*SEb(ffoKwRWs?9A zPC`?K{;ZwzlEWP`-7nU&t)W1l`H0YOEE#<`$#ciC#r5xNaJF_6 zkN6aS*aDiFqB?eCi%!2FKZE@G(#dbsYKtX*7xVx`pPp^gW>6{2pfCd_ry10iZU!Y` z!Di5rRLR(9nN8goN>Id|(%J12JPWUT-ONYN)UK0G>{SiI)7mFou!9GsQ!@iKt zzPKRv8{%Tw-yExI!kTxb*wZYq_OV{}p;d(w>kHb?54LtBQ`hKe{46t>6T-L~C=j0$ z@g|>iSle_FPB_DL6Jn>S@wbWPB>VC?a*9Genf@`?)SUjLC`V4RcKDxil0DoUIrG+k zr{8(dIbqW$wsI5pWeF`0W8?i#TxP6rlaILwKn)EI7_=jUYy6aV1hlGrt`S>ZXL2;% zIl_ID3x+-(#ajcs99v`(C_0UV0a*jdo z9i4f6F|!Yi@qv-d>byaQ1ZSWAEpcRA__&xpDyEN#86#pU`Pm#NOy*_-IkrH_3GySy zev5tKUNL7F?4tI@v46)tatDrWL(*xe^PI_@7N|*}pxRBzn&-_m8r75aOUYe-n|17( z)7TPr1ZEsH1g=tQgsrW_)ywJ2Cg0kgpkV{KrXFJ-Rpf$-gV?z>hbuxtVRRp+(KS*yn6fnx$2`H=uU1WV?LG>?$=C~}MRA{S&@nIffj_Hb|BAn6 za6e*r2G09^9OB(!tJWEupSOI0*vXXM4s>W8(-Gds--I4Yn%WXpL}@C1K0 z|IpjBeBy0YM!syPna;DQEtvk;nSNKKV{S}2kv_&}UHEPYG>bXLklQrFc|1{1C&Sq; zP6fhA4h$)t3Z#S|)8r$6m$>keTU@-@9jOmCbscg-U++@l%GHYEyU~s4j6!g4Oz<2m zuLCS}GmXjYNF!ieQZ%{6u2o=lN}6o;V4Qc&O&g-7Xk&eB;+&p8pQqau$>=K~7alL- zYtk@fWJ#o9MBlyyPQ-TSw`ACtr^$zfHu~(_V!VP>Ji#RS4x7+zK)B}%Yu~X9SaYk*&#tyN*1Bs~nQPZpkrp^MP&{1D zGaLWm**f_*<(vp2HPF30Cqj|XbwBS#pI9tH$%|b54^T@31QY-O00;myQaqC|2;mJh zQao2lW3o-*2LJ$PlO72#12j@RlTZm811SgqlRyX*7EntC1^@s600IC40DS-e01F8K G0002)km=F@ delta 2074 zcmV+#2<7*l6PObhP)h>@6aWAK2mnx5Hdpb)jAwr-rMvFBGm{iLxA zhK6Y|->Qn$Z?a;Ut9A!0vn>xmlXdK8j{U~5?>qKyj(z0VFCF_ps+CHSa}h;}%l1NN+SV=q+sD!4mr0F^2FTCsxWR^o^{IaZ5dQ?AMO{vtvJU?0+5mIc~T=9Q%c1 z|K&`6bnI6+9>zR|jfhj9JCmOr``DR0bSC$3h9hTkfEyZ0`vt`lArOGS9s5u8h{*%T zKD@I7Uw;5Bh!?jt8jXSZmD!VZ^|p+v5mnM%21$TVoIGHE!ns?7WEdoeo zSJp`M6;)9*5G|ZWz)t&8xY3gu9>tKRj_7YdCmXq3E4Cu9x2!VRbbwk;w zRc`@J8&Q#eo(d?9*)?u$=?d6`4`P{?p^XQ65Qd5Ep^Ul_FU+!uEL@4A)IHZ)a#$srjwi($Hw*EPBOeIS|yUD+f+ zgp<%z;kcz-;R5R8JkdDd3dVnlSRvXEQX*r<5l)MnNsyMo6)fnHJRjuJk|CG465X@U z3;7)a`HnGC{oeMA&-XUY!JoBrUUIlYru)TOwlx&!GanK9^(CVZCwcBTwz&R%4bIkX z;t`*J0$V^cQ&h)pY|-f#Bt85Cx~7REVF5t0~w0AQ#!j{qGvh6%A8h!o3b#1knj)R2v$y?5%>#$@!&ez#E8OQ zD~5oAekLdVmD5ZAWpEQ{^uAxIfWLsB$q9dddFk*=(vsls><{U=zgR4R3-)nZ9`=QF z_QeIUUl$k4{^nTI64tyc#hzw?wU70(53S0aSXr3pyu% zZ2H7jZou9vq2*z0yvK>lj1_M1F{c2ip{WCtc3p6dpYn%*R+Y~gVyoj!j;6aqxNma7 zG{(c&i(@0fNf8g7AUfV7Hd=jEQxe4`i|nEQQewODS+W{9Ue$YvkMR-{#io@cy#h|A zYAv~n2w6ER&&sN{%rS4On}*0$>Xp=g5zqHadVyVs9%DzIr@kW(y=akg40`YAzT=CT zeQ1mijAS0?4KgG+`-E?aBjduy#q?1zeN4<45mU*}<~U*cHXF#XB}q<@A3640?EUtN zIm2M5v^S3ZJNAk@aBLfrPD7pN6z;S@O#%hgZc5fXZ?4g(maJb&?&_>#*POJCVvB{*eV9g9PvKz7W%B+V zQJ)Sc@%PfUf`n?pdqjM}yI*)7-lY@3`ypPF`s>rT?zfgS_<5G7Sg`_s`~v(SaY36t zy@l-e#6Ee*x49a8etaL#{->;fr95Zk#m?%7waGI(%?mgxpgvv8c~tNOe<=UZ+p~P) zZB<6TWv7|Wv#2eY{@9s*SEOT(OF5A~#%EplHV8C}ImVFNG{bp(PfsVq*)C26!buJc zDV_?Xgdfx3BiFX@k$YQzyx1MN2R01@azbC|QsSgaS=Buhhjd0ExG5%h4wlyj7P^aO z#O%mJU|v#nrOB?9VRg#7GU~!O?_!%4L`~Jl#(0EtdLDe9ZdYWpr-od3yoj$!!$`=I zNW+M}eF>b1?apt>urE)84-0MZVRhXo+=%Ty0G3w-$Lx;7H57p zIOX!1Hqc;w8fNqYoBbj15*QSKH3ktv^}H^RD1%ALebE|d1Ul;J)Z>Ug{_Bx&PywVH z4DN^V3R3X|ljK`#LihjRo-eF@+cIIztu{Wp+S*v_tX*ZUU0X$3;MhR%a5>Lx{D)`j z<{9 E05lWoIsgCw