From 071a7420f56dffc4ec3f1b1b0fa4e382d0bd64c6 Mon Sep 17 00:00:00 2001
From: zxf <zxf123456>
Date: Fri, 10 Nov 2023 00:29:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/classes/html/bureau/hotupdate.html      |   8 ++-
 build/classes/html/bureau/hotwireclass.html   |  40 +++++++++++++-
 build/classes/html/bureau/recording.html      |   5 +-
 build/classes/rush/BureauAction.class         | Bin 15681 -> 16171 bytes
 build/classes/rush/HotWireClass.class         | Bin 6481 -> 9153 bytes
 build/classes/rush/TaskDeleteJob.class        | Bin 1079 -> 1078 bytes
 .../classes/html/bureau/hotupdate.html        |   8 ++-
 .../classes/html/bureau/hotwireclass.html     |  40 +++++++++++++-
 .../classes/html/bureau/recording.html        |   5 +-
 .../WEB-INF/classes/rush/HotWireClass.class   | Bin 6481 -> 9153 bytes
 .../artifacts/rushfee_Web_exploded/ptrun.ini  |   2 +-
 resource/html/bureau/hotlog.html              |  31 +++++++++++
 resource/html/bureau/hotupdate.html           |   8 ++-
 resource/html/bureau/hotwireclass.html        |  40 +++++++++++++-
 src/rush/BureauReportAction.java              |  20 +++++++
 src/rush/HotWireClass.java                    |  50 +++++++++++++++++-
 16 files changed, 243 insertions(+), 14 deletions(-)
 create mode 100644 resource/html/bureau/hotlog.html
 create mode 100644 src/rush/BureauReportAction.java

diff --git a/build/classes/html/bureau/hotupdate.html b/build/classes/html/bureau/hotupdate.html
index 10f547f..41ef124 100644
--- a/build/classes/html/bureau/hotupdate.html
+++ b/build/classes/html/bureau/hotupdate.html
@@ -28,7 +28,8 @@
 <input widget="edit"  name="mlevel" label="等级"  maxValue="100"  minValue="-9999" style="width:400px;margin-top:5px"/>
 <br/>
 <input widget="num"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
-
+<br/>
+<input widget="textarea"  name="remark" label="更新备注" emptyText=" 请输入更新描述！" width="400px" height="100px"/>
 
 </body>
 <script type="text/javascript">
@@ -57,6 +58,11 @@
         data['state']=aos.get('state').getValue();
         data['mlevel']=aos.get('mlevel').getValue();
         data['mprice']=aos.get('mprice').getValue();
+        data['remark']=aos.get('remark').getValue();
+        if(aos.get('remark').getValue()==''||aos.get('remark').getValue()==null){
+            aos.alert('更新备注不能为空!');
+            return ;
+        }
         aos.post({
             url:"rush/hot/update",
             data:data,
diff --git a/build/classes/html/bureau/hotwireclass.html b/build/classes/html/bureau/hotwireclass.html
index 6091924..8153741 100644
--- a/build/classes/html/bureau/hotwireclass.html
+++ b/build/classes/html/bureau/hotwireclass.html
@@ -32,7 +32,7 @@
     <div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/hot/getlist"   onrowdblclick="pay()">
         <div type="indexcolumn" width="35" header="序号"></div>
         <div field="id" visible="id"></div>
-        <div field="khid" visible="id"></div>
+        <div field="khid" visible="khid"></div>
         <div field="custname" width="60" header="客户名称" align="center"></div>
         <div field="custtaxno" width="60" header="客户税号" align="center"></div>
         <div field="createdate" width="60" header="创建日期" align="center"></div>
@@ -42,6 +42,8 @@
         <div field="state" width="30" header="状态" renderer="statetype" align="center"></div>
         <div field="mlevel" width="30" header="等级" align="center"></div>
         <div field="mprice" width="40" header="金额" align="center"></div>
+        <div field="caozuojilu" width="45" align="center" renderer="onRendererCZ" header="操作记录"></div>
+        <div field="jiaofeijilu" width="45" align="center" renderer="onRendererJF" header="缴费详情"></div>
         <div field="caozuo" width="45" align="center" renderer="onRenderer" header="操作"></div>
     </div>
 </div>
@@ -70,7 +72,7 @@
             return "<a href='javascript:void(0)' style='text-decoration:none' onclick='huifu(\"" + e.row.id + "\")'>" + "恢复";
         }
         if (e.row.state=='1') {
-                return "<a href='javascript:void(0)'  onclick='rekp(\"" + e.row.id + "\")'>" + "删除(状态==>无效)";
+            return "<a href='javascript:void(0)'  onclick='pay()'>" + "更新";
             }
             return "暂无操作";
 
@@ -88,6 +90,40 @@
         });
     }
 
