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/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/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/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/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 5a032f01b..978e92126 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 @@
-
+
+
+
@@ -4218,6 +4223,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/fileTemplate/浜ф潈杞Щ璇佷功.docx b/WebContent/fileTemplate/浜ф潈杞Щ璇佷功.docx
new file mode 100644
index 000000000..0711dba7a
Binary files /dev/null and b/WebContent/fileTemplate/浜ф潈杞Щ璇佷功.docx differ
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();
}
}
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;
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)){