From 2e437233465df0b946c1c1a76472d273d2453a4c Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Thu, 8 Jul 2021 16:47:32 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=93=E0=B8=A2=E0=B8=AD=E0=B8=94?= =?UTF-8?q?=E0=B8=A3=E0=B8=A7=E0=B8=A1=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?= =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_salary_cylinder.xlsx | Bin 10915 -> 10914 bytes .../eva_limit_frame_planEntity.cs | 12 ++++++------ .../vw_limit_frame_planService.cs | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/EXCEL/eva_salary_cylinder.xlsx b/EXCEL/eva_salary_cylinder.xlsx index 1ad1d856d8b35af9b3d86ef4bf7371a760e7e79b..ef60e9c876bafd656bcf39489ceb921a86e2cb3a 100644 GIT binary patch delta 1757 zcmV<31|s>RRiag}+6Dz@@~9c$livm$f8TGLFc5y9wEqG5onn)aA1GvM0@0#%Thw;# z9wJo^IKc{FW=xW<>i@nogtTe)(6vM0!yJ76?(Xw3__RwCW5Z;@Mdl%LhLORtP((ai zdFaRW#OxuXP&A8ZA~NQodsd)N!;c>ZTOrpAA=U-}WQB)frE=G@iZEs=EzU&Fe=_ha zg-oe}sa#n_E*XuAm@$XF!EROp*U3^T52Yx? zQk?;`Rg*r6pJ0oSqZI5;bMQK(f3_vrhU*$0Sjo;CS#=IrohLAY-;G8$tG}V<#kde?r1rb*)@=zD1V#|&m$TA<5JOQt5lNLtS@F3@z zgbCFCJW)($RI#zh6i97P{k^iPu*b0g5gV86SIH%Vy#o@0aA2gNOBcnAf2!ChW#S>< zo!@@H{L-JRMa#x)L+^e^^Wf(=xR^haA3fFjKM0V9I(`dcu6fn>FXIP#(rrXGQ__I@ zseb{9zM>mQI}|tC@5(9Um9*}%P`c#qfjBtmj)I=qZ(-YPkNS>z?mLdz#*-Eyc;feb z=MjRD9XAxTRPnx|8rnl`f9Ef*uXNXV2zE;zJ<)i;`@_`s#nAX3b-=oJ-Eg)oo@%eB z#_pD9k=T03Bp7<%{qb~LId6HSVh~Tuc3_Xx&ptE0ih(h)ovz+E($>s8bi~N78BO3Y z^>D<7_~~4-<%kv_s5&6v33_Z;Tg_L)Ka(LM6|?9GGXe<^hBcsr1pol+vm^|a z0Xg#M${zo>h$6p32)l|=|E}XLi=O_STYGv4USjbFdt1@ycoGnJ&>KhxA&UVGpH>pd zeFg0lysLGS@eLOhSa$R?UWEZAU ztuIPa?h`0ebzd9cTVG-8lYcIrmnEkDSWpkF66Hz(J$$}&OEpOn*D9x>y9-s@H z9&{B~1E1o%U|AuBt@O+UjB@m^6U;j)yvxDJhCn1H^pDc-6BRF+l?55)PtkV>4&*T& z!DO=-X!;~$T<{Fh1Ta1&a&QY-G(>zXr)+$^FXl*gHKv{Z50jw- z6tmP3Vh{vthd&ClIwCXyf3&kYLfhdV_T)ftqWBh)yDiwHA&GYT_NMJtI}{&t&$+*Q z?j^-yuj=Rvtdor{QJN4Gf#!{ndRwBG^)jBL$a$s(s~Zg^I)Foq>hhxChVsV3lWh!G zFTq8Dq#fm^L_6;d#n|y3DCUyj&_UcZRxux*c8d+;A8ZRaBjg$@fACB&&u|Bf%}7K? zq~IgceA>DP2#%o!1=>5DCMo{$da%m<+0ZK!r;`3)!cNDyQ?}rPIJ);vj>fialXlj} z2>Da|wt9T-SB<6aZp8srh2WH1V7{@{tx!@Icv9)ES2O2V;m{ii;_gr}4z|F*>jBi~ z9%vwt5{w~>2P{-l_6FXc?=4&#i z`4!Fb3GoD|`rPNgq51}sp#v1Nwj?_P1!wZ88Q_!lCsF~~lSwEo8xV#ypo0Yf0P7V1 z02lxO00000000000000ClaVMz0mYNoC_n*VlNc#F0eF*BDM11gAd@g4C6l`;DghOf z<|#TGYllAyNdW)=S^@w75dZ)H0000000000001YGJ1RZ_r;~arBL-$C00000#5X%I delta 1793 zcmV+c2mbh?Rijm~+6Dzee|HJtlivm$e_d~zFcf{CwEuwoPQiTS1BFaYAX>C;i`uT; zL!`<9Cs+Z@j7ic}{qMVmkT%U8x^@VBF&B={z4!Ps__WJXZ9_%Lc za*+`UQ?WA2LQoQy38gYi4a+n;Mn+hU8U#ppb5DS(vd0&GfEsMPAD(8YMQV4s8U2P}e?7)Rh7_4?BaGflbu}JWe zFXb6P8x84`__1kVe3XLSX%1e8f8-c~ZkVd!ftBdIkyYn_)p-KL=DX1_NUPS02g!RQ zntR}8q2XZ3QhL)!S0hF7jby4)Dbi9>$}nb<#y;x8lyB+L15p*DilyMSENq*|7#`$2 z6EK0=pQn0?Pk61!W>RQy zKMgJ*(N|;xX@}y*`&~JOykh$YF`k_3&d3V%QKvW2@x<-heQb@o zcK8Uvh>jO=QpsdrQ3dTIf5-ic>nqu{9&CCQi=SvbnEOLl_QlZp9#z1qcik|$EuU(y zrrPe7|^Ao?1gpV_X-p{VXDBUNjS$GWCnD<>LAc zx|0{B91g&O!WhuQj(OfS`;KmgwyQh6zNPmZ+tSBQV1;fs48oDC>Z7{6_dj}FEp)H_ zeJGX*5%OA)XbnG|OS&A95(L!*1Ux~HEo-CwYWN3}p#v1N=Ls_c4s>~#X@dm-0O=I~ z02lz1ktiCoLJW2RI5Lwh{%;WkzCr-IictTqqb-Y${+(NUdI(-(@dtZb(dc**5O&ZT zNCzQ{0S%v463JZ!%@n+=Rg>`z7Zqe!SwayCOSrz3dZ*X#drsfIVhN0s9S%D-RJvFr zT(!Zd7AhAXa<9WeI%;xX`haV-+%^MSbwSZf4}l1#6VBc&*yPX-c^1ec(;d4Wv}Lo7 z4#WX}%S_ADr4*y%0tGH!gM89Svi4Guj0FoUSek(ilCjN72^u7$j#yvMXQLr)B-eGg zlk2(*B*U|R8_80PNJh7)nSykZti4nuW5EIomS$jsWNfoif;!24bl+ZI&u60{l4O+Y zwywjST-RM7*@anD>x+_<`vl5V-PZ>A)>qhnb~p2~#MGZ$Fl(z41FJp9!Yq}TuJvpx zjN}R3`nC-vChCG^;}IF=BJE76mz&1QP`A$t+iOfIKiy0zOoJ(O?5)dKUF+FYm{z8A zLM_i(ayq2?qG_p^QZpU(9-f_GlqsSRW;h3y3OOB;FQOkAy!)qY&eC!oDn~h4aHPL~ z1^gJLxfRm`bb-@@-OJU$r}!>dR!CthJu?BL9R2GA(@qNSaxk(X5Qz!>qxAbk#Y<*o zK}Pvg^c{i&d5lLe*DS`FKFJstJctCbP9XmdYYpOuEP^Qk3{Qz1+d>u%5g*GL8(;5> zIg(usX{Y}K009600{~D<0|XQR1^@_?umc5?yC@K|;}KF21iXg=`?EPBGy#94+uR6k zhkw|U1Hp;nTS)G$n5c8K_r7KrJFy4NT@oB7 zh}+6)?!(jWaLvUB-vLeuxxs%LJeS;a+ydizAfgjeiUC=F+Oh*kfuRHq#yd`#YlP@48le#G?0u~{YF(E0F4=NBFyoUn&NdW)=S^@w7 j5dZ)H0000000000001bHIx0Q^sFQgrBL-(D000007O5}@ diff --git a/Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs b/Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs index aaec12d..70256f9 100644 --- a/Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs +++ b/Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs @@ -56,12 +56,12 @@ namespace TodoAPI2.Models public void DoAfterInsertUpdate(DataContext context) { - total_salary = (from i in context.eva_limit_frame_employee - join j in context.eva_limit_frame_group - on i.frame_group_guid equals j.id - select i.salary).Sum(); - limit_frame_005_total = total_salary * limit_frame_005 / 100; - limit_frame_005_total_rounded = MyHelper.RoundOff(limit_frame_005_total.Value, 10); + //total_salary = (from i in context.eva_limit_frame_employee + // join j in context.eva_limit_frame_group + // on i.frame_group_guid equals j.id + // select i.salary).Sum(); + //limit_frame_005_total = total_salary * limit_frame_005 / 100; + //limit_frame_005_total_rounded = MyHelper.RoundOff(limit_frame_005_total.Value, 10); } } diff --git a/Models/vw_limit_frame_plan/vw_limit_frame_planService.cs b/Models/vw_limit_frame_plan/vw_limit_frame_planService.cs index 4e2329c..6631520 100644 --- a/Models/vw_limit_frame_plan/vw_limit_frame_planService.cs +++ b/Models/vw_limit_frame_plan/vw_limit_frame_planService.cs @@ -256,6 +256,10 @@ namespace TodoAPI2.Models _repository.Context.AddRange(result_frame_group); _repository.Context.AddRange(result_frame_employee); + entity.total_salary = all_all_emp.Sum(z => z.salary); + entity.limit_frame_005_total = entity.total_salary * entity.limit_frame_005 / 100; + entity.limit_frame_005_total_rounded = MyHelper.RoundOff(entity.limit_frame_005_total.Value, 10); + entity.SetAutoField(_repository.Context); if (is_force_save)