+
+    function onRendererJF(e) {
+
+            return "<a href='javascript:void(0)'  onclick='latestrecord(\"" + e.row.khid + "\")'>" + "缴费记录";
+
+
+    }
+
+    function onRendererCZ(e) {
+
+        return "<a href='javascript:void(0)'  onclick='logrecord(\"" + e.row.id + "\")'>" + "日志";
+
+
+    }
+
+    function latestrecord(khid){
+
+        var param = {};
+        param['customer_id'] = khid;
+        aos.showWindow( 'canvas/rush/oldpaylist', param, '600px','400px','缴费记录',
+            function(params, rtnData){
+            }
+        );}
+
+    function logrecord(id){
+
+        var param = {};
+        param['id'] = id;
+        aos.showWindow( 'canvas/bureau/hotlog', param, '1000px','700px','缴费记录',
+            function(params, rtnData){
+            }
+        );}
+
+
     function huifu(id) {
         aos.post({
             url: 'rush/hot/huifu',
diff --git a/build/classes/html/bureau/recording.html b/build/classes/html/bureau/recording.html
index c8dc9fa..3feb1e3 100644
--- a/build/classes/html/bureau/recording.html
+++ b/build/classes/html/bureau/recording.html
@@ -203,9 +203,12 @@
 	   }
 
 
+
+
+
 	   function exportExl(){
 		   var base  = document.getElementsByTagName("base")[0].href;
-		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()))+"&manyi="+ encodeURI(encodeURI(aos.get('manyidu').getValue()))+"&company="+ encodeURI(encodeURI(aos.get('company').getValue()));
+		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()))+"&manyi="+ encodeURI(encodeURI(aos.get('manyidu').getValue()))+"&company="+ encodeURI(encodeURI(aos.get('company').getValue()))+"&custname="+ encodeURI(encodeURI(aos.get('custname').getValue()))+"&diqu="+ encodeURI(encodeURI(aos.get('diqu').getValue()))+"&problem="+ encodeURI(encodeURI(aos.get('problem').getValue()))+"&callstate="+ encodeURI(encodeURI(aos.get('callstate').getValue()));
 
 	   }
 </script>
