From 0d73330e22b1795ef73b8dee920643ea3f6b973c Mon Sep 17 00:00:00 2001 From: lch Date: Thu, 27 May 2021 00:56:43 +0000 Subject: [PATCH] =?UTF-8?q?"=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=97=91=EC=85=80=EC=97=90=EC=84=9C=201.=20=EB=AA=A8=EB=93=A0?= =?UTF-8?q?=20=ED=95=AD=EB=AA=A9=20text=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20(?= =?UTF-8?q?=EC=88=AB=EC=9E=90x,=20=EB=82=A0=EC=A7=9Cx)=202.=20=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=EC=8B=9C=EC=9E=91=EC=9D=BC,=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=EC=9D=BC=20=ED=95=98=EC=9D=B4=ED=94=88=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=203.=20=EC=A3=BC=EB=AF=BC=EB=B2=88=ED=98=B8?= =?UTF-8?q?=20=ED=95=98=EC=9D=B4=ED=94=88=20=EC=9E=85=EB=A0=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Content/file/documentspast.xlsx | Bin 17054 -> 16938 bytes Base/Controller/ACommon.cs | 29 +++++++++-------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/BO/Content/file/documentspast.xlsx b/BO/Content/file/documentspast.xlsx index c0b322c884c2fe8f1dc49e4ec931b17f93a569dd..660c605fb08335012943b71f72a559f220cf53cf 100644 GIT binary patch delta 9098 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 B7w7;0 delta 9277 zcmZ8{1yCJ4)9%6D-J!T^DekTZio3gOv2$>DcXxMpcZwCKxRe6L9d6(EyK}$$|C!0m zW}nS7$tDxoq%s&HHw2>oCoD7`JF0flJ}eEm-dA}bxgI)2&040#>h0@BOD1-OOFx1J z1gB}Hn)>BEWY_BXg=gD&%X-)-q8Ksds*~9LN=A^@-zXUsq#i>*B?epOd0)OiYgwFpfwzCU=-?jcYuus$&O^ z$Tm01fX`5c5$F9JrN=>t!*0r;sIbwf$5|pU^f{2$Fpz=W38p;|VU(wCtN{MZaif)?gCIIBv|6r<$tVkn<#wGQ^t*swWUxhbZ6>kbgK&d+1F z1}r@3kFg>?aTk~u&Wets2&jdgueMfc2C{iam~a$D-bt2n3zP$-It>DE{(X?v?^^Ef(uu1!>7(-CvMm|^4l`~68j^~O6A71G%1VTsU98$@0FnxXf$$OFYHvs@Bp8f{ z(Q-9&=Q$@BcS*c4rh6%nCB5JkZ$T0D()dHeoIc!-8(}}G*Y_Kn!&+nVp@G2FCtNtc zCysIOfoJPaknLGuN!c0`ybA)=u(o0Dq1VFKzKbYjiK(lf0QhDy)U0clY6$p4(d{ z>nFQh|L}b_#G5Ixa;BNL?F-py)k_}8t~_gS>9PEr>f_?>PxKA!8%>YQFwi6i_sj;l zHobeVO>YrTCz-t_;9kb-)OA1$2YDrx%!H0@g8Sdy-%Khx1tRcv- zMu?fm=2c$bFT#~id$S(?( z3$ix!Xvyueb(RU>K@5trvu8Toz5=1cfJpt7GMNsUI#{ zIPqyd0-(S;Y0gNy@8&Gszh zO(?40MVuf8zN^un+FzWF`E(==O;GQb=$Che4DSc>4R2^ z(=mupYBlE^w=_pIA?%sy`iQ37>}_<>%fp+cY&kSXs3D^79rDINrVAB(?5G#$QBjwB zI^@I~|NeA312lT%$Q7Xw(JQ`uHadeaY}k<~!!w@al@5rsP75|tuu32hNcI&Udx;hs z7UqsVM0CJOvb5ILzR;@ullqD%ZsRmg$9gjv?*`7=xJXkCRoSWv#$-sGW|ksgS)IC6)C+3ZPtRn{glB_;JO>GhkV7KC#*T}I<|m{z zp?tP*J8{IIaqdrSV8X~zRBAX37X@Q<3P-hcsRIl$N6d88!hMzyQNEvrY~h4$^vEWo zB#1#K&S``BTAM{|bhr=n$k#WdA)+9Vh;e)#8D=`m_08Wtf`rJ~P#fRk2gx_$%6ov_ zq<{TUH}<#7X9$1EgiF|DELTcI=!|N|m)w7NI#=LUtb+l&s?09#Bxd`n%!w@!ovH>1 zBldbc6>crgyT#Ybqwbk5yLtIZDj5sLPRss7?G3zq!14$ zV^EAqDXbN+wFj#DQ1E{F>wVXxLGs>nReXsyU1%w3yDmjz^tB5h{%}hdwG@=j50D42 z`vSv-7>r%_@;OvErJqFSNtE#XGw{1fm5@vYT=Jew#oxiAZ&5a46Gdf+HV{zC2#sMJ zrhwgX6SToMCr=bA%ntkQr?3`yAW*;-UaVZvuw&+n*MGRP(CBu7&pO?@Qhm zTC+TN!{vd=f_x4~O1w>tKHc0Zzx24}rcz}&f;2#+&)s>Gd)W`{UhbU=`B!*N6j4k($-OvU*+}n>AgP|sMS8+q@m%>{d~PU zRF1;SV>WpGp1NcEwCC=AU&m_5Ec|5ubO*+>*OpT~**}g^95Hh(as=svUNL@JUEMfF zkr}cWel$FSsDXBB4~}p;j^!1l_U^kKA$DeGAFJa>euf9b=QRY6d@+NM*nCZQ?KXNh zx3WIn>bVz6JKF8r%ARVTY}}haoUDE^yIOAAcihJ=yDY_8qauG@;R{0hHXSbkf&o{; zh~?87r%G&_uPx2(q{Ms)n00#LKrJ9L=&t9P3RJslWDE=RuPzA z)MmHntUEi--PQRkR(*&W8~EdV|NN!Pz#9|N=aW^#%`6w!>O!NJessZ;!8D|8oHpu~ z&Xq0fWfUZN#5ycdY4qV9oR)SEE)R=*@i3I*Mc5_8BC-FKCiI>cw$42hN&%U{_cm5q zrkSs-(<=h1%{3{{?mzB-{=17KlAT(2NWuUBxL8SK$OK>xmT&fU)mrwB``pOyLPj40 ze;!6tZ%Cy1Y)9A19&$(by*3TU5Bp}bsDQm>`fZ0h4STkYSn%U)s7M=V_r z+2-=jC2P_%YOoMI)`~|3pD*myyY%^PZ%^x$VLCTNacX=|d68m#7@|LZ+1!vf$1BD z-MCx~4rSs!Y(}4iFVkk~|M-=js&3D$%)*{F_Ij$eO~u4IFl?GxvZqMso+F^WNrpJO zKZg9RFHt3%r;Zo|^+@z%NM@6eUKwkap%o9R{x>~1&;Hrf@nS^Qbm9n{K)`X$<-D=bwXncb#(#YFVJm;IWI#C_5&|wg z-N^DduHby0LQ2Dm0GLAq_(!lwwhcZ=)+r(yLpwnt&$;!;-J!~~%FbS58l!dBPl*@9 z&WEwE19l3dSm>Ul*3_-^f4y^{hLHME5)3Ymiot-d=7LnVr}_i;b#E^0E88`RBz&P- zaG3`294je~g%-oU0%Kk1;>YESnr=W@E9A>E`__4RCdr16vSNWkARF$L_rzKhlst;5 z)@ZwP0!;dl5%NS^5QK_IO|R8V{qi`jK!T*N}ACMF~p7Za>K zu0fe@v@o3m@lB*?7qZ~DYe2e*QubVRCh{)`aEgu0u+m5GBfW0B8)y0Jp@@nD%b?Yq~tWUMF>q-dD&Lh$vF^M_zuUIT0!;pbmbGYb; zm>5z7mkChiulTp3QC=qvLpiM4I)nqWnJGm% z5ZSqwm9(mL+fNl%2AyL4IwB+lW~#>c8Zl%C*zdcrVLM$;;{0Hz=KhEu#LWAoZJeKy zYR8YF$D0{3b1^d9B?~z}-PDe2MBv|;0&<=x`cL#}WC#Z{E7r0cZLO9Zu3Oct#8psc zHvA04VJTzM%M^Tmc=Fy)A|RXPY*xM|;lODSXdVixNQ1*VLlu6ds#!5geKu3ojHGc7 z(G%;@^y}t#*VhN9tE|M!ZY3f{z)1dss{Tc%&5RvWwb@>BBtV{}o%d`RHsfYCvLOrX z<4o!&rWAPA;pqw~g%fHNY0ys!_OAM$&I*SQ$|;hHsBtinB5h<`ezS}jyj{O>;3FD& zRi+DBkKaxtBHE9Xha%^x#Z_j;WnTx`Q8LmR)7ssE;cwAV)^BUSqZsL~MT!&o1|#7o z(5%8Vi5bNql18*)dhZ6>YZW*;0~-#kDL|};CE>1S0&j?f&aDAQi7tql3j*9f`bJ*k zaZ{2+IivlKm+};8%p^*O$kS1zziJ`rwNzUE6eVJAk>Ui)NZmvTBOKiTk}eYvPDJ{y zuHhe)M6ef@$kKHNz6k}^S=9ayoDYMO4|3>`qo6VGXLb^0d><)v8L<!B0CgSN%z(e7oOKUQ??t=o=3nxAKplEt#L-9%|&oQ$rKZAM9BFwBvSGIl%VeV8SoP4o{IwwpLsaceNFLG3!8?I*o}!HY$^ybW?Pl6Jz+RS&}} zFntK+vD#7pELour*LpU^9`Yut89d&PN*2w+uw~?A43@sAIO~|FE})hVx_H;M1fj2& zk&2L1g>I#c+AuE_JEw04XXkXy^`D0hu$@Tzh_n&jzBsI8gl$xFS9zqVLQZC>sLoUt zI=hmE5vg)i7TkQ7yqXAud$%$|DJ)n*kpe9x-u+I-?z_=IGt;Y^P-RL{`VJ*T?=z{q z{kR?13%z)T_QLra<9=J)9rz=DT5vuBb=YQt!)n_sW%X_h88@zK86#Oc#oS>5$?bgkn$@vn(9DS91*d?k^2}tWNFe3i? z&0{^0`B7!Za%|grTlfMVVhXwD8>^yS&dq|v7W7+WdRi;ElU&J3&Um)M;++mxiV;=P z4s2B&fE{2W0k$*holu8UT(ipb zh)8n?U8kU?B(DK->@5Zu?6Y!^9^~$C%u$YAs)!H1fO8LIi*xus7-Ub`%8d5-&XB$l zn_sXpeS{uk+CcCe)J#B=!LBxtsE7(w}R|6A3|6gNS7*=WBkWsY(RdaM~Ds@;2K7K#3ll`9o^}jD&7Dfue?#7Ca(xv>WZAj2Mwk39A}nyy zaj(6zLCV5v%J3?)ss?z0({XV_eFLA2CgSYWZWg_eXK}WH+PC=4avd#}6(KE^+DLf>J-O2J^gS*^IuRHGy_*Wwr*Zl!tFSFW z!-&fnWc6}hN74uE(mIj2Ih34YcCpid0bUMDmxV$Dwm@cq3|#Y?rO?9ol%MO*jp;ix zn|iz!xp|CXOyHf9Np`OjMcpAolas*KfoSwaA`AcgZ8l2o#jFs6EZ6d?C+6SaBsN%; zhO=+mg2;x#zby;q`@PTF=YFRJ^3h(@4lrvzVpi5oOz{wp!iB-L9_KzmjfLgNDB*YL zZ~j~g5vSeu<+@;{je2Qt2&k@PEn!^4!`nXWDjKN3(gB;9l4TI{M%|fvFVSQ`2@1)T z$tw5Y!6q!mjE{=Lw70>~s+l5~DdL9tPN5fEGyrw_?Tu@=%k+I7u zVPN2+pujM*yg0OQl|UtCB#?hSl@QQ0kR+WMhlUuNcG`TmraM+!7xzLA*-Lv8Zo^-` zC|7|_REs)>dg(z#{S4I~+EN>&l*-*VuT{e27&t^{ZjD7ulLG93KDNMX-uF%2rApIH zMxZK7)}vx&WTb##?ZFy^?tUegCvw#)S-KGW4xXRvDlb)ncfG%6H21<=R(Kq3?s=_d zvj1*8_$AZ(iC23)eaKtxjRl(IjfKhWwhP_$pKPJ#(gllzVxBEHIH0J`egZz+f~;)Z zYHP)ea&j#Ep`Skg0cf7PgDGQf5S$t!dS?rk1zQ<7onVo<-irZP;3UBqSS(a zGV5&zZ<^fOYPj-W2del+pu&QVJ+_O{}5vo8GWf+ z&~s^vzwv~2ZA=k@KaYBuO_$KxR2ORFjJ1Q@Fs6wmqMyqARTE_I49L(Ao%^QLxaL?B zGIbyCaGxbsRYq*)!D;%~lRzKjQa|&-dr*avsiKgw#@PIlu4ID>G&gE}za|2Mn=*rg z(WxUhhwBcn zNoW?rclmC%>QB7Xi0Pu$Y%wm1*#N-{z(}Gzl#)XgYU@SdJ&~n4sOKMu5902JJuy-f zi^U6}r$aQ2Fq2(L*d+jXcrsTIT;<0kL zNE^{~(1Mfy@NXC42a=kH5~nb+B7Oy8BfYXYq5(hS?&(N{gXNOipnoHU*9%ih9FA}J zvsgh9P%wxZyr77l&%vv#U9pU#yNMD|{Id44FkSu{E^X)+6L??R>22`4&u`0Tb+t5oJ`4~O z3W42GgE=^2&F{D0o)6BV;V;v78Z=BK-e0Y*UmXcBz}rh~Fz8~}ucrrxY1#`Tyn0K{ z&V;I|TGs*teqOe~0>TMXjHNUBjJV{EMgmTp<$-j$qp@$xL&MruQsB3{+cihk?OAy3 zWX2EBBw|J!@1rat2Kh>!a8B>ITdHRAqo^~d2QgayHiTprADnL>+q>FMUIci&>M;&7 zj%6ed95PEmkr@H&>h#M+VT4bEFlTaJwnv4%S*L5^du;S%g11@r5+7})!6JhCx=RQS z&{0A7R)z+1ckzB=jH2l?hCig;-%e$Fz5cNVOfo<c_AhN=Gih8Fe#^UtXqVRyZU6blvrfJu5`BnJNtcr0pQzYAG^>@pYvB93Bu0CGdz zRK8)>oFCERK5jks0k`MIOBxaf9nB@^jvdLod^hlXmo#isd!s8Fm!oT(SODgJu zxO5tb@KqPrS~bpdW_dZbwdjBLS+vDED-_wK##^wk9O=GV9#ZZ8=88Ivy{jh1=t;` zI+_fwi0wl!GDwB*Gm|G+Wcy?q>NwE6-$MAyZozvjZV05SJ5$2U!9id(xys}|KM&e4 z6(z$LGg%~!gmc_;4RoH!>WpYldAi7u5`V9Ww0d$n22xh#k~%h>!IffjD6S9W!NWxf zbU%sXaVfa@f_-&3CT>#xX3NJgW3U*s+o~b)0f*Kdy`Z!mQvP?oo!g=(!&{2%Lh-yf zEBlyCO6+2IB<7V`5hI_YEB|2lESYK6*KjkXtswXZW{P`Mg3Rz$H1wqPmXqs#PQ$RT z&v3j70Y)Z)2FrudvK_>iPz*G#AscN1{(2=nN9{uS`!IXGD5QVfeC)8ahQQI+A<4M; zLN+EBrGXBjgnnq+DX|px70~KpiFH#8?c>j0E^335Kq0Dv@F5XZ=UXhsH2Oc-Qx3Q| z_T{di5)fzt}L6X0Kst){6NdU7~(|4OSsFbp)Rocp`0L?Chq(()sAl+g%ojwxO(4#N!23{IW8ng+hhi zx&)5x3|idP_&CKCDV0B=UkXD1po+_~6>-z477QYua2{Q1U{q)=8H>~)|R zBA`_^#cjWmzv(%yn^Ws>Jzt$9b@(a!j_;B0`{g=`iD!F?H=ava(K?v5VBpHYk|dz$ znHvyfr~P%dV)21#R!&Cm`ZydJWo}P=mrY8DirWe}&oEI%vR>yh>(fl+9PQR62a9^< zeqBfIgcf261ZGz%{b(tUoAq zN*AjbW!!g`1&=tm3kB@`&}-S!O-n2gPSuX)%->qoJS07Aj8b4J`6Iuj3uo(bxBN@a4@#wbLS^BUa!>43K+`l?D`%ry2F z8gGXdgAvLNIe~P1YNVYa*R@)w zKdK%5hsJDLO9|V&W1q1JJE91?3%vrJNi3&AMCmNT!g)PQ2!JXKv2_PSA`g{>VV+O{7gIHdcQL72MS?pIO>7=@axi1Dh^j2+x8JqGP= zI_SYyLgBkl&ibGDd%=c6*4e|P{e3x)+sTD;G($!zwOje|5tYDxh_XlUYqPgvqh=CDo*ka3#63yA)sp`k0@*G4-ll`89*yo&(&9^S`aFcGbx+2;72 zZCuf1_F+FePGU$g*GoBHQKuZDkU3BQSQuZSgZf>O^ zj1U{r!=tv!3cMngC7_vv(9zcAh>p<$i_R)e@g`&8h0J!iYxWFNldWQko56nSZ}c-C2&S81aO2_%*s2!?e)BDvho^{gZ7N_&9M>((FwPq#O4 zw*8hwyfz_H9^0Q+4+bMiU+R@j21aiL-}~+#cEecAJK94_L@8WaL@(_9 zJ#J6=Z^Z250}23?hl0iizyjct(2-%1jzm$Lg!vVr{`0jaUMS%I`;9;-EJ*y{rwsrA z|1ZOT(;imRB^F^)j4%U)ep0(I4blG&&;8f*XVQ}}Ir0BHE&S!d{xA4fvSLbP!cCGF zVSuPf@(=++yeEx`03jhhCjq&slIFNzlEg$AAWOOb7U`4HMA3=jg&@+BAjBwPJ%s*&{tph2X*vJ^ diff --git a/Base/Controller/ACommon.cs b/Base/Controller/ACommon.cs index aa8e2c2..6564336 100644 --- a/Base/Controller/ACommon.cs +++ b/Base/Controller/ACommon.cs @@ -1444,28 +1444,17 @@ namespace NP.Base.Controllers { long tryParseResult = 0; d.userpno = d.userpno.Replace("-", ""); - if (!String.IsNullOrEmpty(d.ssdatestring)) - { - int index = d.ssdatestring.IndexOf(" "); - if (index > -1) - { - d.ssdate = Convert.ToDateTime(d.ssdatestring.Substring(0, index + 1)); - } - else { - d.ssdate = Convert.ToDateTime(d.ssdatestring.Substring(0, 10)); - } + d.ssdatestring = d.ssdatestring.Replace("-", "").Trim(); + d.sedatestring = d.sedatestring.Replace("-", "").Trim(); + if (!String.IsNullOrEmpty(d.ssdatestring) && d.ssdatestring.Length == 8) + { + d.ssdatestring = string.Format("{0}-{1}-{2}", d.ssdatestring.Substring(0,4), d.ssdatestring.Substring(4, 2), d.ssdatestring.Substring(6, 2)); + d.ssdate = Convert.ToDateTime(d.ssdatestring); } - if (!String.IsNullOrEmpty(d.sedatestring)) + if (!String.IsNullOrEmpty(d.sedatestring) && d.sedatestring.Length == 8 ) { - int index = d.sedatestring.IndexOf(" "); - if (index > -1) - { - d.sedate = Convert.ToDateTime(d.sedatestring.Substring(0, index + 1)); - } - else - { - d.sedate = Convert.ToDateTime(d.sedatestring.Substring(0, 10)); - } + d.sedatestring = string.Format("{0}-{1}-{2}", d.sedatestring.Substring(0, 4), d.sedatestring.Substring(4, 2), d.sedatestring.Substring(6, 2)); + d.sedate = Convert.ToDateTime(d.sedatestring); } if (string.IsNullOrEmpty(d.username.Trim())) {