From 3c11d1b5a1423bd01238a3c5829ab8c0dc086829 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 17 Aug 2023 10:46:30 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=95=E0=B9=89=E0=B8=99=E0=B9=81=E0=B8=9A?= =?UTF-8?q?=E0=B8=9A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=B3=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationServicesRegistration.cs | 1 + .../Reports/RetireReportRepository.cs | 63 ++++++++++++++++++ .../BMA.EHR.Report.Service.csproj | 4 -- .../Controllers/RetireReportController.cs | 18 +++++ .../Reports/32-ประกาศเกษียณลูกจ้างประจำ.trdp | Bin 29044 -> 29173 bytes BMA.EHR.Report.Service/appsettings.json | 2 +- 6 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs create mode 100644 BMA.EHR.Report.Service/Controllers/RetireReportController.cs diff --git a/BMA.EHR.Application/ApplicationServicesRegistration.cs b/BMA.EHR.Application/ApplicationServicesRegistration.cs index bac9063a..502acb37 100644 --- a/BMA.EHR.Application/ApplicationServicesRegistration.cs +++ b/BMA.EHR.Application/ApplicationServicesRegistration.cs @@ -22,6 +22,7 @@ namespace BMA.EHR.Application services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); return services; } diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs new file mode 100644 index 00000000..672d378b --- /dev/null +++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs @@ -0,0 +1,63 @@ +using BMA.EHR.Application.Common.Interfaces; +using BMA.EHR.Domain.Extensions; +using BMA.EHR.Domain.Models.Retirement; +using Microsoft.AspNetCore.Http; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BMA.EHR.Application.Repositories.Reports +{ + public class RetireReportRepository + { + #region " Fields " + + private readonly IApplicationDBContext _dbContext; + + #endregion + + #region " Constructor and Destructor " + + public RetireReportRepository(IApplicationDBContext dbContext) + { + _dbContext = dbContext; + } + + #endregion + + #region " Methods " + + public async Task> GetListRetirePeriodAsync() + { + try + { + // 1. query + var data = await _dbContext.Set() + .Include(x => x.RetirementPeriodHistorys) + .Include(x => x.RetirementProfiles) + .ThenInclude(x => x.Profile) + .ToListAsync(); + + // 2. data not found throw exception + + + // 3. Load Report File + + + + return data; + + + } + catch + { + throw; + } + } + + #endregion + } +} diff --git a/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj b/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj index f405e447..14bde6b8 100644 --- a/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj +++ b/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj @@ -40,10 +40,6 @@ - - - - diff --git a/BMA.EHR.Report.Service/Controllers/RetireReportController.cs b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs new file mode 100644 index 00000000..918cbfce --- /dev/null +++ b/BMA.EHR.Report.Service/Controllers/RetireReportController.cs @@ -0,0 +1,18 @@ +using BMA.EHR.Domain.Common; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Swashbuckle.AspNetCore.Annotations; + +namespace BMA.EHR.Report.Service.Controllers +{ + [Route("api/v{version:apiVersion}/report/retire")] + [ApiVersion("2.0")] + [ApiController] + [Produces("application/json")] + [Authorize] + [SwaggerTag("API รายงานระบบเกษียณ")] + public class RetireReportController : BaseController + { + } +} diff --git a/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ.trdp b/BMA.EHR.Report.Service/Reports/32-ประกาศเกษียณลูกจ้างประจำ.trdp index 31a57df346041ac4a79c074c087ee735a9da61f0..a0cc5f8ed8c8268f74d3651b662549f349dab8fd 100644 GIT binary patch delta 2061 zcmV+o2=e#z;sN#J0TNJ40|XQR000O8;!+V;^{J8|krG7%JwU>dT0IKW001G=0fe9M z2C<>_KL^Pq0r@8e*t4BL11JvSQV~}i`l3Bc2LJ#g9+R$UFn{G)+i%lW7=NF%|KZ3F z6Nt@D(pwwgW9sgCVtSFlLrpQx-h0^QES_jRo4)UDcx|b&T)ThTYa2(+#su8y?e` zoTEl-!D9+dsJTozQmQG>3Pr%>vKU8+Qa5f=z^da3v2cYpOk+qq?3gtgUe}?M_98jo z)?18*hQF@X8H{ArE4taG>g>!}MObA5WO@VKrO7 zFbb+PxS%HjNbUyyfLVw}MJ?q^G9nqZ7-2G@W^<(hDhL(=3jVwm_`8AsjJYv7_S3-M zN5}TDXBR))VssZB{zc&bgH6`|Jn-)Y{U33{%YUH168JkjC~#;KKR(9GV_d>%@^99^ zjB7Un{}EE#!#O>izbj1PaaD6^b{HS@qk#?~Jp^T*2~r`>MDX%%0Wj#tbo~#pVbCrU z67+upRr_}lls>|-g3SX!Br*x>yeFY{1YXbyM0&6=TE!lIj_e1^ABp~FDA57h%ojv9 zk$>zhwDAjUZh>jxVOR9@@%etx|CJnz)`f2HH%{Myaf$r#m^mjt5Oe0$oMcWx3QgDx zF$zKFFf9wnxCyrrfcu1@uCnM-*~+z`zaI2|W8X1I@<(MFknI)n%-g`Is1|dDkuc@e zV!13qRhFRo?y$d@=7lkHEV)8i@@9!V?0>#wG@B-U&yWne4TGSRPjj4t7#O752k0qJ zFdp7+;Qtc%|6+n!#?hB=9@m&dm?Y~c-ab-3I=zga4G55CTLe&Ky4^xfD~Qf>Wv@~p}Y$JLcNs zvLg$Pu;fs)S!{}W6`r{mCL<9)zfRiCrMTo%)HK~#Clo&VRg=OPnX_-4x0-a3aZ|{Y zZFbvM)MkVAjt*~B#F%I%NPjY-{N)O~2S^!(7XrFPO`&(8oL38l&SJXa1En*O${kpq z${DH0-#^4P9xn9?>LEu2HCKoZ)fsgnFCP?Y(*`x0uKJDB(k39_fM!48?*ECaHYh(<3Xc(2$iA-)J zMkTeJFG^vUOAW(W+ciW8k`v^!AG)^pmH0V9VzVyN>(q?FS@}5OtPI1+5j!>txS4MI zDs=_`ALl=D$IN_;P=99C;t-U9{|A)72+LKs8^he9*+Ya#4OI!_h*4S%bZW}Craif>f4Q7c2k z;BZX2bfH57jH!+^Iaz9tpj6eMyq4~%hVIR@p^LNdk}aCSYSb33QxC50Tr#V7sB^)v zShaOJ&w^jKnr=gfTcxo0nqmQFSY5m8;#AQum|fDHmLa*2=(sFyZy;;Taj(fq`Gmih zowPmAZnHKtw10sDGEoSpNM7lNvA#g5z<~G6b>+*t#4%-7Z^C71C|C|Iu!LYo-22t3 z$-uOoAsfKmn;0PcA`X%U06nR@u_`rf_BpR@hG{0oJ;pASXP{o#766E}a`JyrO9KQH z000080OC>+SB5mjouU8$0Pg?*022Tl09!+EZggdCbd%0+)d=EJ5m)u8k|2|-a6%5^ rQV~}i`l3Bc2LJ#g9+UfUE(GFI5m%EfaT)?CaFa=KB?cIA00000qDj`{ delta 1907 zcmV-(2aNdj;{o*I0TNJ40|XQR000O8Xmj{hzdP6CkrG7%J3z#dT0IKX001G>0oL1A zd9k7OKL-K(Cj{8ZB(t4B11Jt?bNE({OK>mB1^@sIB9pFYFn`sWTW=Fb6oB6=^*@aE z38Z$`_e*7i2o;4=P=rG(^`+X{gR`o=YuW1peJT_wriF)GjB!FylQe=7MIsd1-G8$` zrE|{gc-OlQwuzG_$T+*Rb2;ambLO1capC-(dX4(Y#$Uw8j@ry;4*bnr)^KKCaO!DvOrY_)Jw>_scTif1$|fNrL=RAH4aB-Qt%SnuePN zvr$xHaDT-G!-+1HwHljmnh4x9w32vk7d{S98^a3Ku4bGV@J6XqW@8KN3#oG;-TDaJjB@SM%y3QkV#&74D!CzQ?3!VqMKO36P z>6aF1Sk{Y+tfNWE& zGqYfnp_xSbKujr`$>jp5asgD|z3*R0^MCZr*Vx(H2iG;58f77A`Czc7uAxc1K*OJ{ zhyUi<|KLipgiqfc-hpwk;F5GvyglrB{5mqZ+Y{)T#{%e)>vj)E>L8tc9HS=!2g!?? zwu}_K`^~7^Ec0)ILvFav5_Zt_q;+_U4I&4BiT!WEt%tae-yIx91g{4u23~vqEPvd! zD-K>VG6U;7n%uG1IKcjf#%myBM~Eyb7g!vk=Xeiv{^>GpUrxAY$HSveb0{=PJ)kvdN}d^C2B^rxttt7s(wIiF4; z9yyeJ>z=v6vt2YxK3peYI`Ci#DSz}~Vm)8jk_~pCKj>`a!tvqr)+58Yp3vP((+GAV zm8bBZNC%g$J8)Ft4Qe2etq2sG0TdDU#_G!i1^yG=vm;GGEERnc>M`hRo@jeCAl?iz z(aER!U>GYw65UBjJSB1g?*~>pf4abYJFwV;Tt|{Fk`Kri$#Eu(B%qPla({z~EPoSZISIcoqxkb>=5MKNr#-Fv1DQxbJoY4r+FWAoTfscy8v1QWZ*l< zmm=r^`o3IBo`^Vs8Q&xB@~>dQ3~|f<|J%wb$Rucdh|HOhXb4&+x4>5v;cx@mq!@*J z;azn+cFOe6g)HND=|)?D0J1ARX3>Y_Juc!b)38n_ z;04%JI;HsSuudxxold}8pef8XP4h=%t|Q<4oL~%z30AE@*c@cOu#WMF`GUfZF$`hk zOP~`AA!6NA1hud^5Zr=AVp)7-(t47JggibQ@%YuS$0tr#fXW?}$Dgh|B{vg~cb&C} z(;qU=J!TFO13$t{Hh+G|eb!9gfYW?7KcV+0V&Y7B;QMP-bV_Mt5jghrte_5^imOA% z;@%OuU!yRuRauEya4_E@^IC&7uj&ThP+drI-8G}qDr<0R?Cq~EazS;YZMIujRhG-a zu4&DxZup1ZvfyTLOM1gQnD=dsigTAa)3WeK25_Se6bN=&P-TPi27W(KT4cT;8ziHe&K*x3O43kzr<=Brr8`i+lRAt`GAOnc9<9dJ*Txo8_`jGKTt~p1QY-O00;nRbNE)1H*oC;Xmj{hzdP6ClPqyU t4rp`uR*p+>FUkf001P6Nd~q%WXmj{hldf?Z0;q43%5fzImv8_8006VcpltvE diff --git a/BMA.EHR.Report.Service/appsettings.json b/BMA.EHR.Report.Service/appsettings.json index 4c80fbc7..254ef302 100644 --- a/BMA.EHR.Report.Service/appsettings.json +++ b/BMA.EHR.Report.Service/appsettings.json @@ -14,7 +14,7 @@ "AllowedHosts": "*", "ConnectionStrings": { //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB", - "DefaultConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" + "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",