diff --git a/build/classes/rush/BureauAction.class b/build/classes/rush/BureauAction.class
index ea82979779bb1445f4e8440255d909c78d4189a4..d0c8fa4d9ddbb27ccb4defb5592928e843aab5bf 100644
GIT binary patch
delta 1715
zcmZvbd2m!k5XQgmdC9(Pvdc2E3oFUy24o3`V2}-mk}4D>3Ah4T6qFkR1PFJCEQAn{
zQ+ym^amgVlpuvSC$X#BDVw5Tb<Oo!0fh8jUXo)4pUcj;ntyk}x-|IKi-P6-^ymZ$b
z$H~7wJOZE-9kruur6V`4kP=LC*ipDLluLyxH(1Gb@>6d+Jwwl$)W=47b_}3=8x@$;
z*Q9=?RY0N6QQIVwCYw}ZqbVkSiY}UJ;)Y4nOqw43nqkt+=s3$prFJYJHfeUGo^CP~
zM7}a^G-B0z>&1Ao_PDdG^X@#Wqa!)e&C`ag&d$n6LsLJgi6x`0bZ?z4_S(+nKkS_w
zx#fLQSqGaWM>-@8w^3PSbw;eiZkvf1WB`WGTIX*S@nzbGo{O|-v5CULKw>SP4<zaS
z0iV3d2QeVzP4fD@$u$@lNO8FiqcEg&C>S#IpkOFQzYq+?>KB6{n;sktnR-Yt<cifV
ziQ4qbqNW}y8mEVe+VybJcs)WiL5~!5=ux6hJzBJp9uo|VNc|_m*l2{JXoPXm2;-v>
zCPX6?%iLH!QPid<iJE${Xq+w)wd*OO@p`Igf}SSo(9=bodWL8tJu?_cbGfYIP6NX7
z>GBl>(!D9(RBxI$-J4jAS$pM}4OjqmM}cS<Hku13&4Y)^;iLIzK^16A3y@8f=uQjK
zixwfDUX`O=j6t*nLue_6(K3vp<tU;RD5lp?LMt(yUPmcem_w^jPOA~Fq%~Mf8?k~m
zVJ#iQdOD8n^bvN`C#a&&P(vqhoIb}FbP{#+CC<|+T%tOBPv77=eT!e{EN;^|0$m_G
zT_h)6re;)6iFB1x=o+QdkJOTGP*3_*+VVG=K)0!c{-Cw=C#|PDVXC19I>ew)ndlTN
zx-QN3Gsm&X3G9%k6}vc#8}rlLg!9<VW4IYlU@tG?BtFePKFi5`fm67iQ~4%msse7Q
zs`wGZ#chlv&cZ6G-&AB`J7!}Y-bC|gzhO1jNR45Heb|7FAlQti*o4hsI1Lxx5>oIO
zCbkF}@EO2Xp%}DKzhj$FEZVAD;&d}?$X3_!wvdVL>I!xU#i5rvhn+%p<g2goj!--X
zs1tZsC;@}i$Jiz02xEvkhTVcr3{!`&N2n1-sam`z<U*0!hxdgVqgYj;N=Tzb?Z#fA
zhcI33#0Nr6P^z{eBIL##wHf<_JSbP|v0tbuD%BgP7HWpYY87gPyjY=DpcdiHc$j+f
zMH~=gb3RRda2AJ<$Y<#(oWpq}@de7ock<WA_0$6wgp&CtwZ}zVLW(Lt9WF~*QzgA(
z)C;9a{hYXht4POTsc{16zTYEA#8I)#gu6lZl4!#*E2Be-)!wh~zX?`Pzt0-k`7uwa
zzZ$t!GMS_IK*~*m9j(+Znbw)k{_t$$Fv>#8uV1N#3RYvzK)((P=C#pHs^QL8*@oN5
zI<f_=?@bBB)S{!F8*_J+H%2aXmfLvr?!pR#b~K!cUO9C)RGOS4I0qi?D!cE74DOD$
z+ymMC1PX-vb1tm#<4ZmBB*pRvQ|v7%_HFmy^rHUnZN)AlxUcx{7i~^CD7J>?xUKzN
zS`VK8z_u!6Kj8xs8plwWe-H~oHK+_2UPFho4xop^K(7(a;9llF=|ylMoID0vMh}lg
z8W+LO<HW^yt7~A9XW{=PJw=jkW5wpQ%UBdGdw$lxKDBf|coqyUMLf@jo6D>_IfJZ7
cPFE+Fi+R47E5y7&%u8Z<DeSz=THZDCH`~XKbpQYW

delta 1737
zcmZuxYfx2H6#mvZ_i;G)!DYj}a7bQ`l6856B<2OQBF!f#SHUYPBAB2^K2TB9i)O~u
z*bK9+sV01oX=M-X&Rj(jYqB&et;R<4kvV0}l$k$l#>|n{LH%R>*x&xv+UtC0t##Jf
zyViWX(slIa{vH4i(m@@o+g&9wRpivjrK74nR6<ql9WqU$F&d54Xq--d8n4p?D%GgW
zP7`&6Xp&u)QD~?}3r%a0MvFCCVy9*eznkGpHC)nYnMTV^t3{&~=DyNSt8{E2C32oF
zD^wmiX1NqA$EBnvdFpa%8=6;CH`OedlitvjK8Qf~k?N3V9bIz2H&_1V9UmF)D<N6s
zo+T?122*;(l9WTT$T$*lC67=e^HXZ=v^sKpfX$^_kHCt105w-WFtA|qKEwrL{6ZKp
zQN-^<z9{!cQ4-L*@mOdtMg|;)-i1+wSFp%%h+q_>E7bz0*LmCBi88~{jeZ=PA_hc}
zX6Rn0+>w=5eJ8?F*9iwdnqWS<-bp)qcd<3uw08C#l$!L8#1vD)5yeE_qsRz2g*)Kl
z<>nR3%fl;<myj9xS+XHJmE5u|J57F;Ssv!>Z_5}?Q^sY2+k{vXJSN03urAkF5#Vww
z0|{bkz{|_mjZnx)FuaCuFQx?&J+TK+6;j3YV8|k71VdIaGZ?ao>R`w&W(7l<s0oHV
zHZhygE@~OIu&CoLM$BQ<#S@GUF_+OP>KR?4fzd7I1p`TUwC9`Jji&YjQ@hF3e$v!l
z$e}i|h|w+<GiqW9V~l8K)WuRphginw6w4W1qJ`0I7b}7R!xJmphg5_E$ws1)WEe)W
z5g*0MJv`19NXDZW3{Vm5R17x_hmS@el^#YWJ%Sv16a_RAg)|B!^f*dsG%9HfYG^DP
zXdGH-Jl>=Uh*Bwf*giy)aGZiTNfo$A({Y7n;wn|+8ii-!2G#JK&L#`hl16ppp*fUK
zbLk<fry$LvsWhLK&;n|qCX%$6US_M4n&~ZCMu+Gr`isJJom%N8tyL6Sr^L|)rIFf{
z!}Oe*K^xT^dI6iblw|ZnBc|dQj>Bn=HD1I^VXoAq9oP(lT^)oi*a`)1H3Qq2sqm==
zI+<CJs>b1UW>#dXG1$(`h8&gf1~WSfl)tfqnTA5;D)uppL8)>9U*kjQs8mkj8+;1~
zt|%kW#iveORSFT_#ngps%22$+%#9mLKHg;(OHgw09y1SF6hGc)7Dt+LFLpB%Ty+2^
zSvsC;AA(c(9tqrmJe=lJFZUrEXPEi88>u*pb4XMg@d<vwt4LA~qaNp(8EQrzzw$?1
zKr#++BYa%>t(<$H-+o08;&G7AR>9HB{d38Ty!3=m?KnZeKbUkKR^8r<D#V)ya!sC1
zmiXiCKw4UwH(8bq8{%7KUKG1oLg^bU8#fxXNjeG#%7erF-lr@FusWpr#hNHozBj^^
ze$gs>hb5Mqj)2v?Yt~x(Vhk()2-#lC;J&c+7QQ3CGbdK<6YkHw2ffCV+JO|>i~+QT
zCv_`N>Nb=ypF-PZePE++9q04(-TA!D`Ap3HZ!V_%t-N*KL3>#K19P6tX30N`y>d(8
z{WI3zRl_qAvP5ea&jda~RcSXi@U{1Bz+zZLYjzh#sHik7W(KzsPv!9eb@6ZZIe*zM
ze#24pr!U~AFFE<IWM)yDukHVmKEX+6$ty*<R4&tty>2=U3!Q<3&caLQ<gdlkWJht4
bn|@;V&+NX)?qAsbyp8_g4}4j+43GQ^my3&p

diff --git a/build/classes/rush/HotWireClass.class b/build/classes/rush/HotWireClass.class
index 2c75cee06fe1a7ce9d77c40ce6a10802f33d12e0..2ea30999aa1633870f11352069ab1fffc63e98af 100644
GIT binary patch
literal 9153
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

delta 2320
zcmb_dYfzL`7=F%vEZ^B>S#eba6ck7#u3kt=NlhwDMe)K#D-9KJ5kUd3S*vJ@7ZmwQ
zt<>_CmxxpnNmJ7<7N(_^sj1U%XPTzzM>bR0bG}`Wis?tw%<ehwxqR>YJn!wC$+$GY
z)AGmhQvgzM+m0wyON_T;4c1Cbl$a!uEs-OUE0L#TogH>{W4)SdBsQpdqeQL5CW$%;
zL*ivSUcqLGEfQNLUX^%F;&q8_c5KHEi8s_IZ`!dFyCh~y?4GG(k6P}PcuU>cC$V3x
z4@ex8cw3@gt=`emAhBHHU5P^yhb4|kG}@4c_au(m(S&0X%@XfR9G5sD@qr?-QO8Mj
zcB*l-xGkJGspGVc4@pGF7$a2+x8Q7Jj<!t%;3EMoqo7hC#VFJI8Hv`VqQN+5eb6}S
z?+zG_$M~fKALA1vMo)3#Q=Aj9^y%xsXZYNhrB9_+2U>96xS&tb@r45yaM4JT{X6mM
zmpZ<3;1Vti3^3*e^fGE>tbY}*v@UPRu2H=IwLozB{EAtH1qIW}%8QbU3M$8y7maaO
zR66htt~LhQ!h}|ZZ;eEIwKf#PjAnZu9oHPVjvGd4z==?S&g%Q*k!6*+?(%~4lKhGa
z2fo8iBg+xT)1cz~1^LM(`K3k46D!NzrA0b!2@EvmY6FcZXKJIzY1M3g?$W|Cfo`!z
zgDcqh*)=CGjadN*hK)uk1yH6#IF8^dnX}+*jXMT$n1TiA9R1DBKs-*_;k|$-@FZ6P
z85qf1BO05#{3JZ;@(%Rn=z@+eaH1=M(G3wCW6&K*2*DtP(sCFT_dq_vQNYs`=#6Sb
zVjrSWj|b@H7@Vh`JBY`RNWfhr5>^r;n=BI1Po$#17=aWqihEfYEV3~~OhuYU6yi}a
z4?~54VPZRmi~UF!hq%{-3~>r0#VtH#ve=4FLPI83qv(RW$irxifnB({m#OxsE)QeX
z9!Y-hW2>Zb$RcZ9T*r7!Aakd<jER&q1Pf0KCQ<Z5ggA?AN>;>(<H(`pPozhXOG(Ed
zagfR<KoaCmOvV)02u#D%c!uVlrT5Yic#qDp>tHTU)A3wKzkDDvIwJaagy@(qhU&i}
z*4l1i#SCgv@h#$iRs|y^;6|~EmNB+_!Xy<eC(VMKbg~K~BNgG^=3b9h&J2@}GlMys
zuq}UA?55%ppW=&uQJhW1IaHkc-xQZn@f?&A4-toio9ShzefS)8AFZPet;2^_-7CXf
zj`Mh5WvzFooI4fVv7oYz$3mXcL321Q@|xp?=`^dH<8<|CMo(94e3Nk}#9pkt=EX3B
zT4%N+=4`{@^kH!P1A}+xUob2phQ&V0Q$u^TqwJ=+;{V&+Vwzim=ZRC5zsE<piz_bE
zWSwCA7TVp!5X@W#U8&J|PP#4#3(=Y0QXz<A#%l<~QZqR^Q`rl6kt5gvylp~B-Xv1l
z&32Nd)7T8kU3t%!pG&CHjKdO6%UVH+7Naig2NT06b`@YbbE=9MR<Nh6Wbb&1ePR_m
z*lHGYHH&u*3bBrfx}GN+)U&~^vWd?|9j?G&@7;{6*ka;V6{zE)S(PkgoNFy)oHpx|
zb&O-Q$2#`VNP}6b{`~wt!E0><ueBrC4}SNELhq=2S+x<7_mBvS_Y|T7S1fCF#WK30
zimr$<10*cOt8%i|HOLpBAlpeqP1fRFsm9Ho(c<B{@WGx(nh==4ziTju_$CbD)Pzn=
zc*w6lQ>&*+&^tBktD4!~!x#}@7gxK9dJny~m#6#by#wvyyVe)q4ejXHw$ZP>Pv1kg
zieFIE0k5i7URAuaqV3s<G$8>tS6VY3ZNxzJ^oVv(k7`pZxo2TaRo1Akwu*li?P@|+
U&y9t(cm@SAHt6#yEQqoF36m0mlK=n!

diff --git a/build/classes/rush/TaskDeleteJob.class b/build/classes/rush/TaskDeleteJob.class
index c8a8dc34b17e13bff0bfd0de848f60c96da83db3..50f771c1454aa8df0826be4343148aa0fb59d14a 100644
GIT binary patch
delta 14
Vcmdnav5jNGZ)P3?g^m9$m;ov)1ycY3

delta 15
WcmdnSv7KYWZx&ty1*47sESLc<nFWRb

diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotupdate.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotupdate.html
index 10f547f..41ef124 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotupdate.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotupdate.html
@@ -28,7 +28,8 @@
 <input widget="edit"  name="mlevel" label="等级"  maxValue="100"  minValue="-9999" style="width:400px;margin-top:5px"/>
 <br/>
 <input widget="num"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
-
+<br/>
+<input widget="textarea"  name="remark" label="更新备注" emptyText=" 请输入更新描述！" width="400px" height="100px"/>
 
 </body>
 <script type="text/javascript">
@@ -57,6 +58,11 @@
         data['state']=aos.get('state').getValue();
         data['mlevel']=aos.get('mlevel').getValue();
         data['mprice']=aos.get('mprice').getValue();
+        data['remark']=aos.get('remark').getValue();
+        if(aos.get('remark').getValue()==''||aos.get('remark').getValue()==null){
+            aos.alert('更新备注不能为空!');
+            return ;
+        }
         aos.post({
             url:"rush/hot/update",
             data:data,
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotwireclass.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotwireclass.html
index 6091924..8153741 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotwireclass.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotwireclass.html
@@ -32,7 +32,7 @@
     <div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/hot/getlist"   onrowdblclick="pay()">
         <div type="indexcolumn" width="35" header="序号"></div>
         <div field="id" visible="id"></div>
-        <div field="khid" visible="id"></div>
+        <div field="khid" visible="khid"></div>
         <div field="custname" width="60" header="客户名称" align="center"></div>
         <div field="custtaxno" width="60" header="客户税号" align="center"></div>
         <div field="createdate" width="60" header="创建日期" align="center"></div>
@@ -42,6 +42,8 @@
         <div field="state" width="30" header="状态" renderer="statetype" align="center"></div>
         <div field="mlevel" width="30" header="等级" align="center"></div>
         <div field="mprice" width="40" header="金额" align="center"></div>
+        <div field="caozuojilu" width="45" align="center" renderer="onRendererCZ" header="操作记录"></div>
+        <div field="jiaofeijilu" width="45" align="center" renderer="onRendererJF" header="缴费详情"></div>
         <div field="caozuo" width="45" align="center" renderer="onRenderer" header="操作"></div>
     </div>
 </div>
@@ -70,7 +72,7 @@
             return "<a href='javascript:void(0)' style='text-decoration:none' onclick='huifu(\"" + e.row.id + "\")'>" + "恢复";
         }
         if (e.row.state=='1') {
-                return "<a href='javascript:void(0)'  onclick='rekp(\"" + e.row.id + "\")'>" + "删除(状态==>无效)";
+            return "<a href='javascript:void(0)'  onclick='pay()'>" + "更新";
             }
             return "暂无操作";
 
@@ -88,6 +90,40 @@
         });
     }
 
+
+    function onRendererJF(e) {
+
+            return "<a href='javascript:void(0)'  onclick='latestrecord(\"" + e.row.khid + "\")'>" + "缴费记录";
+
+
+    }
+
+    function onRendererCZ(e) {
+
+        return "<a href='javascript:void(0)'  onclick='logrecord(\"" + e.row.id + "\")'>" + "日志";
+
+
+    }
+
+    function latestrecord(khid){
+
+        var param = {};
+        param['customer_id'] = khid;
+        aos.showWindow( 'canvas/rush/oldpaylist', param, '600px','400px','缴费记录',
+            function(params, rtnData){
+            }
+        );}
+
+    function logrecord(id){
+
+        var param = {};
+        param['id'] = id;
+        aos.showWindow( 'canvas/bureau/hotlog', param, '1000px','700px','缴费记录',
+            function(params, rtnData){
+            }
+        );}
+
+
     function huifu(id) {
         aos.post({
             url: 'rush/hot/huifu',
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
index c8dc9fa..3feb1e3 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
@@ -203,9 +203,12 @@
 	   }
 
 
+
+
+
 	   function exportExl(){
 		   var base  = document.getElementsByTagName("base")[0].href;
-		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()))+"&manyi="+ encodeURI(encodeURI(aos.get('manyidu').getValue()))+"&company="+ encodeURI(encodeURI(aos.get('company').getValue()));
+		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()))+"&manyi="+ encodeURI(encodeURI(aos.get('manyidu').getValue()))+"&company="+ encodeURI(encodeURI(aos.get('company').getValue()))+"&custname="+ encodeURI(encodeURI(aos.get('custname').getValue()))+"&diqu="+ encodeURI(encodeURI(aos.get('diqu').getValue()))+"&problem="+ encodeURI(encodeURI(aos.get('problem').getValue()))+"&callstate="+ encodeURI(encodeURI(aos.get('callstate').getValue()));
 
 	   }
 </script>
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/HotWireClass.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/HotWireClass.class
index 2c75cee06fe1a7ce9d77c40ce6a10802f33d12e0..2ea30999aa1633870f11352069ab1fffc63e98af 100644
GIT binary patch
literal 9153
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

delta 2320
zcmb_dYfzL`7=F%vEZ^B>S#eba6ck7#u3kt=NlhwDMe)K#D-9KJ5kUd3S*vJ@7ZmwQ
zt<>_CmxxpnNmJ7<7N(_^sj1U%XPTzzM>bR0bG}`Wis?tw%<ehwxqR>YJn!wC$+$GY
z)AGmhQvgzM+m0wyON_T;4c1Cbl$a!uEs-OUE0L#TogH>{W4)SdBsQpdqeQL5CW$%;
zL*ivSUcqLGEfQNLUX^%F;&q8_c5KHEi8s_IZ`!dFyCh~y?4GG(k6P}PcuU>cC$V3x
z4@ex8cw3@gt=`emAhBHHU5P^yhb4|kG}@4c_au(m(S&0X%@XfR9G5sD@qr?-QO8Mj
zcB*l-xGkJGspGVc4@pGF7$a2+x8Q7Jj<!t%;3EMoqo7hC#VFJI8Hv`VqQN+5eb6}S
z?+zG_$M~fKALA1vMo)3#Q=Aj9^y%xsXZYNhrB9_+2U>96xS&tb@r45yaM4JT{X6mM
zmpZ<3;1Vti3^3*e^fGE>tbY}*v@UPRu2H=IwLozB{EAtH1qIW}%8QbU3M$8y7maaO
zR66htt~LhQ!h}|ZZ;eEIwKf#PjAnZu9oHPVjvGd4z==?S&g%Q*k!6*+?(%~4lKhGa
z2fo8iBg+xT)1cz~1^LM(`K3k46D!NzrA0b!2@EvmY6FcZXKJIzY1M3g?$W|Cfo`!z
zgDcqh*)=CGjadN*hK)uk1yH6#IF8^dnX}+*jXMT$n1TiA9R1DBKs-*_;k|$-@FZ6P
z85qf1BO05#{3JZ;@(%Rn=z@+eaH1=M(G3wCW6&K*2*DtP(sCFT_dq_vQNYs`=#6Sb
zVjrSWj|b@H7@Vh`JBY`RNWfhr5>^r;n=BI1Po$#17=aWqihEfYEV3~~OhuYU6yi}a
z4?~54VPZRmi~UF!hq%{-3~>r0#VtH#ve=4FLPI83qv(RW$irxifnB({m#OxsE)QeX
z9!Y-hW2>Zb$RcZ9T*r7!Aakd<jER&q1Pf0KCQ<Z5ggA?AN>;>(<H(`pPozhXOG(Ed
zagfR<KoaCmOvV)02u#D%c!uVlrT5Yic#qDp>tHTU)A3wKzkDDvIwJaagy@(qhU&i}
z*4l1i#SCgv@h#$iRs|y^;6|~EmNB+_!Xy<eC(VMKbg~K~BNgG^=3b9h&J2@}GlMys
zuq}UA?55%ppW=&uQJhW1IaHkc-xQZn@f?&A4-toio9ShzefS)8AFZPet;2^_-7CXf
zj`Mh5WvzFooI4fVv7oYz$3mXcL321Q@|xp?=`^dH<8<|CMo(94e3Nk}#9pkt=EX3B
zT4%N+=4`{@^kH!P1A}+xUob2phQ&V0Q$u^TqwJ=+;{V&+Vwzim=ZRC5zsE<piz_bE
zWSwCA7TVp!5X@W#U8&J|PP#4#3(=Y0QXz<A#%l<~QZqR^Q`rl6kt5gvylp~B-Xv1l
z&32Nd)7T8kU3t%!pG&CHjKdO6%UVH+7Naig2NT06b`@YbbE=9MR<Nh6Wbb&1ePR_m
z*lHGYHH&u*3bBrfx}GN+)U&~^vWd?|9j?G&@7;{6*ka;V6{zE)S(PkgoNFy)oHpx|
zb&O-Q$2#`VNP}6b{`~wt!E0><ueBrC4}SNELhq=2S+x<7_mBvS_Y|T7S1fCF#WK30
zimr$<10*cOt8%i|HOLpBAlpeqP1fRFsm9Ho(c<B{@WGx(nh==4ziTju_$CbD)Pzn=
zc*w6lQ>&*+&^tBktD4!~!x#}@7gxK9dJny~m#6#by#wvyyVe)q4ejXHw$ZP>Pv1kg
zieFIE0k5i7URAuaqV3s<G$8>tS6VY3ZNxzJ^oVv(k7`pZxo2TaRo1Akwu*li?P@|+
U&y9t(cm@SAHt6#yEQqoF36m0mlK=n!

diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
index 5c82100..d2b7bae 100644
--- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini
+++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
@@ -1,3 +1,3 @@
 #save ini
-#Mon Sep 25 23:35:49 CST 2023
+#Wed Nov 08 00:36:33 CST 2023
 deploystamp=1612237236000
diff --git a/resource/html/bureau/hotlog.html b/resource/html/bureau/hotlog.html
new file mode 100644
index 0000000..981ab6a
--- /dev/null
+++ b/resource/html/bureau/hotlog.html
@@ -0,0 +1,31 @@
+<html login="false" auth="false">
+<head>
+<meta charset="UTF-8">
+<title>催缴记录</title>
+</head>
+	<body>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/hot/gethotloglist"  multiSelect="true" >
+			
+				<div type="indexcolumn" width="5" header="序号"></div>
+				<div field="create_name" width="20" align="center" header="操作人"></div>
+				<div field="create_time" width="13" align="center"  header="更新日期"></div>
+				<div field="the_level" width="10"  header="更新前等级"></div>
+				<div field="now_level" width="10" align="center" header="更改后等级"></div>
+				<div field="remark" width="80" align="center"  header="描述"></div>
+
+
+
+			</div>
+
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	var grid = aos.get('grid');
+	 function init(param){
+		 var grid = aos.get('grid');
+		 grid.load(param);
+	 }
+	</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/bureau/hotupdate.html b/resource/html/bureau/hotupdate.html
index 10f547f..41ef124 100644
--- a/resource/html/bureau/hotupdate.html
+++ b/resource/html/bureau/hotupdate.html
@@ -28,7 +28,8 @@
 <input widget="edit"  name="mlevel" label="等级"  maxValue="100"  minValue="-9999" style="width:400px;margin-top:5px"/>
 <br/>
 <input widget="num"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
-
+<br/>
+<input widget="textarea"  name="remark" label="更新备注" emptyText=" 请输入更新描述！" width="400px" height="100px"/>
 
 </body>
 <script type="text/javascript">
@@ -57,6 +58,11 @@
         data['state']=aos.get('state').getValue();
         data['mlevel']=aos.get('mlevel').getValue();
         data['mprice']=aos.get('mprice').getValue();
+        data['remark']=aos.get('remark').getValue();
+        if(aos.get('remark').getValue()==''||aos.get('remark').getValue()==null){
+            aos.alert('更新备注不能为空!');
+            return ;
+        }
         aos.post({
             url:"rush/hot/update",
             data:data,
diff --git a/resource/html/bureau/hotwireclass.html b/resource/html/bureau/hotwireclass.html
index 6091924..8153741 100644
--- a/resource/html/bureau/hotwireclass.html
+++ b/resource/html/bureau/hotwireclass.html
@@ -32,7 +32,7 @@
     <div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/hot/getlist"   onrowdblclick="pay()">
         <div type="indexcolumn" width="35" header="序号"></div>
         <div field="id" visible="id"></div>
-        <div field="khid" visible="id"></div>
+        <div field="khid" visible="khid"></div>
         <div field="custname" width="60" header="客户名称" align="center"></div>
         <div field="custtaxno" width="60" header="客户税号" align="center"></div>
         <div field="createdate" width="60" header="创建日期" align="center"></div>
@@ -42,6 +42,8 @@
         <div field="state" width="30" header="状态" renderer="statetype" align="center"></div>
         <div field="mlevel" width="30" header="等级" align="center"></div>
         <div field="mprice" width="40" header="金额" align="center"></div>
+        <div field="caozuojilu" width="45" align="center" renderer="onRendererCZ" header="操作记录"></div>
+        <div field="jiaofeijilu" width="45" align="center" renderer="onRendererJF" header="缴费详情"></div>
         <div field="caozuo" width="45" align="center" renderer="onRenderer" header="操作"></div>
     </div>
 </div>
@@ -70,7 +72,7 @@
             return "<a href='javascript:void(0)' style='text-decoration:none' onclick='huifu(\"" + e.row.id + "\")'>" + "恢复";
         }
         if (e.row.state=='1') {
-                return "<a href='javascript:void(0)'  onclick='rekp(\"" + e.row.id + "\")'>" + "删除(状态==>无效)";
+            return "<a href='javascript:void(0)'  onclick='pay()'>" + "更新";
             }
             return "暂无操作";
 
@@ -88,6 +90,40 @@
         });
     }
 
+
+    function onRendererJF(e) {
+
+            return "<a href='javascript:void(0)'  onclick='latestrecord(\"" + e.row.khid + "\")'>" + "缴费记录";
+
+
+    }
+
+    function onRendererCZ(e) {
+
+        return "<a href='javascript:void(0)'  onclick='logrecord(\"" + e.row.id + "\")'>" + "日志";
+
+
+    }
+
+    function latestrecord(khid){
+
+        var param = {};
+        param['customer_id'] = khid;
+        aos.showWindow( 'canvas/rush/oldpaylist', param, '600px','400px','缴费记录',
+            function(params, rtnData){
+            }
+        );}
+
+    function logrecord(id){
+
+        var param = {};
+        param['id'] = id;
+        aos.showWindow( 'canvas/bureau/hotlog', param, '1000px','700px','缴费记录',
+            function(params, rtnData){
+            }
+        );}
+
+
     function huifu(id) {
         aos.post({
             url: 'rush/hot/huifu',
diff --git a/src/rush/BureauReportAction.java b/src/rush/BureauReportAction.java
new file mode 100644
index 0000000..ee42a7e
--- /dev/null
+++ b/src/rush/BureauReportAction.java
@@ -0,0 +1,20 @@
+package rush;
+
+import com.aisino.aosplus.core.mvc.annotation.Action;
+import com.aisino.aosplus.core.mvc.annotation.Request;
+import com.aisino.aosplus.core.mvc.bean.Params;
+import org.apache.log4j.Logger;
+
+import java.util.Map;
+
+@Action("rush/bureaureport")
+public class BureauReportAction {
+    private static Logger logger = Logger.getLogger(BureauAction.class);
+/*
+    @Request.Post("getlist")
+    public Map getlist(Params params) {
+       //展示报表
+
+    }*/
+
+}
diff --git a/src/rush/HotWireClass.java b/src/rush/HotWireClass.java
index e9e369a..7bd1f5b 100644
--- a/src/rush/HotWireClass.java
+++ b/src/rush/HotWireClass.java
@@ -4,7 +4,12 @@ import com.aisino.aosplus.core.dao.DbHelper;
 import com.aisino.aosplus.core.mvc.annotation.Action;
 import com.aisino.aosplus.core.mvc.annotation.Request;
 import com.aisino.aosplus.core.mvc.bean.Params;
+import com.aisino.aosplus.core.util.Guid;
+import com.aisino.aosplus.session.SessionHelper;
 import org.apache.log4j.Logger;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -157,17 +162,58 @@ sb.append("update  T_CALLCENTER_MEMBER set  MLEVEL="+updatemlevel  );
     @Request.Post("update")
     @Request.Get("update")
     public int update(Params params){
+        int r = 0;
+        SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date create_Date = new Date();
+        String create_date=sdf.format(create_Date); //鍒涘缓鏃堕棿
+        String create_name = SessionHelper.getCurrentUserRealName();
+        Map<String,Object> hotone= DbHelper.getDbService("call_center").queryMap("select * from T_CALLCENTER_MEMBER where id=?",params.getString("id"));
         try{
 
+
+
             String sqlString="update T_CALLCENTER_MEMBER set khid=?, custname=?,custtaxno=?,mobile=?,enddate=? ,state=?,mlevel=?,mprice=? where id=?";
             DbHelper.getDbService("call_center").update(sqlString,params.getString("khid"),params.getString("custname"),params.getString("custtaxno"),params.getString("mobile"),params.getString("enddate"),params.getString("state"),params.getString("mlevel"),params.getString("mprice"),params.getString("id"));
             logger.info("热线更新日志--------------"+sqlString+"-----------"+params.toString());
-            return 1;
+            r=1;
+            return r;
 
         }
         catch(Exception e){
-            return 0;
+            return r;
+        }
+
+        finally {
+            if(r==1){
+                Map<String,Object> nowtone= DbHelper.getDbService("call_center").queryMap("select * from T_CALLCENTER_MEMBER where id=?",params.getString("id"));
+
+                String id= Guid.g();
+                String remark=create_name+"与"+create_date+" 将信息"+hotone.toString() +"修改为"+ nowtone.toString();
+                Params paramslog= new Params();
+                paramslog.put("id",id);
+                paramslog.put("create_time",create_date);
+                paramslog.put("create_name",create_name);
+                paramslog.put("the_level",hotone.get("mlevel").toString());
+                paramslog.put("now_level",params.getString("mlevel"));
+                paramslog.put("obj_id",params.getString("id"));
+                paramslog.put("remark",params.getString("remark"));
+                paramslog.put("info",remark);
+                String sqlString="INSERT INTO hot_log(ID, CREATE_TIME,CREATE_NAME,THE_LEVEL,NOW_LEVEL,OBJ_ID,REMARK,INFO) "+
+                        "  VALUES ({id},{create_time},{create_name},{the_level},{now_level},{obj_id},{remark},{info})";
+                DbHelper.getDbService().update(sqlString,paramslog);
+
+            }
+
         }
     }
 
+
+
+    @Request.Post("gethotloglist")
+    public Map gethotloglist(Params params) {
+
+        Map map = DbHelper.getDbService().queryPageMapList("select * from   hot_log where obj_id='"+params.getString("id")+"'  order by create_time desc ", params);
+        return map;
+    }
+
 }