From f7f5121d59749c78384e38a5f42b3785f39b8699 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Fri, 10 Aug 2018 15:12:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0JBO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 5a032f01b..f59032ec5 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -20,6 +20,8 @@ + + @@ -4196,7 +4198,8 @@ - + + @@ -4210,7 +4213,9 @@ - + + + From e6e26105be2409d4daff8fd09cb2bc77d94d6481 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 10 Aug 2018 15:30:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=9E=8D=E8=B5=84?= =?UTF-8?q?=E6=98=AF=E4=B8=8E=E5=90=A6,=E9=83=BD=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=B5=8B=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenwa/reckon/executor/FundFundPlanExecutor.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index 06a7b1e59..fe2c8d105 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -213,10 +213,10 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp.setPayCust(custid); } - if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//ҪжǷ + /*if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//ҪжǷ if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01")) { - /*FundPlanBean ffcp2 = new FundPlanBean(); + FundPlanBean ffcp2 = new FundPlanBean(); ffcp2.setFeeType(item.getItemNo());// ffcp2.setPlanList("1"); ffcp2.setSettleMethod("payfund6"); @@ -226,12 +226,14 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp2.setPayCust(custid); } - fundPlanBeans.add(ffcp2);*/ + fundPlanBeans.add(ffcp2); fundPlanBeans.add(ffcp); } } else { fundPlanBeans.add(ffcp); - } + }*/ + //Ƿ,ƻ by K 2018/08/10 + fundPlanBeans.add(ffcp); } } return fundPlanBeans; From b63a97df5ed3d33afdab33fa2ca27f3247fb35a4 Mon Sep 17 00:00:00 2001 From: ling3492920 <2634243151@qq.com> Date: Fri, 10 Aug 2018 15:40:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=97=B6=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBTelOnline/LbTelOnlinList.jsp | 38 +++++++++++++++++++ WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 29 ++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp new file mode 100644 index 000000000..0bcfd2697 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp @@ -0,0 +1,38 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-08-10 + Content: + History Log: + */ + String ProjectId = CurPage.getParameter("ProjectId"); + ASObjectModel doTemp = new ASObjectModel("LbTelOnlinList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--ΪGrid-- + dwTemp.ReadOnly = "1"; //ֻģʽ + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(ProjectId); + + //0Ƿչʾ 1 Ȩ޿ 2 չʾ 3ťʾ 4ť 5ť¼ 6 7 8 9ͼ꣬CSSʽ 10 + String sButtons[][] = { +// {"true","All","Button","","","newRecord()","","","","btn_icon_add",""}, +// {"true","","Button","","","viewAndEdit()","","","","btn_icon_detail",""}, +// {"true","","Button","ɾ","ɾ","if(confirm('ȷʵҪɾ?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index f59032ec5..978e92126 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -4223,6 +4223,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From aa28f97191fdc378a2e2f4ce9984766da6031192 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 10 Aug 2018 17:20:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E6=B5=8B=E7=AE=97=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E3=80=82=202.=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7=E4=BA=92?= =?UTF-8?q?=E6=96=A5=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp | 4 ++-- .../Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp | 6 ++++-- WebContent/WEB-INF/etc/app/component/component-config.xml | 2 +- calc/com/tenwa/reckon/copydata/CalcRentCompare.java | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 326ff7a42..0cc57cbc4 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -64,10 +64,10 @@ JBOTransaction tx=JBOFactory.createJBOTransaction(); if("proj_process".equals(calType)){ BizObject proj=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); - sSerialType=proj.getAttribute("PROJECT_NO").getString(); + sSerialType=(proj==null)?"":proj.getAttribute("PROJECT_NO").getString(); }else{ BizObject contract=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); - sSerialType=contract.getAttribute("CONTRACT_NO").getString(); + sSerialType=(contract==null)?"":contract.getAttribute("CONTRACT_NO").getString(); } plannumber=SerialNumberUtil.getPlannumber(sSerialType,calType,tx); tx.commit(); diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index 1c2095dce..055396584 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -43,7 +43,8 @@ if(rightType.equals("ReadOnly")){ dwTemp.ReadOnly = "1";//ֻģʽ } - dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); + String id=CurPage.getParameter("id"); + dwTemp.genHTMLObjectWindow(id); CurPage.getCurComp().setAttribute("RightType", rightType); %> <%/*~END~*/%> @@ -74,9 +75,10 @@ var accType = getItemValue(0, 0, "acc_type"); var state = getItemValue(0, 0, "state_"); var FbSdk = getItemValue(0,0,"FbSdk"); + var id="<%=id%>"; var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk; var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); - if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")){ + if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")||sReturn==id){ as_save("myiframe0","parent.AsDialog.ClosePage()"); }else{ alert("״̬µ˻˺Ѵڣ飡"); diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 5bd437301..6e8eabade 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -1097,7 +1097,7 @@ - + diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java index 3d8bb8e49..4e3bdbeeb 100644 --- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java +++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java @@ -55,7 +55,7 @@ public class CalcRentCompare implements BizObjectCompare{ if(bo==null||"".equals(bo)){ return "null"; } - return "notNull"; + return bo.getAttribute("id").toString(); } } From ecd8cb785a28803689f2809bb1109fdd430306b6 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 10 Aug 2018 17:26:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdjustInterest/LCAdjustContractTemp.jsp | 1 - .../Comm/LBContractEnd/rightsFileList.jsp | 71 ++++++++++++++++++ WebContent/fileTemplate/产权转移证书.docx | Bin 0 -> 16336 bytes .../action/ContractSignAction.java | 4 +- 4 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp create mode 100644 WebContent/fileTemplate/产权转移证书.docx diff --git a/WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp b/WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp index dd97ed245..5b95bf5ea 100644 --- a/WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp +++ b/WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp @@ -109,7 +109,6 @@ } //˾ function stamp(){ - debugger; var flie = getItemValue(0,getRow(0),"FILENAME"); if(typeof(flie)=="undefined"||flie==null||flie==""){ alert("֪ͨ飡"); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp new file mode 100644 index 000000000..163063cbe --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp @@ -0,0 +1,71 @@ +<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-07-16 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("rightsFileList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--ΪGrid-- +// dwTemp.ReadOnly = "1"; //ֻģʽ + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0Ƿչʾ 1 Ȩ޿ 2 չʾ 3ťʾ 4ť 5ť¼ 6 7 8 9ͼ꣬CSSʽ 10 + String sButtons[][] = { + {"true","All","Button","ɲȨ֤","ɲȨ֤","saveRecord()","","","","btn_icon_save"}, + }; + sButtonPosition = "north"; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/fileTemplate/产权转移证书.docx b/WebContent/fileTemplate/产权转移证书.docx new file mode 100644 index 0000000000000000000000000000000000000000..0711dba7a1cc4ac883c49ee4806a67828d030ef5 GIT binary patch literal 16336 zcma*O19YF;@;@A>VPmJUZQHhO+jbfoZEV}Nt;S|!yGj0O&+ndd+I8Q%-kp`?Nxt*h zn0fZ>nb|Y462Ksk06*Jj>22PhzyH%9-X9EY3}o$XY#nH1-^q~P|MB4$+0s2tlK~(A zfE^G30NlUH^lWXZU9BwBW5=a?Y2gCTMcV`tJj_X?o&p+#iKYGWLxCg)JdDyhs?r95-9R7$e*HKYSfDx+wF3yFxk}i2zd&k zZq%+|s%ltGxrb6ie%M2?+i7nm=nDnoI1}zx?p`umvBSw*Lu_9W^NUvZbSmN;CQXOq zbX8=U4?Xm|{OWpt`UX{A&${Pu{%tz23!3~ya+IqkSs@KYw9}VqBiDc|<{Ci5%3`p9 zE#?};sFw6?&Hw+eB%^gh2D;F@i=t3E1~M$g{!p-^ zM+{SIy*H>L0q63$#y|s#c(5~(OxMHyEtM9^Kt5IjqtG!!n~)QDB)iiu9m}~mVz5Ag zO_>L^;0Ms}5-<5NM)d?+_)ljgE0}jD5y;e{TYQ9dG+RU<8oDQsLPZlKbn|rR5eix%xf})z z&~f4O7h(|Dv_!j~u7|;MV_x<)zftU8=+v-yS{=v?_7AimKM$bN7U4c4c-N`THlPo~ ztsTIKi>c@Spx(f(Aqt$YW83}sEc4-{MG|i+J*<$YgHxy>)3u0%?T%y%pX;-Joeg(W zSX_iKc_@!0GddCUn-TPzViB5ls}_%n7vN8J{dYwJ`pzyF8+*e)lnlz({s%tjcW!C} z0DSxpiG!n?rIEu=ZuVbM1KYibE=3UwOnmzCF zG%S?@vcO5BA3IJw3+@r`YmyzZePYh+=JV)&a7joio+LyGkDe)I?MC;wyL8`q@93qO z&q%VXvUgKIco3J)~XRGkx{elr+NwPtr@~;M5MW|(n>bUqga|Qn@6EMaLpPz zy0Z4t-Y$Y@B|Ju~l!0x5$YF-Hp92>z&mYyV5C2*7tr-51xefABK2T|-76IMGA%hoP zP?>T^Nlrtecs?s^ba|-06k)+ko~Lm=*plkXG%-8|74(5nN^wg8#U%3Uq28eEtnJ6F zEoY@$mwYl`nfnW#T&!6xl~AWz2}db4LhON0HWV}&1J`MLBja!YHLGT>Kkmp8*-}a1 zioE23VySc-*C;O+6nP#-d%e37n$0-2|(qH+~||*Gh&&$U+?6aG>8=- z`6`vcIn5#?^x!9gN(3iSTB8()@9uX%nnTZ1RyuE@jtCd}D$eHP=zLU7@GYN4he zk(CfVp9c8ebxVR^uO(qtCR5!!;%q=+ zkA&j6jP>0VN+eA4<){@2FZJ!d2r)6IN3nAqI_8CKSI1Hd25*NAH|G#fWQ>z#h$K{$ zC4jh9>?oL1c>g^o%Fo4A)0vSW&g?|RMYBVHiFgz*IK+iex!D#{Ne@OK&ZAJuJs=t; zVZju0wC1;&ws%5qQfh?DLe?gJ$uHR0oqv8)z$a&{v`8V7m1U=VtFlhU$P|ar0FwmQ z^#0uf)4=0ub?XK0fXr6b(cFl>g_Jv3vu7_iE^$89sVkOm+@fuFkH8$;29O%#fqg*R z0bg+aLd?1IU9ti^Pr&o}Ie5*cXm#_4zjJ_s)SlWT>}ouh-#EXIo|{AKHrtpwk8A&c zMJ%EIH~~uwQL#X3{PVMYzy2|~5jCazxx@}esCIrS5yf^-DbrChOgBfv6;K9AmB`t7 ztqMm~V+P3CL6@X}%r0ha(PGfn~{4mkU+UwUmlhTLFtS zs-H$r{nlF=T5{=P=?h=jp=rvEEkS9Mz6&wEg?;v(r6CNgAi%T=w-T-$a>?=*7{M;e ztf2TV*0Y(v$&8u1hOnS29&2&(h5lJ;!_i9!|4Jw^M$=I~K#ZxPJC8g(PrTM&-MkM0 zDsqv|h`0s9?ZtR$q(5`tPSBhbL|z@jFM*gJH{T0R)H-d;1#oR5Dx$X%gtBXk1y~EW zg8EtKV3|=96aa|KTM)ND`a|9WydM$|e$2KAi2RQb-Y}ex+F+j5zLyEaI$&wr3c%8r zWt!*Lj-UsUS1apkp&Up$L_fmZtapoWxhMPiGZx^#?wtgts-6MJlHfy%n^}H&j!#h8 zF7ou&_UhL4gCNl?!!#;a+n-vNZ=b3wqhi^C$8)6K0?~XEbiH7VVrMfXn=|vQrwjh~ZK`pJ>O10w0OP+5ohENm?<}VrJ>bsruS`N=8Y?BkEVF zOZED#p0~LnA|v2#i!$G-x35ly>TSBpE6qlB^dq?R=aJ~U;=MryqO&`ZXA~<8^EZM8 z=@|*uH;k#)h1k+_W~el|E8E?pZkYZM@+NjW1D`^H^!Xkq; zO{>-LbJdj8g>{Kel*!S3QG3hk7J~>@R4oRf4aytUf*PY2syXGiu7uOhJ)B8>`H+!q zWu^msM#irldY!>`NUHg0~@0{#Qqe_%@dX2yWr;7@4+WLZr(A z`{ugrX+?#$VnJ#*(-6r^VuZ)=#=Xd;sk<+Qt_o_Jut#AmiT!)nsqf>GZcFX`IklfX zzGFgJ5(Dwq6{(Y%8B@&P5kHq3OZGl-pUZ|c^(K>_YsC6%!5qx*qsqNcZjWmH@A)JS zX}nM2eeHx-?~H)>$p~sIQ^s#d?~IW6gn_Tn7Ap9|*&o zqnr?y#L@pl|He7dU6OT0gs{IDW?Dk_K3Xy-qhNt60leWo{jA$?n#z|Q*a?Ef3%xPR znv%|oM3DsC=HxM@f?B7o02{i@x(IrJb1^}~&Zoq`#6qC|}AZZE+z zMkx(cSzao#9u`-p20Ox{N$90g-HW_)yKo1SI|ggh?@?=LF^{50)8iT3EIx_EbVcrQ zpiVk{tCE%#vfKmgWXxC`Ts18qaa{lWG&GsU2iB0u=rm0_V#r!s}~m1tQm$5KmOT<{0YD!G#hL=oFh^`wvZg89RgCZ%4F+zV z-u993l(){7wA=Pz7Fc!PYTm#73`5+sVZ z@jHq;Ah`@*ZtrH zokuQ2lr)AY z%XgkPb|kc&FKaX%&%HMOW*6f+-Y=CrZ^bO^$LXd5LpP?Uu&UTNNo?QmasaK`zM`$C zGjz!$<+aly_pD#>WQen3yonWFc0RvsyuMs-xHGrUKfMXeek2y}XvJz$G3#Xb#DRfc zBPzzmKw_2o0)T+~<6)G2S|jUzUmc;$dX=%^(ieB;?6g;NSf>1oJ*Aq<2pw9p*0&`j6qv zvsqz<_Tkxl{oHk~W~tV&qr0R#c-fM@7M9=cp=?Pst&{|wMR!Su?pzu|k&fO34O@Kvk-KXhM~brTU!1?!M>- zj(kgK#KcBzUIHnKkYMngouQX>&!m`Pel9J|dN`w?CMZlXf*JQ!vMNQOMv4y`b9n$Wq(`7zwkxkWD)QANWQ1DkwVw^ASTb(1jOVv>p2gJ?rG@xgZ<41KkVr8s z@vDy?+9)6OvIQ(8aLyzkeS{$y$D_l}H)!}F4L{$XOXB#b?Nge4ZV78y*eMSql^svC z$77XS`87)=;q>EEu5ZXSU}5&-Q%ag)DaTUBsO1wkC@NB(zxi>oz6H(zE zl9KJcwv?%t7sx4nU%VG0V_9Ubxxs}`n9`Jj7cNI~5L*EuRhXsY3Sz@Q>wB0D3IJZ! zbPa@R1+H0|l5HIB(%Jx6!HP5RXfHVe`M}233L=Tf z?Gr5)AdX+-M(v|;*oEQoBz@oHw9my-%L%wvI_r1!3Pss`Waq60r3&%V4Ma(wik!vG zC`>lZKA4cJsu3g+v|tehmM9ZA8SoB6fWnwij!j)W5p;u_P+`UnaYWi&^hcR=Sim+p z7+r=~n8qj^LO8a?Zk4kvJsy(DAswe=i=^$zj;1n|OCs#}+}a4R*3|^Sm8JfL>0CLI zWOj-~i3eIaZ<$<}n8g@AP`wOA<2Ht#?y3;Yu)wvbD z9)!|?Mzu=c%S{o?)){uvE_;iIm*t{j*ljRd-@TI#I3!M(1cpH3;E-0!i+OpNA^$$ptVf-z|#yS;>!!iBfzjThrG*Q{<_6Sp5fSO{FyB0I3pQ~ ze7^~ai19*~SQ&6RQ#ksbYNL`&bj8uyl|;^~rQjsCW+J;qO`t?iu%=_blr-6~_8ykd z#(^+ojKaVj4OHf^7ckgdC0ASSl_-ho9=Q=)R@)C89BHLY=;oCd1IM^&{oJLnc1+{> zxO)!32^!SIprDR(p6w^l16&7uvH=yU2S7nJu-ddev{4KeqylMx)@+un=;H&?ow=l> z)->}^H1=0G-;yvP=PpYFTjekeo6qBWtIw<;1+4fZGP!ZHQB+~zN_)0)F^FMu$WK`K z;evd+bAA554|mw7#OyS0_@Bfx`P8#ITdY8NTiv{d1Gp$%M7%7{Xr z3u_9hcISRT2?jb3SPh|~R3;yVf-k84tdHflSegre3*mluO+(Y+cCm8madBL3#LfHTe&ztssd9qq=9+)=7jA;6?wgCJn*t1i{n(QMTC32goJM#4oRav@DSLq>P z!TuQ4*l|jxqc*!&?Cm~IS3xwA#217@=)u&z1E!lC1Gx;gbEK-GCb;e1lgn7T{; z@`xb{@7+$>iF3Yoar1-!k9_o0%yQ+@by2HoewZQevhht7^3nQRA#fXB6rIfO1@+_8 zyP5zN+;E+YZkI`>Bn#?wUw+}8HS{`Z)5cWsNj!oHW{E8d0G;Bz3o^(Oyh`eF{XPSx z%6WXx_;6|f#uz;zgFIpgbUmD~=Ez*XELDoGQV`VjMLeAeXfrL*Cx7CSL$5Sl(}?0W z6`4+-+Z#Iert96!2^nyg^G~af(~$PYR@-=06- zXS_VQvB52ym`_~O;JjS!PG5s(c08PULwIU!^1-hc!pDAxToU2n1R9i7)Eph=O|ul{ z>8oQk;DRNLs-Bm}@66=~_cHQVOTiwDLa`%o)dKKJ0HlesVF$bCr&F#Iyw0b!_ti+N zMM2G%Yszy%?pehdlCwV1J&^x6Rd#iVX&k_&@L~2#^igaU*gkVno%L4@v-hpu{=@ z{i?-hJNk)Z!;!+yl7`zN*l6%s9;`X~ zoa}U0)xU2QUplUGPrM!5$IHq1%po~xMIC&zW^w?-8Py2E*mr_(n~}B=UwfZPa^Uvj z`INwEq=#$Tj#`arReKt>f7T+BP@R!NYp<3P*%(-FvKYk2HHpP3<_#&q|4_t%j>Ou; ztIGfmQNf)}eiFp$C*|>NmLKSA7%ZW9Q($inI(1_CW!0t1U6IUvLyw)Guq&`w#}g}tiJ@Nh_^Y(NeS zAJB+moQm&bzku2v>{95Bz782PYjKYo6F7`n`IBpUEjCTEo?P(a=Ph^9*X8SJ=M#15 zmk%#@s(!A@NCGCZbmXK+QqDqqWum~1vNj(!74%e+bk-9boZv1{92pD?(Pmv00cJ+w zK%1$QK>mR)53zt941WW>I(}%HszS|HD5cT{&%nwNrG~JbVC@ucoNl=l9Al3;rqIoK zQ9kFqvpTFrN97}4fi(Kyvmd4{vw5dyR>ZK`3sc=C>LNb7!ykmDN(xcDfm~%ry9)RX z=)Uy=BMkDac-)8Y?#5@uK{?pWf>p2t8v~b5k4ruq*AUZmSaAcsr{r+iNT^0Jrntzz znZDZiFZ;A=9e2y0Tvs@7R>n3H zMth9~;`@16=r%q{swi=6NKVeL=MX&gJEkg)wg4p{C;1C6-&LCRKqRY=sxo|{nP=F+ z4X^#wtJ{Gmz6lF)$W!$yx5c18qDoWb)d9R3wmAw#1w8^*@)WV=iYpc4Yzu%%!eJUN z7G9Gr)hNwwzNGIp!m*}#o~>&!8Wn$z2*$CI)_jzv%{i`H2=ANIDAhMFm<^v7Ku$%6-sg>WRrHK4@w{e ziCY6z7Zo49imj5sA_W)40(z6EHarOR(eq&-7_Olb;67oMy4626*q=!M>fz&XaJ2sT z5Pw;Rgn`JYrMN4|x;%{z3qfB=DCEWn|9W&1O5n8>V{L067muVS8b|`d^+W6}^X5Nx_wGVR{{aB-+k>kvO@cu%O64qCpsmY8>7Db55l2Oqw%w?k7N}M20>+IfO`v zsk0NOA<|G=;rJb90TIn$(L`2*p;rfUQ>XR|v*d4_*3ke~bU6?RuCj()L?wyVCrKDB zU+h&eJak9~X5tj6ON9-bPMfvXC$O*({fg{vzY_i zbD*ZmS>o6%t8J{Xc#8TkclatBrU06Zt%Ni5Jvfeg0zFNFC3W1{P^mp2*$Vg4RHu%^ zUnNm|OEx9?W7J640F1SG~74x7q;^0PCNsC1pcK5G!mj7 zt*sAkq$V>b<)o2f6RpzsYq~W@YJCcR65ip`Y49Qn16i6{l$Z-f(p;r!bA2tSbK8F4OwdTKZ>l17h+&rB zNn;Ru@;15SqU8oiGHJ#+Vv$PwUeB0zn5MTTpZIOvwlrY*rK~G1Hz_xX`6La ziC`+t#KA4E=F6X?6;D9@Q5r~cg(E3Ui!SL4G_H%GXF(ws0bJO;)HMCZ%wnKTosi^B zjRGkc1T(@cB!8y>%(D9G52aV6s#@dSqPp&>slH5FsZCnJy($wr!+`C$H4e$`c0vovD~EbZKL zdZm{%t|Q^9nLN~@OC?;SuI^^HaaA7*4SoHxM24j4YghFk#1qv$V&AZ)W`pus^4b3A zk#*mOpi#dsQr8e>| zrDfJ+tm)p2HjDLKAF-ROseH;3V&Jimrf!7>0NvQ{C{6JOe~i!zHD!H8)85G$f#n{l z0*}@!?T(5Mgx?7)$eV=Rsrr-)UBjrqH_sKM(alPHO$M4&>bE_Yr&xDA!H|d{ zj+U-pz()S`t>;;$8aU7;5H@z3S!xv-VJ}^UaE6Q8fHaTd=~0kXm_~O{VJH0v9G&s= zY5F|2GPGrovqtK~m^DQ>?OS}$fk)}80b=zBKsLGQw$^NYnsRo7t$bc4f|zi+o~>h58Y=ZeQPD#)q_5yeHQ69v zD@=80j)lMNtezX#R ztp}t5prBswmIcFtYQ`tnsY>r!T9b+P8?|h+%B71(SbQOfD#hB(dMh}W>3h>1>-cqs zE+}1@N_sN?`X!T7YtWP1zLt+HC#U=dYmrfGKFAuQ15XmT&n|!(-itDgAkfb+k@2_i ze9r^U{jB{wx!hPavQwyrRM`|zhfcm)kqrWX&Zn5pa?g7gDVD9>6_L&5$86UF_n(pK za|9dAWk(w%j^)BTKFC^VNT&hR-$B*4a6?j7EWd26@{E5qvZ(ge($8~zVQXd2gPY$2 z)^p|*<_erf1q=j*Yv_bsyMG>WZ}9;7Q0iB8wJ&fy5#GDCXRkYSOrB@$kI`G2$_A3Y zop_4x1)rtts}2rX?+!eN4++)o*r9oos$zr0qK$vmm(~`->L*}sH*GV|v?#>Gt=ti& zST*`cezL#qFg|eP$7?l}G?DOXqi! zBEimM5fMT-sHY`+f4?!Gad!f5xHDi854&<-T520AK^ms8lgkoy+;I@k26!i&K&zQe zA4-41FAy1mGOOHfGo(qGqP4f9Ely15!4t>}6-wnvF!(qY9pSmdC;)id^Q;3Onj(yba<;cC5H*MyKap@a}gzK(jFLApeLv+ zc1CY!V1tbcR9|!|`@u9K`+*5=?tJ^()n{!0)}CW2Ogsrf%d>q`xPj zRkQ|M&ddNpCT5#geBy<76p6NSZ}hD`rkW2iKvf+~-R^KjOeZH<8$h+Wiar?Uxh60Hw^SUbta4By(c3$kfK=fagy3YX- zx;CbxoMurW)Uz$lni1xJ^`Gx1AyQIJ<=85_m+X}?+9r={6Q9p?yMQkc$$CY@7QfPdr zw0w@(Nr&C-tssp}?RK;u&*(>sf&}vF9w~Ogxe1R46Sq@ajlId?kTGeUw-KBL^SLZW zwXKGeM2$T@=f#nUTpOksIIuXS)!58d;XEtVfR4Tp$w|6+Z9s| zDNWc#m=_-#79E)%L#lcnES}MEhHVbe?VF{UyvXMd1iM*5-$iysWe78OS{f@`C&_$) zaW0S!xHccBrBj~tOG_L^qa2FbjLpy5q#&@O?nMJVsuuw925_yvT1FT{UsxR6O_$l& z$ECjrvCj8*Tp7>cPCU>F3Lr>F%j=*>ix7!0!=0I$b3;&0k=1Q(*O^{?7k5bzZne5cov;OvnChPZY!;E`R#win0{uo8T`udQ?;`EBgC}o!#$b!{yEV9r3C&% zXXa>R^((-X9@P!mLklN(?*9gNXWjTMJb{p_&J|_u;|H^nAZLY^;_1#tS-Aexg|BYC z@%_2yeQS}c?(#82WFJK47pSz5H77oge*ys)s6XUn1C<$+{eCNMZ%qQ*Q7K8Q&yA;S z3#B&%ZxA7d#abQMVWxgeZd14}*JYJ*YFjbF0tuD+CT7vBnwADLIQ{Vlc2?5E`*obt z%O8o21_B;Jd+)0dd0z$EZ>#;eieK5mzm{SYEoTw%Gs6`8`J?>?lkoAJK4qQs_v1y~ zN<8fqU$MTvWxBf!R2DQxua-2ArVX~nWvy>;nzl7FreKU=c)V1SB)6g6D;Ah2aH@k& zgW$Qb-Qenr-=aS%nKWX%tg#J0Og^|ZaC>k%Tw9bGQ$sQ3KqG<^ zR?;tURbIaHMMO+zIBQ&S=@f=voluriS8*GM4={?)9!+m9v!a3VTz94wRoY9uD_g$Y zT^?fR=94L>d|1ErHy@|a`xJ(^wNv5Z;3a3~L1YDogHO(S=60(TO;*MxwIC$^G+6{e3PLPeD9wEtuG=`cB4^hp7X#Rb{f^YmKPCQW6qKi$y zGpsJTt6GT>kM6T3K{gtF3;EoliRhYe4bXQ4bb8!`FCJYL_3~)bxA^@WVtk2ZxR^7c zP~xA=0@auLQ`+oyn?Dc)H`}3m1(D6+Hf6xEZ46YHR`rXi&(xVBDhMldeuc)Mc&wqa z$?0z9XNb{Mg$F?(S0H;m7&Rs z@O*QxL4^M`kzm-{)XO_nZz;Z6$f!Pv!|k#BupB@+>g*ec*h!-5;$d{NtSN7Hj@lII zQq+yKu6mXqGi1=dSD!eP&5PbbDI03VFx-4Wh;#cu>UFMh?ZS;G<`};D5K)G{yBCe! z(N5W%x&ciuq0|D(&fy$2oa>_I#cWr0P%V29`OYfsPJ&oK0NO{eRnXB00W5^zIK``x z)!DKb_mhto3lG##4=)$8u-;yeDO4R$vmi*(l9ow032Rw^?r{hHAKOF$m+MlTR1$bx zh*sl_V&jZlQ*pVS<6D>5-yQr6LRq^{PIyhz^YOMJy`rfZ#H3{KIeNpF(QbSDmz*ioFWYMNc}j08COry`k=4r99T&d7kQ^s?Qj zx|{D4)++9=R|;`9cr-HM`XYce4L)}5K2-E01o}fJF3TDUTF&DrXtc+wPn1PaGdKA0 zg7SZ}y7FrE7Ap$4+A3|rP+b%#%!03@njjcIP0D_X_noi=W$d!WJs`8a4XN`z%Q>LUB7=nQVQv_=tpF(sIJ zl9KVk)RV;{MF-V=g#XZ4}RH=LX?m|K%V3gXMo?AF`b~W^7 z31m8q>JV4;fEreiHJgCbG{COw5jmDF>2E9zZaav{M)e}?PD`JF(baQej!(mpl9 zAcR~;9N3*@?B*6E%E2Me?P`S`x#xaX_&8|&F6$_-15)4$W*d?~fr|*c67xbwZ4WY5 zG0C0;LVh`DwgbX5)}a6u#BXxIj~92F@#jq~@{D-$(~hwrmac-V;WSr8j80Oo3Hj56 z(V2+DHv=aa{R6fJ1z<%xT?BmP)>HPDATDVD_)jDFpDahTc|X>cbcB3K8=9jdV}*8t z70i-u7&)1(M_T6HeY)DIES)6c)%|&%vicwc!83;Y;?^oIK0v|>u;bUVt_9+)SiYcu z(R|>?Uh@S+YeNRZLD@2=Z3ARCM=#+g#8}!-dPT#SY8j^V;}|9{VtG)%;=68$hs)} zVH~V3CmfC%d#;u2-Ik1&S#h!hP~{A!9#gn+7oJB6cAxsF@lw?a3+xS`b<;0NPhM}7 zWSax}YOA}LH9k|>2SFXINPN!+$#Wm6VZ{kRrmc11M~Wf>><$VBKx+<2$N4Z{bD(~X z5riT)&va%#s`(au0`G-T>t{$5@j+^Z@fBc|)G4&*?$L&NTFV7u(niS3rIL25BDV#^{Rn5y%tF^0bXrM|`aN@v8=0LsL6 zqO_+2$SI=mh`seb@i;Ttr=nxc^ATV|oj>gpoCu=uim00hS#a)Alb)56+tF3aOVzr~ zu80oWFm*#1g|wE5A&`SU8Fb6&GN2-`oY9Xm$X*C)^BSqTCByb|Z^$b@<0eke9$-ea z4XR88w3~~^Oy(ua@3JC3|D!PA{dx{S$KJ^D&+;Qce0-dj_s_Q8FPnc}^8H0a{gbjh zZcQAR4ld{%bOUe9i)Dozf5y^A@O!$bmoMJeHJG&@F_QIO9sxd0RTb?Q_Vgwbo(@Cq z4vqn?*$Gw`kV#4~{%x=WPtx7jXL@!}_zdm=0vCCkg6PcSd;L$LV7v4Q9+nLu>$?Kb^)UmE!88U4}^Y z@)KR=Dh&-uKXP4LJ@zTHYVwcLK!-&>cxG;_pR8vqh(`0z-ucCb!NjqIyoAH?vFIv_ zYJNaX-F;Qw3kFFAbT> ze|X;Xll~0u_^6spfvn^Kd9Rmb@CX}7XTlDR_U%UB%|~BR0eBRD1>sxP(Q`rFTSjW#_>{00oGL!i1lz&vr4xNhS%h>F zT#h}nNv~xWLe&iN$b`ckw};rd8iL#+zo`kHiA9JdeMbkz`1~h*esfHR2Hu;GX(G)4 z1p51&s_JA~v_OZL z3|sBW^0qu9HJ>N>4Qj)8$0v<`yeCQm0wDqXQ~mj;*xn@v00@Bl{?nTEzY6iM4*t7l`l;jp zYCm<9KjVM2`JaRSsq=qg{u;F4Z_KZ~_rC`FYYIQ1KL;bC__tF0U$~#tf3=@aV@&_X z{YO{)&Z9ro=}+`u(|!6c=--v=pG*HUj_^-kQopU>?_U1w;7=F+pAHZy|Gkvo9s2*p zke{`|f3^Rx=3kYL?t{t5rH zD)S#W`@8-B5B%>M&HuINpLL3VwV#VNdp`$$odN#~^3yu`tNnyrG5>aK{5jb_Pne&; zzc_`-@*D7d-hbce{_CCpXNUfI6Z}t4?KuC})4%)pb0UBGNB_Y0Y5x!Yo452Q{?A0f zfACx=f8+m73;YxPXH?}MG&R-#p?{09{E7cFllve1)4LFUiR|Bb-G9RWEIa)N9`PTE z|5Jqe7x=$xw%=vn{T@5}HTHj!(SF}0f2O1TGwRXrz<-j{WF_7mh4+T~{+0axZW6Hn H{OkV#liTsd literal 0 HcmV?d00001 diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index 9a95d509e..f9cdd9d58 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -1603,8 +1603,8 @@ public void wordToPdfJar(JBOTransaction tx){ BizObject DOCRELATIVE = null; if("null".equals(PLAN_LIST)){ DOCRELATIVE=bom.createQuery("plan_number=:plan_number").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); - }else if("transfer".equals(PLAN_LIST)){ - DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='ȨתƵ'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); + }else if("rights".equals(PLAN_LIST)){ + DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='rights'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); }else if("settle".equals(PLAN_LIST)){ DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='ǰ֤'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); }else if("TX".equals(PLAN_LIST)){