From fd66a3149d8e099b46dd7a218a7bed30d27787b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Mon, 5 Sep 2022 11:38:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?nps=E5=B7=B2=E6=89=93=E5=88=86=E5=8C=BA?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admins/nps_controller.rb | 1 + app/views/admins/nps/_user_np_list.html.erb | 2 +- app/views/admins/nps/index.html.erb | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/admins/nps_controller.rb b/app/controllers/admins/nps_controller.rb index 4eacba4e7..491e62778 100644 --- a/app/controllers/admins/nps_controller.rb +++ b/app/controllers/admins/nps_controller.rb @@ -7,6 +7,7 @@ class Admins::NpsController < Admins::BaseController sql = 'CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword OR users.login LIKE :keyword OR users.mail LIKE :keyword OR users.phone LIKE :keyword' @user_nps = @user_nps.where(sql, keyword: "%#{keyword}%") end + @user_nps = @user_nps.where("action_type != 'close'") if params[:done_score].present? @user_nps = paginate @user_nps.includes(:user) end diff --git a/app/views/admins/nps/_user_np_list.html.erb b/app/views/admins/nps/_user_np_list.html.erb index f4246c701..f2d5196e9 100644 --- a/app/views/admins/nps/_user_np_list.html.erb +++ b/app/views/admins/nps/_user_np_list.html.erb @@ -21,7 +21,7 @@
ywl$EybSKk?F=!>BKQ;r5Q|Lr)69xrBd+
zUB+GIHO?o#qLG$?ABEG{+f@=nMiQt*3hhf02H9 RkMr*aCZ== Y ~uhkBu!?1Y!H7V%O5Gpk^M+!CfggxqUvv;^~{}tNa8G;
z!fKWotsn&m|J3!s$EY}O>0EdT=mqIV$mQGz=DH3;X#391O7%+ICF#YWu?wNvAHe6&
zWQUH9r^sEB4j2KQhx#_%Dz49rM(rIr5I~`e=e?aC1c_8N0ZwAkro(N1nT9`%)-$rF
zgw{0-t!=X+LlK=^K=0>tMB1Ux^13@bs0*VTDcb+&^C}doecOQ=
zs>4Rodyz%1wjxGA#UGxOkiAHF)V&VR$lf|`lCYtUykte_imLCk7e4&EBKxn>6Y8zn
z)m)fjJ&gL))nJeLJd|XBh=zB((!k0pp2$aw6l=5yF&VrklPm_m`WlVfU9PHVy25
zYHO%35Xx9Ji-i`!;hB>IaDyyd)->NuD*sn8@+R+{z+m;0>S@P2ZN51W9;QEn)9@-K
zzw?H3Bj)hyuGctU5KEO1eUC5qD72B5v`s&&&k0b{G{65GRs0Ol@Py+#n_r5_n*78oCy-zrU#Xv`wp1
z0>hM>SZ86-mFAOOCu6Oa1@8(bNgpVAK>?KEF*+rpk0SWgyf{dzp8=I;op7K2FUMt-
zW*@ZN9uBKhkbxK;;q6#N(TP&>``bt4G}x!;k@~rj$hgcn@h_robYmTWfW?%zO7#cd
z@bDV)+vf(_H=?>~1g3*q5Uw8=fE9~0PnNpbB=_VV(Qnn?Us@d5)lS?#jH;zyH=G_N
zhFtvCvIGD@ye?}iGt+c2d<$#5!VhZEq<)T}Eb8R*o8L`)Hm6*6{Uc4Z=G7U6u8TUF
zetY?@dH>l;Hx<5zSpgiZ6;C<*xA8PPqHFiTM$@i4`q^fT
i#`Ji@=(&9<5UR%;g9o&esNmq+z#5A;uOaBfPX^2
z&`G?X%cdGHN0bIh@5gjEC%8<;{_Y
b9mt
z^wtADQI&aRxv}KHGpO-l`vD3m)JDyhF(dhF+RaQtZa?-F`CGVcS{LU<^Wg|1Z|=LU
zAqM*oghX`cV-4cdF~^Eu>+VY7@kMjXV}dBj9Y+UsCA@PQHd#(TBGf!Tc3bE>&{a0=
z3V0C$jv;FfkS$p*5+VfPF+k9;Z&EqfAhH`u1U0!J>5rza0>4WSzdBfX
_^kQeK#gYuG10O6u;x>zYM!$g4Y;qHViBxF
zD&uvLk#ppK8l*z14lH@s8ianFz{<5dHfjo6kXV|YK
J-Hmo=3av5&$|>;TjtTcB_y-Dx7#$xZ>+Obl?%y<>%7uo*>Q#NN%;ED?
zN&bz`9PNTW7poi=HqS5kO^m7T)NKvd8l!&VEjhTf#X5GeNAQ#EUv(DXczf~N729HB
z3vgJj^Yx4j_&5?In@O+wdzAktzPJkJAbQSod-ELnIwn}N6M9q!zVXy}#G^Ty5WAf+
z7>M+a2-rQ9?*oa{iNEd^e#rG20_M69p>FUeEqrW$fTvQRK
ZiYE(*e}DUf52^t#fFJ
zPjFrrtwAc>7E$F5Cf(tkg+CGOg