From 0bf038686380676298e53fad2946f6aa6ff05d12 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 3 Aug 2023 10:06:33 +0700 Subject: [PATCH 1/2] no message --- .../Storage/MinIOService.cs | 1 + .../Controllers/RetirementController.cs | 48 +++++++++++-------- .../Requests/PeriodRequest.cs | 13 +++++ 3 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 BMA.EHR.Retirement.Service/Requests/PeriodRequest.cs diff --git a/BMA.EHR.Infrastructure/Storage/MinIOService.cs b/BMA.EHR.Infrastructure/Storage/MinIOService.cs index 31b9c6e2..30a4b036 100644 --- a/BMA.EHR.Infrastructure/Storage/MinIOService.cs +++ b/BMA.EHR.Infrastructure/Storage/MinIOService.cs @@ -3,6 +3,7 @@ using Amazon.S3.Model; using BMA.EHR.Domain.Models.Documents; using BMA.EHR.Domain.Shared; using BMA.EHR.Infrastructure.Persistence; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index 8567bae6..6ca44dbd 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -174,17 +174,19 @@ namespace BMA.EHR.Retirement.Service.Controllers /// /// สร้างประกาศเกษียณใหม่ /// - /// ประเภทUser(officer,employee)(ตัวใหญ่หรือเล็กก็ได้) - /// ปีงบประมาณ(ค.ศ.) + /// Id ประวัติรอบพ้นราชการ + /// ประเภทประกาศ + /// ประเภทUser(officer,employee)(ตัวใหญ่หรือเล็กก็ได้) + /// ปีงบประมาณ(ค.ศ.) /// /// /// ค่าตัวแปรที่ส่งมาไม่ถูกต้อง /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน - [HttpGet("profile/{retire_history_id}/{option}/{type}/{year}")] - public async Task> CreateProfileRetirement(Guid retire_history_id, string option, string type, int year) + [HttpPost("profile")] + public async Task> CreateProfileRetirement([FromBody] PeriodRequest req) { - if (!type.Trim().ToUpper().Contains("EMPLOYEE") && !type.Trim().ToUpper().Contains("OFFICER")) + if (!req.Type.Trim().ToUpper().Contains("EMPLOYEE") && !req.Type.Trim().ToUpper().Contains("OFFICER")) return Error("ประเภทพ้นราชการไม่ถูกต้อง"); var round = 1; @@ -192,8 +194,8 @@ namespace BMA.EHR.Retirement.Service.Controllers .Include(x => x.RetirementPeriodHistorys) .Include(x => x.RetirementProfiles) .ThenInclude(x => x.Profile) - .Where(x => x.Year == year) - .Where(x => x.Type.Trim().ToUpper().Contains(type.Trim().ToUpper())) + .Where(x => x.Year == req.Year) + .Where(x => x.Type.Trim().ToUpper().Contains(req.Type.Trim().ToUpper())) .FirstOrDefaultAsync(); if (retire == null) { @@ -201,8 +203,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { Round = round, TypeReport = null, - Type = type.Trim().ToUpper(), - Year = year, + Type = req.Type.Trim().ToUpper(), + Year = req.Year, CreatedUserId = FullName ?? "", CreatedFullName = UserId ?? "System Administrator", CreatedAt = DateTime.Now, @@ -212,10 +214,10 @@ namespace BMA.EHR.Retirement.Service.Controllers }; await _context.RetirementPeriods.AddAsync(retire); var profiles = await _context.Profiles.AsQueryable() - .Where(x => x.ProfileType.Trim().ToUpper().Contains(type.Trim().ToUpper())) + .Where(x => x.ProfileType.Trim().ToUpper().Contains(req.Type.Trim().ToUpper())) .ToListAsync(); - profiles = profiles.Where(x => x.BirthDate.CalculateRetireDate().Year == year).ToList(); + profiles = profiles.Where(x => x.BirthDate.CalculateRetireDate().Year == req.Year).ToList(); var order = 1; foreach (var profile in profiles) { @@ -240,8 +242,11 @@ namespace BMA.EHR.Retirement.Service.Controllers } else { + if (req.Option == null) + req.Option = "EDIT"; var file_name = DateTime.Now.ToString(); - await _documentService.GenerateJsonFile("xxx", "/retire", file_name); + var profile = Newtonsoft.Json.JsonConvert.SerializeObject(retire.RetirementProfiles); + await _documentService.GenerateJsonFile(profile, "/retire", file_name); var history = new RetirementPeriodHistory { RetirementPeriod = retire, @@ -262,11 +267,11 @@ namespace BMA.EHR.Retirement.Service.Controllers await _context.SaveChangesAsync(); retire.Round = retire.Round + 1; - retire.TypeReport = option.Trim().ToUpper(); + retire.TypeReport = req.Option.Trim().ToUpper(); retire.LastUpdateFullName = FullName ?? "System Administrator"; retire.LastUpdateUserId = UserId ?? ""; retire.LastUpdatedAt = DateTime.Now; - // retire_history_id + // RetireHistoryId ////ดึงไฟล์json // foreach (var retire_profile in retire.RetirementProfiles) // { @@ -383,10 +388,15 @@ namespace BMA.EHR.Retirement.Service.Controllers retire_profile.LastUpdateUserId = UserId ?? ""; retire_profile.LastUpdatedAt = DateTime.Now; } + var num = 1; + + var old_retire = retire.RetirementProfiles.OrderByDescending(x => x.Order).FirstOrDefault(); + if (old_retire != null) + num = old_retire.Order + 1; var data = new RetirementProfile { - Order = 1, + Order = num, Remove = "PENDING", RetirementPeriod = retire, Profile = profile, @@ -399,10 +409,10 @@ namespace BMA.EHR.Retirement.Service.Controllers }; _context.RetirementProfiles.Add(data); await _context.SaveChangesAsync(); - // if (retire.RetirementPeriodHistorys.Count() <= 1) - // { - // await GenOrderByYear(retire.Id); - // } + if (retire.RetirementPeriodHistorys.Count() == 0) + { + await GenOrderByYear(retire.Id); + } return Success(); } diff --git a/BMA.EHR.Retirement.Service/Requests/PeriodRequest.cs b/BMA.EHR.Retirement.Service/Requests/PeriodRequest.cs new file mode 100644 index 00000000..f6548769 --- /dev/null +++ b/BMA.EHR.Retirement.Service/Requests/PeriodRequest.cs @@ -0,0 +1,13 @@ +using BMA.EHR.Domain.Models.MetaData; +using Microsoft.EntityFrameworkCore; + +namespace BMA.EHR.Retirement.Service.Requests +{ + public class PeriodRequest + { + public Guid? RetireHistoryId { get; set; } + public string? Option { get; set; } + public string Type { get; set; } + public int Year { get; set; } + } +} From e74efc7af7a5244761f969d24a3a67ab5247f8dc Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Thu, 3 Aug 2023 10:22:00 +0700 Subject: [PATCH 2/2] no message --- .../Reports/ภาคผนวก59-เครื่องราชฯ1.trdp | Bin 29632 -> 29635 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ1.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ1.trdp index 9de4fd778972a7fef4f7274d9784e598b9be4c3d..4ba8d6ef2c8c9b41294fb2c3e2c1b7403d9d55ef 100644 GIT binary patch delta 2499 zcmV;!2|V_|=K;g#0Uc0F0|XQR000O8Y=-z&^{J8|KxhB}HfR6<8~_}X5OW=oIvoQ& zK*Et)JqptR03p)>grD#Rv7z-p2gxJ>`6mY0vzUE zEmc)Y3$y$eNQ0{w|du>G}Nc z>6}rxUbJQ>6Vt`AnIM#Yt~8mLx9!4rx?Y-@H?u}bv(1cIw0_lQ@>#tI!|8;2YA7|V zC$(gP&Pd3_P20?t;FdmoZ`y{HNt-h^<&@kot+{!dGLqEJ`;5%0eFPO4tWtu1hH3MG zeI@?@*E7s$Ak86dls*1v-lq?voc?saz|esgKN*=aoy>DKJ?FjWG(2a+bB;Wx;yH_+ z`^a;$=z&q(0);6ysiq+*~85Y)CQYsM}YO$N=)tT9Ik z>+rXv7v!6y1_)?VcdjR-LU5R*SokA{a7Y3;q>ZtA$}y-{ddA3@Q^h=pKc6!)33A)Y zn$rsfI~JR07Yt@@ti%+`2f%FVa%52yoCF;m?S)R5ni=4&s`y&`xJlI=))>) zgKM3@FiP$}rp3ybC(wD74;Ib96`i6*V7w%`O0aW--h}jjxR?I_P%hcl{e@35fNMsk zL@nT6Zq_Vjtep8tCJ_>U^_Vu^QPRGq4{OPQoGD(1o?FvC&rb;B^Zm1rPj)CF^hULj zj_3(wBk|i+Tx~yq3?Vi;xQNkEn~J4y0ms5T0hqB{gLqUWp%sq}?ut8m(xHxibPpD~ z3o6nAue1!Fk-4YP%Et$H<;meLVPr@NBg5@s_tKXm(L!eecv|E57AN2}4NXD9faIJu8{NuSxu%aC*ylsv4 z)l_X^Nv>3Yc9?k`_ZWWpZ2fm|0j{VLJmXwF1X2i_ROyph?ZB9C3@=Y`In~$|jH0|u z+FLuCOUY^abh?-a1m@>ut0I&K*8<64G&J- zfk=rjDxK@V$p_#;W)z($949>rC`l6mucH5mm~PzaY=ONF^*%BE}X^m z?iBd|S3!FdCRjp8&8OVJG*J$Gg&V%F<1g-5IcV5r_S`o93SH*;?nRLMl(|glBW29w zO2)%~y&8mh>U}y6FP;ym!FxaP2ztl%mGZFg9P~x19?l~yH57Wcm}g>*O7w_Od}Wij z$5@$g$c%DlW#r*kGBk+pU&F5fBXsLQL% zUBv~-!A+FV666f~=!IJFN(yxw`bfA}aakQQ4gb|k%ne_2`f8S3!Phc2aC1>|a1ds& zWf^sco1w6RW)M(m#ggb(;{lcg2Vy0PR_UQy6oagorh_6DL%-Hn#|3t;TXQiY^NW5Fi$51j}tk(5BOVl5sMX?P*Uv3zEn~sR0S5WBkn2 zkEJ6QF8I-Om`7R>PlKDns&Ke;H@gcs9D>6US?mSvqOD5@)d&MR@-+c^J{r!^==4N* zHU`@oz|jjfLPB5#HzZzi-`ZeN>KuW8lhzgb8%DJ6XL_fCXk?9yv4WQlmA=6F4B@0V zZQ9xQ)4o%{a;%$n_JlAtjvI*MMg)$1KSMkf96RXbwi?0ug5^45xgLRK-%lk^0n71D zI;oUABJS|yV@uY}v2m?O6cLd~hXKAYzyP-w%%f2S^LUp%M$cW4mLTmFY~ELr{Y{*336({j(kut}&}HGhC;GDuz8a=BUuwtmSleyKJB{>f z;A)^Y?os(IvVvELSoY*)z!9ewO4yrXS6S%Jqae(D*Lo9gn#v;T%AWQfR@ZXT%Mwx2 zzG1Cam2Z@yQ|d%rIez>Ldy7*FpT5<$5v46;b|;hBa4dfvW$QoAVf-MU$G_`zN*!E1 z;pKguR|VqFx^FUKaL_7zZ&5+3I1GP-{JB1w&Ml`B&gdkBKQ`&P^az%K35$x?(#{cH1bO5V2fS^CT#bh!YP=!CBF%bNg_^t@@>I0RbmmKC7d@6aWAK2mow`_*Rnwa_tCghWJ+XsgfX*_i{oFY=-z& zTvBp683_OYh?7QhFClD(_*RBA#hs!6008d*000vJ000000000000000_i+G|5pooh Ns&fzq=5hc4005?1vMK-o delta 2453 zcmV;G32OGk=K;Xy0TNJ40|XQR000O8OL+KJzdP6CkrG7%J3z#dT0IKX001G>0oL1A zd9k7OKL-K(Cj{8ZB(t4B11Jqkc=%Rcd~^gB2><|uldWhpe{a)982>(L|HCPt-~)D( zzE3R(n0OfjRitd6z1FnW@}|Vu=suCIT0%9nLYtPfs3Of!p$GwmGW);rpR&8>?m3?w zCvhRAp{iW_eD~aQzvunVow{%@n<2lM#gdiJO(&AtP=c7bx%|A9TbNFi?YrkD5*N;Y z`_0sCvyd;^f8=Lt-d?2rMzqPfY=Yb}vgUMxze^=ZdNKcdI%gEF7OnZ|#B8x_CJ3dU zD@`XBZM*QDu9xN(&8$($P(&n5^IVIOjYhlr*j3l*DpOJaBkDvmBRZ7q>e{0^eFXivydWIPdq&cLGvBw|H zyYyj<)1S>37&`FcCnHm)lX=dz=e+ZrhUaW~&PUIwc+RrtKJc8^p0naP`<`>?IZfov z<};=e3LBJ>w7rxu31jDC##*2vxNPQZvl#3}`(4TBY(Z)E8c7>PrZk!0R&PZ^`ZLGfASp1bE=+uACzd9>Wk;R0>x>761C2F z&VlE=hv#=NX2)}$!~I4~5}vyZuUeYtt`X0DjK3T7VV$?FWz{#Kr~} zF&bu5u@o-gSePdOGj?kbi>f5F;_<;3ne_Y_+B#Ne(x zIou_T3@Kq`xIK&4R&SS8UTF5R}I#904=WvUrkU;b~|bbe|`9q z(WW@D*($&$PrVP@U4YLKySmU`!_L)^PE!2qJZ~4RY!%zMgzdIutO1>+q-f(BjBNlN zzV?0K@32j>Cu+4VAr98z9n#tH+^QN$p>Y)kZorKT6h6R2Rn{Un=j!)V%M)BqHFgD~C@+)tPSBYAY8#UuX|FA;$m!!I zntvS|tEzGwpy6}F-0bR6SCE4(RN!aA6)-_I5P>~}avz-=njRzd9@a@ae^Yf}V0{D_ zq$0pOk=yJ6T3o^k$DK1D7TNAw!_#q=|r6(SO8p2?Q1Q5T(oYlKaHCB)an$$1zD4&SH9ZihO{ppuG(fte~UjQ*L3J zCrqQ88f+(@o=vOe_@__pN_+e=L2f+ z-cLM&-m!h9JS;o~eUYk%^9V}~h29sNk;=Naa4F zOuG?cvpZ=2jQv0%e{nYC%0-6LIg^jbTDupQZ7iN_gRGdQgCbH^|AkOf!)O|z+Jf9G^dbV}e_$!;*BEU!w+v#f#&R=? zE(-?`AQou^t8GTmrqh0s@o6gC)1G=3B$04Grf8x8*atrD-c972!q`ijCZrWs#>etHC{VS$H3a{%nJ;1wd4J$V`M zky8sL>`k$&EOh5V5N5t>y^S|bWf65{Px}C?Yq{uEi708`uvV+eS4z<-b)v2uKmLWi z#i>u<2x{Ai(iSqiPm|klEPp*^>p#w6{2-slzv*;J9b7%(<$ax31>(=9Z!%(V&?93vi{!)QquUrcIlDC|)8nM!_uJuyS<%iz75z z8oBw>oWZ^w7VKQ6E3k6qe7OW&u^lJ7X%rW%oc~EUHr&C~h6UT(%75p~;sfv$q(7JP zww=$?XZE1W1*k-)bd_J;1dyZ`P1D99&~m%10M#ZBy6$=QHNIdh#ehe~f?qL*F`r7C z846~;82s{msbJy@!auiWf?+^kGQxt4>V3`5W`rn1vxlY={K(~rX9QqM=l?fw{(n$Q z0|XQR000O8OL+KJhLZ+z><|ulSy+g0!w(4 TdUG5B^plr!CI;hj00000ApES?