From cc20781b9107ebdece7f4b54b1cc7cf26066edd9 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 28 Sep 2018 17:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E4=BD=9C=E6=96=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RentNotify/TriditionRentNotifyAdjust.jsp | 13 +++++++++++-- WebContent/fileTemplate/租金支付通知书.docx | Bin 38739 -> 38705 bytes .../action/ContractSignAction.java | 2 +- .../partner/NewPartnerCompanyController.java | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp index 152f7ce14..76948ebdb 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp @@ -143,9 +143,18 @@ } - function stamp(){ - var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice"); + var filename = getItemValue(0,getRow(),"FILENAME"); + if(filename==""){ + alert("ÇëÏÈÉú³É×â½ðµ÷Õû֪ͨÊ飡£¡"); + return; + }; + var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice,contract_id="+getItemValue(0,getRow(),"ID")); + if("success"==result){ + alert("¸ÇÕ³ɹ¦£¡£¡"); + }else{ + alert("¸ÇÕÂʧ°Ü£¡£¡"); + } } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/fileTemplate/租金支付通知书.docx b/WebContent/fileTemplate/租金支付通知书.docx index 7063cfea12eece40d39d99e42d40ddeeb79f3742..bfad625675028d17eb4c72b98f162bd4aec8cc72 100644 GIT binary patch delta 6677 zcmZ8mWmMFUwq=Ht5*RuJq#Mbh8zcp!Q|TVM1b%dbz|h@{l%zD$-C;0{fOJX=BJlqA z-M8L->wP)r!&xWR+8_4X`z+Rj8|%R-!kCa<0}9VnaaurE^VK0gQMXLoBhhx@ifSJD z+!sV-%(I2pAC_d_k9mGdQnE7rBzL*iTtPIEft*S76}kf%!h*B9OP{Xf2IRi?&n?#Z zG;b&Riv9q3B&jK%UYS}T41M*Ra)Ha^8r$H9_@$2Z%dvsTfR&LwUMjrmVT)+u@#yrr ztDZ!R`{eJyu>n_i<3WWA#JK-9eZy37@eRDApI=JcqIYC1SHytsJZd!X7kfh}^}Da* zu~q@Giy#^tgv+n;?+FKMC{NH4-hkQ(e=PW0V`$P9!CS4V#>nani|Ut?kN}Gr#P7V& z#}(~6%m!;YUyGA&@8hc7(Be-zzO5%Z=@48I1|u%u`&%Wi*t#Py_>PtEdUm6K`Fe+c zx#|HfIo>wkXfE-AT}S#M=Tb2|%B#RYV1X}o+Nod_SUu#}WeQB3ug%vga=ZAvY2|Bf zJA7F>!MfQrP99)v(_K69L}s@e;Sg7)Ec@G{EbvVH1QXjA*Rf-8d00YQ9UX%d4Gj$k zEk+CPr|fOfBE1&~4XqxI0qhxwSP7m`u4?xB%u!Y`VQ z(lto2$Sc|Vp_n44%&s}?Y!1g}hFet5+P;L19~Ytf>?-DP`LPFAj+}6q##=YP z{#ADn*@dcaOK_t3Av65`0@)?*gz)w;1Z$J1>wL5xK=WfjfBI(B$90#nvscxgeIFu@ z`-FfgH;tG^TY2ntqA8#+XbE~>JHSlO_pu1}E2C1P`UlhIm+AXO9MsmOvvV1 zfk8LF+B;ZA#M_sSFH6%ejY;X~guLny>gl3f4@p9VcV+4L-`CSp&s59FQ}m?qUG%SR z(-Kx34ZkeU(q{&N{x1SQWjC*P#1Na97crZF8Fempaf}a%ov@33{WWT3nsSk^T z8;l%|V4Xp!a+pF^(moXr-Jp1KX1YeR9w+%8e}6ksAb3OmMYRl%QUwEC(y?DIO>uhc zFKddE5A*p-sGI=i9q2a?07flpsiLlQp+q>xxc+A$Q!jk~KG!=eB|1#G9I5^iGhf)a z|886fu)Zmeyv`;`vyv8rky68Gy8~~J9@TxLKOV2{wB1vLZ2Le>Wx)>++<8tnTUe%?G@25A#Z*J%gylB8wt)q~@w2oVF9*5LOs0o%m}8 znU)rb#fdAED59Dx@HgwlU(*sB|6|{Kvs(gfxO_ZSb1jA_0d9fO%o#2g8X6`E{Fs;u zP=_I*M7?|skBp~Mt?a4kHcLF0R*TOaBRWx1ivq6BOmSeAQJ;`|!mHRtJ6%$97v9vJ z=^U6c?dOoYI!?Zm3`ab3KKrc~6mg+;<+8#8BPZ#2R+hxsX+DaOLUG!Aj+^LCHW9=B^srjBd`Ch2yb}4w}99E~A zH}X!DN=%!NZZyv)TFekuS|qaa);t&OTt?1Rb6@(JZaMuGb&trV-T2u3ETM;G27EOYDg&o||8B|d0&&K*VH`EGXVwbvkRmu^ zHVv8(^wUItrsk}xE#<0rBYt%VV;&6c7tN%$Z3_mMuPBgxOlVEDV;4m0Q`Xr|_}yhf z)4>bUQ<1laq3Jv|F{Bt(D$^iT0z?1IxVTZ#-0S!`&Wlt?q9zLBuRuhOxXa-;J&{IZ z4DHeGps5cTmUM}Yo`!1RV+sHx>I+J+e;Oyp6n$!S0F(OzHGcsYUd6UcypHR3$x-jv zRrTWZR&plFza4eE_a2qB~g$c!xjEpW4V)ram`p@~WOhpu{&jaPvpUl=}2S&h+rR6pdMPbjQ zZoKP+sluTjbf8!LRNLV0(ywvPkQYsR7cYqZ1lq4r zXG_!sHy%sZ5Jt=Mafv?CuAFotmNPhg?@odVsQ6SQ>PWt~O71Isog{p1Cp^UgeZ#{g ziFL3w`#5m3 z?G&N`neZaaVyC>^SNu_*^Ql?VBe@6uJ^=Yw!Vuf}Rnj@Xo#39Zlbeq-JEOzeya^IF zFI`vmHw1+a^{{S&FcMj;C5##cN8fVee@m&LhlWuIJl$3lVzCAUABvd}#Ry^f4Zh*p ze$q)CYMQegoacIM>#9d(`PsJfI9Pn>-3A~Bp{$HBzz}VMT@dn=VA!L7|+Rzpeb#{Jz9 z3MDI2BI@GygHd_3z;X~Z<#Ac8fd!h5xBcip7mwl-?vGkGYI2aNs zyK{10>m&gAVm1S%4~pM&VL$%f`&l~?=qZP%uIStRV#K+XsJB4ap1&hEPEsnON9bY$ z@sbSjN;l^AC85z22^e+SO<_a})q5jYI6U{PF-G(pAbg zfB6mgGbXXnSNIXqO4Y|IRD1rxutC?+Owb8*c>t(~x7h_YQH&-ywR^KRndHe^tbU7v zoOCQ(xt{ziExd8YoQw;cFsAzgxj6TH(~`lh4oc`7+Jl(zh%~5|J0bIUVCCNnj+05S zD%_T?2g`W6dN?i!KYg@2^%ZKO;*Eq$wDTri$5XpqEGxpE9xj*b4=&t9V%Dryy|X5m znFaR6c*Sq(NxPFaTi#u&UFj)XsipECF77uqO0xvz9w>sfz#UMDV9o&LR>&IA6NO5r*g z)XkWbw+PZo3`n$Ruo11zezYvG~(s)FV z`PCU(>X!eKN=1uyy1gKAyXE~eoJhqX=1>rW&N)0^@zb_C_j^c}?^658k`|J^$#jj` zSPMve5+8VOxpyLlEebAv87rW4yC=u&AqKVgn*~nV-uXV2{^MVwr!hSl{lVeD$Yk&M zRh5nY!g;*7MCQZ!k-Zete!63vlLfa^wPdD6`t;@K=I2M0%C?yWd`GRxsiOGF@>GV8 zBe!`2x763K_G*|N%(*=*N&-T!^BMzL>Xxder`Xe04ZkD?Syo!^v8{P4z-<;IcQs=V zx*dQ@W3LK#=Um>J(^{%&_PEUNHB`;PEb~yAs^7AQoems}YC4VNCC3kpRaCCrQuYY3 zFD1{~6#UhbePe^6ev~CTijrAB0@8FsB^zf`66UZqh4JD~2$&q5`G>+6D{hq|viZmg z4ktQO2&87|JOw48j_WU8*R|9 zQq}fgih8V6--v&uMwIl5mb*rewf#yJ*Z2^jk@7lPq^b)wpApe2@}bZVIgo>rpZyaf zuOMjZ#31y$3b&N^pXzj+*y4g3o07UWk|%4j#};*zp;!4bsQDG;Uc~Dkn)`aH6PmzG zbuOb8#akC!#yn2E2#$P)eUCZwMUxO>8K3iCco9Jw#tBMd`ZLoB!;Rjos2J?!4ic#v z(%poaj*#E0Hq!33vwjiTkGNPK$~innaHrEI&lx?X`&!=#ZFx3to$x0(by}0fd&R$s zQzykdM$+V7r2bOE{4UJD^#B!&u}%jl6vs>H?$kU3S;9gx2?Cdj(O*a}>P-%bXsUv! z#NV<%cS!N9cb6Bw|7<(oqLq#7-uI*3Ai#^}V`}K^C6+whMfgQANSW_q0OOP9%a`v# znq%;d*Q3wY+1P?5RAm%zX&9u$3|S(Msl7-uqmr=Qp=RL&o!1 zTv!{?eFRzH1kDN0YU~Y{H1@+wwAh}x*PMS(`B~?OZd>Pjd)rlT2kKC8E-6qc7qg9v z#w01-%HcE^CUN-DTs%Ui7-BCAAPXVcKJIRR(%FGPJnc&LoCC){^=Xz-M1b-OjYFXq zdEbcz>QGD&%z3mtEZ)Jp0;DV1l|godyc?fPjSGP7+1uqc+Iw5w)N$|Y*!m=gLR(6C zJg9aIFR_{@ryzQu)=a(f!D zefJMTWobdJ!@B}|9N=fP#i3puf!mqEUXV(!Q1f{aX9g|V9NK71@8ZpiEXIKt(=Hh| zG}+a=J4-Gka=EJQXgUGVOoY;iT8T8A#!`tNuBW$TeGX{z>In?C^}F3YSkb+jS)AA* z(OS4e^q8gKbK>&WNCBXuwTMX^PdkdBW*5uAw=xgZEfi)3=Ef`cqrOtL8-ls*w_#7B zgwE~|U%ZKVD1x-tsCqHNF_^pq`!-}EY`Nc8s9*^W;Tk1~qYVOo!}ly?tpM4L;+)yMf6A4GAvzm{)B%o;6SIpiP_SQyHNTo!HMvEKQS>ziUfct zF1!J!$|`%p9|YJ(g~XOhBz4GdEJ*Bx#FV}um<#DDD3LLLF+4{yvA`XqH;e%}XvWotPth3&zG1pN*C+!dlQ)IVgwU1G9o#!B#sZPF z!pt-U1ay%Vq$avJ4{p2h2?J}#weHUbZD6nG+RDNhKLa{FckG29p)?#s>+TG(ePZcJ zp`GK!+=E%Dr`X?2T%~AFc#ty8s%~VJJ>A0m+XnsGhSO%8d2E`fm z^5T?R!fY6eNa;JzFws!)KgVVIJ9$X76+;#_v9rALSh$jv zd7Q*^w_mXWSNZW1b(L{|%JL>F_PwRz#Y^q_#tHOYj5f?6>D1AfLoMEC5Vpw5pr)xf zuD4y?C+AST=Mxq^IzsEf{f*7(YGJbF zx~(x^^B{5al-6pB&&dgr0<{TT*D;?woSR;pJIgaz9>CP#W<3-5^r3_&6pY$2ugvXANx65Tk zrJ!GR-2W{}{K3h{_iF3uu$GLjzJgWRH8Xk%JGR7Tjw<)*0#b5W>XIXp6#Qq{hpNdD} zMUF(w#}e8c&ss@!43Eq64L`L0!k)&aHlM|ZGlC`68$1pM;_^QSGS@4DW8e?OHpOcW~xjyxM%mhIVjas5-(Xuaape+Ix2o)cAc0 zEph83_Qx$@k!1A~|&a^>QkW3Xa{d14Q^9mX2HPem0v2l$!n)Z@fm zSLkglr2}=h%YAMx{4v(fmpfjsu$6ij&S36Z@r7aYRy1$nXpqGhFjXg%0U&|>Hm%3I zzs%8wX^P+TE~v*KrjE}>G5h%W3lH`svlzLc9Tlbc6m*XpnV?FFtUS%`w#s=Ev?7DqCn z%^2Mhr~svLTsD`r3v6R8|Tvv8`jR7^IFHU+Td9|w2 z+r|FS-f)2@I`6-yTW64J)sEhnT^l-E`_tm9gq<+4nN)dj@kf{P0K0{ImsgaF(GZv# zg}y@u!o}~W(vnl4g_P-8-P*Sqr2ph#-4FwRwhFpY-8#Wjr-i7+5yoZ3_5R*7g>3@X z!+tkHP+$0L{VOf3do6LWN$*wl0rSu4W$iK)R+>(_X$Wi-uUcB+9fUTQdLo%niSZ~< zct|8TM@C1_&K$J`xTePSxMhXQ3j*m^aDcd~^An+M&zTACc=!*50_`Nn_$;mv&@kit zflcDcXS)1$?DOyfemRCpqP8L`)exIQxtXNioA74ufh+%uLe}5w$@9+y&ECH=RoO7m z=(SxQ!_RqRQ(Gs;$xaY*z@&_QBTNF*Za7%)5-j{eaw&*Tok@9u;kjDyOk;{_B*^(Ka$IrdmF>ma zl?yhnyVv-%tyh?1e$%Sib23^KdBo=q@0~YIKN)UcKM~@&c^ESG3w`rSp3^^Oy;=M{7wRd`j;sZJ1LxO%ZU%j?9S^9K%Y-q zm7$ASGwZcza_4m(vKWF0iLK)GTm4-Vw4N;SPxf1t2z^M~ejy?KmZ68ojp?fSM%Ozx ze{U7oopkf^Y?ZPUAh)*>5B-@ohwagr=S3%xt5sa7K&y$ZJ+YBg2|=v)m2DVgn{Fsy zWwFz*;{Jj~VPlxw)8P!v8PfboNL)#`J0YV|8nR2NsI7`*Ew4&$y1$bC06jTcD zOcf<`Oh7}k_VMzDxf;2;@WHiH$>F03M0o$|2B9(h6SLs_Y3iT}cu<-ws2kpsX7%r1 z37i=&M)SW`J^0`9_CH;taDO;6#=o3ocrlzD?1&Br(8=J_aLy;$82=-K;r*GMp!aaD zbSStz5q_Qc3?7lr3Brfhr}NVMf8G3_!Q$}W>C&K7xJZT!n3NLkmmvw7hPPxu!PkoL zlMFe~S2%wr3(bFw+W&tT67HTU4eEk_%#;Kfz>hMaV1O0w#!3N~$|A!0obs}?;>GRl zf9^Z?&b>1`XZOR|ot@`=IQ#szp%!JT7A08({V-Z^&pkzw7L=->gW$)DJW+f2T6xXu z&;kwZEYOo@WXfpjP2|*oixj;nVr9HKIiqyi93DF{zWwWj$t!oydn?b-Br+w;a4M`& z>{LAVB};a$Wr6jLBBU%OS48}c80Dm<`xg{XSGv0j0oDlqk6AE*cHDt5$A)ho<(*&W zrd`70Ss$|&Wmu4rt%=a<&48MRG?O_wX4nSYaQ&2Yj`L31siklr z;o`)Fr)5W&n|UqV>xj^^t^lUz(|oKKAMLJNuM0(hVt0tR7tqms_+d9Kr+*v+;JF9o z&vVklEz=EV;@>&-WFNBsR-g;*O4itvbTg)3D4+igs+*H$m>8st=Rj;+igr_xZ&q<} zkB?V53G-w-rGHZ%7^$Q^!`@X^)|AEoA_GDXkcX|rwDS!m+sAdhT>xE8R5UUG0DuMf zs=a|D|7M0b&jknodpD#5+)jYfihE?xz2AhNkR_J`ozyejfw~|x*tWx9$!e} zQe%35Op>utmjA%WD|tn_P3D}#O*Qb|iE-Cw?Zu*)VdPNTMXB*-Y8;583qzXKCf?J{ z)ML;c9d9Hr+N6X`1{x@8jGv718biX~PJmALp~l)-`!rBJKPl?$OyV1d*zTCp`GHaa{^C6^ZV&4 z4z5)uvIH;j)gh@&aYdi}rRHMp`297X#m4-_Y0Du{;*VZ|kTO)(G(yx529F&!`cg+D z?RU3rseJ!SeEH%oR;H(ar2zfYpY-2s1CB-|1ttH|3FoJbI$?hzd~;G-ic5f1kL5%` zm?iGZ;k=->m(+yLHt>v0-R}%|I1lze?{sarPiD!8^bUW|7SDnbs;hOOkgIv)BV9m- zvMbf!p~tP)t1RAHb$k*_QI$|1OhkYd;lbAF=jstp*MYUr#@WZk3Wq^2)|>3A?}IIi zKr>FMivC*I{y&^N%r$LX#QnCn8=v`7Kf@N=rrZS-TDXGOaQ8|X{IKPgN*tCVSfh^{ zG5T3+^XRsS%(e=PLscY|mur>=+T z?%av4>ar-fXwT|`#Nl|8CU)~%UH9xvKU~o4d-i2m7h@dm%vL*R_R{6XNJ1+fIfWTt zw&HtGyWU~Hx_8`M-P6P7w)@QYF3g5w6fI$7<@j7&&}vK7Hgx2=G98JFti;HWa&}xm zRJEDSPA=0ej+oBX{26gJPJ49NC)#+$F7yR1p7BW}v$c9;c~AS~OBHmo!z{CEf3^B! zaQ{g~=D~w*RT+acZ$c#_2GZ*udi3e@<%tO>ob0+W38UmFA{g=ChrQghfci`JFD{cSdjD`eg-ZH z!q(Y9fM~3w1-!$#DP;*q-n+!<42S5lz&ps@w0U@If;EJNDX!Gki3#V2eWl!9uqQuA zg&}LBCRHBwEC9PpODWuJCk8wh9kr=QStw@z4{3cdmGsv#D!q)kLC)*q z3x7t;o{ca055uc@o+P{;4Hha|Dm#(aC)5>wA`APFpS4@+40j4X($b=vXQ&`-Q78sc z!t}mc+iau>;LviILp+Fl_x(pS(tDVwoaE#Lw|xsW%JScGoY>jF+2;z%Z_enUoa@Qd z+zWCMox#0p z;#QzKOQ`Y~V+festza@ZM#I6lxpCt z0_-O+>`xvOq9>>D`AC@+Z=wR;_kt;wONXCB$@)Tu5Sb+cbd4i(G9Y)Pom968f#WW_``+Gyf@v0OQ)eZ_|-f$Mu_A8_|2+MoF zl`o2$Wn@_%o4}3=!|+4vEp~|5Fo{@3*eR6s72BgRml6cW#!O#JkY^(zzu8bK8YS2B zBOHlJr(d8UDhdRWtk8-fepGRRtnUswc=4stFsBI>RnWswD?r9-6M^>R?yVnLG9@8{ zJY`rUbR6+&2P}G0MA;OAHsm=G0c8D&G*V1MXhoZ44Fxp?n=u{Bod5wbzOe?tSc| zFLC4kZs=2YZv)!l2$<=p82oI-d|2~xyT2Lvu=dHM4z|O~o1NKhP_JF#Dv^!w`DAXM z7+;%iz_xZED-^Xc&E4^;#8E7xrnaT3wDNTQBxG|#)j?}6`vPio8wLJ(nDoiLxAJV7eDSbvG8@e(PwxctrBOEuQj)*Ge$G59jVAc_i~;Mtq5{!< z@SJ*o7i4!O=l4JmL(9RM$xfFA6Ba_|5=%`-b*irLphAe2CkvJ+9JtDt)CP{7ZLpXyp>%US7+ zxG1v;Qh;4JwL0G0M}0pytu{tf4krdJ*Y99dLcN1mq%n%Kp~YkNFUE``8bFw;H~a%i z!7G!43lWL_q`e;o_9NyoyAh5blt(@Hb58`Zk~s*B9MN|y_k4_n9&K&t@Y9WU-kIz* zMMpYDS{MqIS}k34viXLG`@U+!s5r%RqT$7$Wc%{2S#dq&=CXmBt|1$UU^#WKf|do4 zj=&}W6(v2|^0tsr(lZ8$WsvA~V*M+kI|AuRwDd*%@EmBo|5SG3_am1khsRDaau1)_ zO#H;AS7X{D@-!#;FGtD_-V8RC?>G-uba6{T#awFMOPLEDZN`qHsfXN`6avM!S0TR) z($4lJko8-cIMp@mFFZvY#J}RD=A$i$SVPFqrdXe4p+5(y>>7%896_779=6ODKMB_q zg1R(*Ii^M8$cgRcX7ffS;-k4FYv%u8*8c2iYiB}e@t&r|dqMhh4zvkIT2>7}?X3{v z!jjC8QrlW=l|HOs%=md78?{GGeHNUPHz-m`VbfnodatzJ_*P!Fid@F=ccjq?O}q7G z2CN8(pW7r%#j57q83=mY65egF;G?}rZTSP)Y69{nt4Q z&R8-CVBZ=#b=bf=eHYU8t$?BM20t{9HZF{wKQuXsMA3MPu7DxRMbSluErD*=kj9ri zTW$r}6&FaFi6=!}Q>nse zEh%fz@=$NE3qTKBT=qqt6O$L77{+8D-_7K`N-e;55JL-&r+YPDfyQ#aK*{aeRqK3hD z03aP(NTcPP{T@y(#>FNrs<{-CTSeKVx{TRjRVmHb63C*{?OIM`s$9*TYwLV5>4$cc`29+hWIrm+8J-Hy z9%FnnUu{2dsfL@}@hB06eTx~CCkxPzxz;Z)C1(FQlE5t{{|+eib>hXZ?nqV?+w>r* zXDDe91Y|I3+Id~=Z--hvc+~ye+|@ke=Y>E%G{wCjWUKMxjA2`dk*%FKdwRHx`<(EZ zdu*G5=CfwP3H^-Nw`6tK;=kuS_C$Ja#)oI5^3S5CDx;1*J-Z{vr5wlMzvRF4*e0Zv z?#RL9m%jqo#U(R~C7g0HabiE+6kO2igGMcAjD zW%k?$JXxPJk8=fRv3}aXmwGwXX0t`GG$GT3KEC()P$WSs#shkf+`C&{bKxC#5i*^| zMG$)P)<+MG8vQ3mQs6p~78_&QI?A|4c%N4yBQo5#_mQ>;8+F1z09+_1BiP?cIyp%j zs7*yV8}<>WSXqVRH)2#VMn+3@2UXH*{U`B>ndK-kT3!Lti&j$|#9;r86bq51=vK}j zrkC-+Ot$e`25jNS(NUkolqqUR5JOc)4f5WOifWrum?OuJx*F{O)F<29fyTOUtMt7XHdzZ@6Z+c5-UshQccE%u zGR$kQvQT!X%-5DmVU#GpG~P5VqVq=a-spj#hj9`KjJ8G!#!zUs(Gn@~g67(NYot=K zAU`7@FPUPLK1Y|NpsC;3mY(%{$RsS5P#EroIjuh6$1u%(d0?bqIo#atGvbg)vA0dY zmI!qi&yC)&guZe5WMz0D^2Q9S7wt$Bn7u^?(uq{3-YTGUH|$<{qK}(Q<@#k6M*DG) zN!d44Sj$v;(J90rS@#4>0VHsG=fe~3azQ~5%a;}cH#hu@Qfs46_CrnhIFdNl{!~*M zqRjPH3V_lXk;jabl!?3dLSG5OMp_{_>huL)&AhKc7m>@nc#3F6b~A$Zb&~?CLZef+TnI?Tgt}lh zs^eAZ<9z2=*{1~cB_^!8(9z&GuB;n$T1h4jue zz4UZS)T5coGp)WOTE_%u&5v35&HdKYVVmJ(tb4YT&%o|Dcde`+Zjvk_n)S{kcw-Y> zy#zX0L(C9+-;a;CLBDb$TYWBW`FJWGM?lC!v4WOmc;I)$Yj9_E{9zn7_-oto#GtB& z^OoQ&rjV##7^o>xMZ@W1jsvt9Fg;JtO#tpQzh^Upy~a4R#4DR zW~7uN_?D8*Sxf?#EMW@%A|8B$%isSfcAU8i45@MTNOfz#! z<8X_?p@$`|%m>IASeeJ%{P}pWbf?Ml7>-Y=h=D7+RP|0(u=vR6FDPAQk7w&upKdum z3RFSg9uy1$<8a9?!AR$Y1oUZXVjAmEKkF@NaL>N$xWk{cN5_{2C;Zuz#N z0Y>nqcjzrnPgrU?>fk#5ld?K<7RyGnQjfMGUkB!KZKvgmAITr#B5;y}2s1j2r@PPf zuhjcBQC;bJdZxjSYvD*t-w0SFvBxqW`cYXmNSv1H&>lax0 zKz2U~@*x899$`U;XTQ@o13r}(lbGI1Q29mp#Z0kIlAe8F#g#IP_G8)z;M@41lNSa# zX)R>iVM(-+=QtBVt*+-`FL+JzLH=v6B#2_Rt$v)zX|fT8f=3NeG`z-5sk?T~rSr!w zA1;4|ClFhhCDZI4Pg3yu$TR0C_wgeD4eQtr$xq9Dhi1CD*hE}AifD_>?q|#1Rf}q% zP9{^q+4BkE9m=$={*qkZr7zzirjB z4H;?n5Hsmj{T->f407@3c`povC^`(pWwTjeg|kGEHPj!dxR9W0(X2$xMmkIpa>&uR zpLs_CAb;rzP#9q^FuDZ*j9p+w3VKCS6JNwY)K49uG|aC zBRF_iMr+ST`rm?W3Q1*iYPbmKN~?!Y6W68=svW<#7wuHL*9fPylxc!`w7I>=78kqE0Drz2KAv?)JTZ%`6r(t7X%JX5O{s8_!`JleqRTKCJY?3Mu zTmfgNTK(6D2^a+|LG$0h9_7EV=sz+F00J2Q#R2epFe}=BpfWfZOb)aLr-9|MQ_=oE zIZaKW1-r4MfxFXjfDK@5h&XT&tO!vD@`B?byfpu9r<4BgsrcX-h%B%XOqM2xvP%Ir zNRtMhfK$`NQ7DzcqiG7jTQEU78_oZPwf}Rg8L)P`EU+1zkS+~;2_8-t2fhWPe&fVg JPySEN{{sfZsGa}- diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index bdb6702e5..bf2e8747b 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -2452,7 +2452,7 @@ public String claimSign(JBOTransaction tx) throws Exception { if("transfer".equals(flagType)){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='transfer' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); }else if("AdjustmentNotice".equals(flagType)){ - DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false); + DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); }else if("TriditionCollection".equals(flagType)){ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='TriditionCollection' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); }else if("TriditionSuspension".equals(flagType)){ diff --git a/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java b/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java index 3b22e4a29..2f7394999 100644 --- a/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java @@ -174,7 +174,7 @@ public class NewPartnerCompanyController{ BizObject newCustomerType = typeManager.newObject(); newCustomerType.setAttributeValue("customerid",newCustomer.getAttribute("customerid").getString()); newCustomerType.setAttributeValue("custtype",partnerType); - newCustomerType.setAttributeValue("custstatus","status02"); + newCustomerType.setAttributeValue("custstatus","status04"); newCustomerType.setAttributeValue("status","valid"); newCustomerType.setAttributeValue("isoriginal","yes"); newCustomerType.setAttributeValue("inputuserid", userId);