From 1776a578d7f198194ede1e40960955b26a5bf051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E7=A5=A5=20=E8=A9=B9?= Date: Thu, 27 Mar 2025 19:16:15 +0800 Subject: [PATCH] updates --- BackEnd/api/exportExcel.ashx.cs | 2 +- BackEnd/api/userList.ashx.cs | 11 ++++++++--- BackEnd/assets/javascript/custom/userList.js | 2 +- BackEnd/userList.aspx | 2 +- bin/abbott_2024_event.dll | Bin 77824 -> 78336 bytes .../assets/javascript/custom/userList.js | 2 +- bin/app.publish/BackEnd/userList.aspx | 2 +- bin/app.publish/bin/abbott_2024_event.dll | Bin 77824 -> 78336 bytes webapi/babyData.ashx.cs | 6 +++++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/BackEnd/api/exportExcel.ashx.cs b/BackEnd/api/exportExcel.ashx.cs index 34c294b..c61b769 100644 --- a/BackEnd/api/exportExcel.ashx.cs +++ b/BackEnd/api/exportExcel.ashx.cs @@ -78,7 +78,7 @@ namespace abbott_2024_event.BackEnd.api filiterString += " and babyRec_months >= " + (int.Parse(min_age) * 12).ToString() + " and babyRec_months <= " + (int.Parse(max_age) * 12).ToString(); - List babyDataRecViews = conn.Query("select * from babyDataRecView " + filiterString + " order by babyData_lastTestDate desc ").ToList(); + List babyDataRecViews = conn.Query("select * from babyDataRecView " + filiterString + " order by babyRec_recdate desc ").ToList(); HSSFWorkbook workbook = new HSSFWorkbook(); MemoryStream ms = new MemoryStream(); diff --git a/BackEnd/api/userList.ashx.cs b/BackEnd/api/userList.ashx.cs index c12e674..a55b5e7 100644 --- a/BackEnd/api/userList.ashx.cs +++ b/BackEnd/api/userList.ashx.cs @@ -82,6 +82,7 @@ namespace abbott_2024_event.BackEnd.api return; } + string filiterString = ""; filiterString += " Where babyData_bindedLine = 'Y' and babyRec_newestRec = 'Y' and babyRec_recdate >= '" + dateStart.ToString("yyyy/MM/dd") + "' and babyRec_recdate <= '" + dateEnd.ToString("yyyy/MM/dd HH:mm:ss") + "' "; @@ -92,14 +93,16 @@ namespace abbott_2024_event.BackEnd.api filiterString += " and babyRec_months >= " + (int.Parse(min_age) * 12).ToString() + " and babyRec_months <= " + (int.Parse(max_age) * 12).ToString(); - List babyDataRecViews = conn.Query("select distinct line_uid, line_displayname, line_phone from babyDataRecView " + filiterString + " ").ToList(); + + List babyDataRecViews = conn.Query("select distinct line_uid, line_displayname, line_phone, lineUser_modifydate from babyDataRecView " + filiterString + " order by lineUser_modifydate desc ").ToList(); + //babyDataRecViews = babyDataRecViews.Distinct().ToList(); foreach (babyDataRecView view in babyDataRecViews) { userData userData = new userData(); userData.line_uid = view.line_uid; userData.line_displayName = view.line_displayName; userData.line_phone = view.line_phone; - userData.testdate = view.babyData_lastTestDate.ToString("yyyy/MM/dd HH:mm:ss"); + userData.testdate = view.lineUser_modifydate.ToString("yyyy/MM/dd HH:mm:ss"); List subViews = conn.Query("select * from babyDataRecView " + filiterString + " and line_uid = @line_uid order by babyRec_recdate desc", new { line_uid = view.line_uid }).ToList(); @@ -114,7 +117,7 @@ namespace abbott_2024_event.BackEnd.api babyData.baby_testdate = subView.babyRec_recdate.ToString("yyyy/MM/dd"); babyData.baby_percent = subView.babyRec_inpercent; - userData.testdate = subView.babyRec_recdate.ToString("yyyy/MM/dd"); + //userData.testdate = subView.babyRec_recdate.ToString("yyyy/MM/dd"); userData.babyDatas.Add(babyData); @@ -144,6 +147,8 @@ namespace abbott_2024_event.BackEnd.api public string line_uid { get; set; } = ""; public string line_displayName { get; set; } = ""; public string line_phone { get; set; } = ""; + + public string testdate { get; set; } = ""; public string utm_source { get; set; } = ""; diff --git a/BackEnd/assets/javascript/custom/userList.js b/BackEnd/assets/javascript/custom/userList.js index 60bf26d..f16f750 100644 --- a/BackEnd/assets/javascript/custom/userList.js +++ b/BackEnd/assets/javascript/custom/userList.js @@ -247,7 +247,7 @@ function loadDataTable() { { data: 'line_displayName', className: 'align-middle text-left', orderable: true, searchable: true }, { data: 'line_uid', className: 'align-middle text-left', orderable: false, searchable: true, visible: false }, { data: 'line_phone', className: 'align-middle text-left', orderable: false, searchable: true }, - { data: 'testdate', className: 'align-top text-center', orderable: false, searchable: false, visible: false }, + { data: 'testdate', className: 'align-top text-center', orderable: true, searchable: false, visible: false }, { data: 'line_uid', className: 'align-middle text-center', orderable: false, searchable: false }, { data: 'line_uid', className: 'align-middle text-center', orderable: false, searchable: false } ], diff --git a/BackEnd/userList.aspx b/BackEnd/userList.aspx index 8a71013..791abdb 100644 --- a/BackEnd/userList.aspx +++ b/BackEnd/userList.aspx @@ -200,5 +200,5 @@ - + diff --git a/bin/abbott_2024_event.dll b/bin/abbott_2024_event.dll index 914b472b17978d92a3d8353d3277ebe3771430d0..d66b2861c559b5dd3776d8249c1e0d21de7b8d20 100644 GIT binary patch delta 3254 zcma*qeNYtV9S895a~uZ}w08$03N*aRL8zhhGNO%GC-Ju2?ao+V+U?cgPY+_FpAxA+vH)y)V}4%Up+)16CooSoEE8z< ztBVN<-YyVKZht`_Qi-voD1{<1Xt9e1MpJXLvP(Q8Qk3H&QKTw2MC?R2T|s{G=*I$o zxa)xWe*mIk*d?Z_zp{+RTEc_X*$G>%V!zU!bl5paD{$DV%5A80DL~M)a-}BO9s2=Y zz!Bhx@&*amw2qVvM}QGaNmXtpPq93cpx#L?w5i!Yjg4EH6^}}9J6*#uc7nH+&Q%3Q zOSs-rY_v?&TUHn?lk}Dfqa{Lbc}@MG;B`N-P03h%JEmTC*U;tty!mpHL(>1E-z-~> z0@kXNYIb3P#qmEe_2AMOB6Luu-=uWP1V1l5rl6|9c;#|Jh%zs2jMC?ci?Jo3GQ^+z zf(hnyaDtXDFDe{6i8{C5qbY4w@d-*@QIv2i!$qM1&r^G7=mcdbeY_G=yjHAH_7q2n zDz&lr$9}e2Iq0D>|G99rfB7XL{-!jSW{FJo+tN)!>{U0e%(9G~KbbN%Auqgiva(~< zM9XJWl$)!kiw(-8HD3m9rEbSlRawf9%AON%DLG|XVu!M`EMDwV{$BPA(W2ZhQ^#*{ z(s;)N?=an>bG)mIPSewsj+b0wmGbRNg;5u2gJ=2!cmDt<=CV->QcyCOq8RwsG?DF~gF)TDl2x!y9- z>H^{xE6?e*-n~f zJB8L&#^_V%)ubm+nUbgRY?+ZfjX9e1uNu)aaBI?& zXH3a9jBGNJZ3x{gr6=1=$#%H58Oe6!ZSxt?c2o2$Tsw^DS>$QbFM8ILJco_HF_Py{ zuSrjyGbPWXn*Mq`DWCH=Py;!?UQOrmZ@n{cO|l2)A$Doez|F~aQV`4S^xy)VtW2k! z6u~M=%n14rajf#h3$_oD!kS8bAHmI28rf>Be34;!A0b7=U=RL(p*+utOu8{ zi1kjaom9e_=E?}VjMc0;t_!xysMMvsN*y?0QkO{sQa-->4m?eN8lNnt1BooTm=2_} zo~I{s1?jAOdNNm#$?}AFa22yy6(M#~KC75+;$tjfRnbj+j8aWL{o!|_LGRSo-HG>2 z`kn{M=hTUS-TFf1(mG*h$)$aQaF$%!Cx~ImrF9{RC70HPG+n+xxwdPV&Yf~?*YHbS z+G4KbRg)S`x@uC$9&KqnE>~AzCoTIr=CN+kvae$?%a=xL>&7x>F0HK_WvpT9`xNV0 z2(^ZZ-u`HH_*Xa?{6n{v-bOFikrB_JVevq#2`zS zUJpiCvh;fJAC`PaK8OEX`c}wy)ngt6p1@&%q|B_()p3yG|02|hb9l{ug8 zsTb+2Qo5&JWU`79J-Cfotnx%VDW5e!FIOLyu)d?0s}C!5Y0sh`7fl*9DFey87s z+^2rHS#qEHF@q(y=?-#Oa+~g8E=z9HT`XeBZMusRmfWU$Sk02#bPtuR_Z%Mh2Jjm5 zg2Rph>|k|AdN7C@*1bqO>G!OdC=b5GA6aQpcG90&%{1;l8d)DgK1@&i*N8gOV-6Bw6kPg zJi=97+U<@4>hS*ewuqSxslg(?;Yfh6H4Hh0v*}T|m}wEG8m2~wb%`m6#yXUt0xPi) z8|YYt5|qP>71X*4o9Mh8FE{)tLOg3huDn)g>i;o-E)-2eSJEX*(QqX~Y_;F*>PbC( zqHxZ>S4LxO1FvK@EsGS^;FKp{BILhnkpk$YZw0;dT_Ar!_JVymyF>b~4b0tHGCMbH z%*M%0wJs4ToG$)8Ah$D1{vKTy6J~MeHJnTmbDE;3h<&1IT(WrVXDLW;a!e5qL|tmY Fe*tK-D&GJA delta 3202 zcmZYC4Nz3q6$kMDU6utG%e)1`heDMF+!ePDRjkEC8z@3Ttr0Yh#sx8&1O!~%*mhKO z&BQv^TMMw#;njPMW|G z;Yjh>1#EhU=RQY-8RnU)UdWuPWlzbrg;A(h@ndJ&()sDA^|jL^jvplW+UT#p+-ylS zT2`4YNk&Vp*)q;(S#P$CH(Iu6mlxHAiS6oRi!Z1CO?Gdi>BD>_a*=(~|DsQp4NZX6 ze^RShvdH52UYK@b>1?6SDos=SGOX&2C&uJkGic=RX{0A1%tw1>_y51eH;yfu_r$rC`~xM<)3I zHO9pys26A5qs}d>5^L3_vJ|mNJ5~0>FwvmhTz*4{7WI=AdE%Gagq7=rXwqJOJkJtS zI*F#X3AxIX@?(Thn|=~!`Lsw4tC%GM>YR!jk=v-l5#^txPOqFH8r90mJP}mitxTs< zIbC_b=vHG^X$g*a-(RTyV&h`s{Oj(a4D%^N-+DoG@(J*(V;rmR{LK14Y$RhL)A zh998X+M+fUr>HMhxx`NOpH*MbRjV$b>(|xq(DjWPH(gKF?4#?})zj&^f3x8Wa{*}&FGTv=fI{n}6+ZkRrGacM_>^yApj>|#u8ir78Mf}m z3SC7|dmjsQ z8GY}gQ~mj$=LUvX$_Qh%4?AF7>AH+bkA_4ZL-8|a@;SeYbpDKF86p4RU>>nvP?{=!~q$ z^x`Uq+A_6sP*^gxb4X&z z)Vh(%lBsng(@-E%=JqkBai`4fW87;fCi9*dcUl-qeMXN^$bC#Ym0P9gbOGvmGZ6zf^}@e1h~L;CW)_<;LXhI`SA zW2`md3h6AXAwWx9znM5Z%mTx~BnTu~yJM4IqbA>hj_;a#=Mlg;c~EqKE4WN?8A) zhwBQwhV;F-iX$N!HWk2Cq(5)uEzjvHJS=%mS22SnkLfeaX31mv3tY0t zvSeM1U*6*7zhlb6_yW(daxxUsi!50eckox1tcyE% zlO^loOT5RDb@3%ySh6neqLn4<;x0N2>9;#dZ?|7H9M~X!QNJdc-i$n>c1Jaq<0-7g zB0R4D&2PSxC>B`6EA`XIi|YDaLL}F}o+uRSL?EpG-ej>+X>RNeZgBPHJ$tTy@oV2y z1e)8Eg>|gw+kXr!w4=%NepN?r`gQb=LCM1Wg=N>?ddsykCATqtOfbFpwzYZGEh0s9 qE5GB*Gw3O-kIoe1EFFdQnVDi - + diff --git a/bin/app.publish/bin/abbott_2024_event.dll b/bin/app.publish/bin/abbott_2024_event.dll index 914b472b17978d92a3d8353d3277ebe3771430d0..b95b1f70360597d2957fe7b8ebcb9951c72508e4 100644 GIT binary patch delta 2888 zcma*pc}x{Y90&04JRe7q(B+V7fXGqu9!T+(&;Yht4-ha0D;}xjDX4fnmCGX@tv+pu zm3kDqDrrMnO|^~MM&zjwLK7<@h&n!+kz7#A1nd=+7TQ$lv#jq1~{u1=Oq;#p6%hD#4t@<$Y7`#QWWIvzL~+D zyJ<3mzZ_(UkmoRyTc(*04CI%?ahR<@lerFcDg3>B&T9#E6V(4weQNgmTB%g{1YOO|0!k(w++ ze(Y=0JCL2GMIG3oNR2vlH$9GA`RMM1#KLru&&NB)iEb5mm7$HUg#Uc4uM#sCXnj>! ztw$PMpd^QNF$y!~q4(3f-vJOd`>{_%=7d;2_ z7A<-XNs82)p3^1kvF39vS&!X{)MULbc^>%%TJk&&6hO?co~HBoL+x~38g9jTurHOU z>xOWN%Z(K6WkmzLNE5syES*a2q9&e8k{d6f)vC1E+U#Vh4)>=SS~*QR@dD| zD=r~{Iu9Bpt`t&Huoagvo3uYz;z}pQna89$rA8dksYR!5Av>+U z5hJ&&>lMW`!bB3qG{QpqfIpe5h$W@+Cvz1ONLFtvnvhJ&_LjI(N%Qz3t|5)Ik}u*K z7Amr<55F13YNt|nGfwIB4-FKhHN$0xTBsqO|J>B8k#k5JnQEwIE8B z-Br|f17oOD)OG`tR4K*W#9Ez>=+vZ>_fDlW8keZbwV9WF6VpiddD%DdG07gqYimUY zF_G8S3LB}9_uWDs2|g0n22zZ#6}RyjDc)D&+OA5O{toJ?FVo42J7^^3IZ0ftq!K%y zq7C zr$J42bRps^broWtx)4ng`_zT8B(Y5okw6mL^bjc|u}zOKn<& zJ6fZr&P4_(A>xe&!y{n$q7^3ZmV%7b~6s%{tNB=?-$ zTb|+1jP4Qteb$PvGk*s3^6%7M{&ku1gUbzDR delta 2795 zcmY+`3rrM87zgnG9LI@=Aq!ZP2$5&+Kx!$)Qc@qq3Rj7-g0;R*#cErSr}PyqdKj%$ zTdUW#;)6CZYE)vPcvy(ll&A>8X%Q6>T0o(oVD*sts%`Ad?$?}q30ZzS|K0g!=i6k9 zyYZ*abm!JrJp zjQ1Vlj>U|XJEF%r;>W}rJb2WR`ATd&D|hVtAWO$m9Uhr4GxnnVYSuVbCTC?$W_I~- zRs^r~Qr4TSMfO|f7~va`{{vsX|8T$Ig)3g*lTYE3=XcB1%K}-D+`7!nQe}_qxt{&} z?(^lv+5VoV_|n$Ncr7o`1@1Ee;j?BU;t(M5DZ?$Zrt*pq@34QIA7aZ;wxwri zqn}HE6iXDXAL$4;;3$gKF%}S&YCMYPljYc!&hG&=S&j-tJxa1%lRSosciqWjxS~i+ z9z(|K&rR<@>O6PUflNhe)SD#jlt^gZuRoR|?4{iSm+2VL@ zZJ0x}@Y>q2m^8r0enS=s!zHdlQbK?gzhfn7N`S<*R+Tb+J5JNsQco+|QBPX#DREsU zmD>0e9cUw#@##CzO%kowi900GdYyPc67R?j{7Vw=$PF02RkuRCBRAng67R@Oj37lt zTG55kq{K*@#Azm`@ilcLmb8SgsT+x;1tu&0KoTj}BypvZ`uWS%gLKkA{N?I_Rh9BA zdQq#9%Pkvv5wS(BTkKOWVn|}2dNGb9w&@loki<6KLJCQ2(``&AiEX-#*(9+|eON>i z+ti0l(kWjnZ2c%8I(;SdV+E-#$cj5yL+T5XxHgeOgRS@z-;v^iC9d71Dt_Hv>?PIk z>+a$(X{XtWd#E5CGE2B;L$ylfLAj8$Rectvd`&J)C5gUpA)O@pVgU0k0j9-4{(4a`r;vukVIcR zL={Q&#UoUcL|;6DQ>jhn4*3tQ Czps)2 diff --git a/webapi/babyData.ashx.cs b/webapi/babyData.ashx.cs index e11be5c..b46a5c2 100644 --- a/webapi/babyData.ashx.cs +++ b/webapi/babyData.ashx.cs @@ -120,8 +120,12 @@ namespace abbott_2024_event.webapi lineUser.lineUser_modifydate = DateTime.Now; conn.Update(lineUser); } + else { + lineUser.lineUser_modifydate = DateTime.Now; + conn.Update(lineUser); + } - List babyDatas = conn.Query("select * from babyData where line_uid = @line_uid", new { line_uid = line_uid }).ToList(); + List babyDatas = conn.Query("select * from babyData where line_uid = @line_uid", new { line_uid = line_uid }).ToList(); if (babyDatas.Count > 0) { objRet.more_data = "Y";