diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp
new file mode 100644
index 000000000..f78292a1a
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp
@@ -0,0 +1,52 @@
+<%@page import="jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP"%>
+<%@page import="jbo.app.tenwa.calc.LC_EBANK_PROCESS"%>
+<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+
+ String flowunid = CurPage.getParameter("FlowUnid");
+ String phaseNo = CurPage.getParameter("PhaseNo");
+ String rightType = CurPage.getParameter("RightType");
+ String ishistory = CurPage.getParameter("IsHistory");
+ String sTempletNo = CurPage.getParameter("TempletNo");//模板号
+ ASObjectModel doTemp = new ASObjectModel("LCSplittingPayTempList");
+ if(null!=ishistory&&ishistory.equals("true")){
+ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
+ }
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+
+ dwTemp.Style="1";
+ dwTemp.ShowSummary = "1";
+ if(!"ReadOnly".equals(rightType) && !"0020".equals(phaseNo)){
+ dwTemp.MultiSelect = true;
+ }
+ dwTemp.ReadOnly = "1";
+ if("0040".equals(phaseNo)){
+ dwTemp.ReadOnly = "0";
+ }
+ dwTemp.setPageSize(50);
+ ASDataObject ado = dwTemp.getDataObject();
+
+ dwTemp.genHTMLObjectWindow(flowunid);
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String[][] sButtons = null;
+ if("ReadOnly".equals(rightType)){
+ sButtons = new String[][]{
+ };
+ }else if("0010".equals(phaseNo)){
+ sButtons = new String[][]{
+ {"true","","Button","保存","保存","as_save(0)","","","","btn_icon_save",""}
+ {"true","","Button","撤销","撤销","as_delete(0)","","","","btn_icon_delete",""}
+ };
+ }else{
+ sButtons = new String[][]{
+ {"true","","Button","保存","保存","as_save(0)","","","","btn_icon_save",""},
+ };
+ }
+%><%@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/Rent/RentReback/OtherPayCarApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/OtherPayCarApplyList.jsp
index d3268d1a3..d708f0bb3 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/OtherPayCarApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/OtherPayCarApplyList.jsp
@@ -6,7 +6,10 @@
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newApply(){
debugger;
- var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow","");
+ var userid="<%=CurUser.getUserID()%>";
+ var orgid="<%=CurUser.getOrgID()%>";
+ var sParams = "applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
+ var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
var sReturnInfos=sReturnInfo.split("@");
if(sReturnInfos[0]=="success")
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/Splitting.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/Splitting.jsp
new file mode 100644
index 000000000..02119eca3
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/Splitting.jsp
@@ -0,0 +1,38 @@
+<%@page import="com.amarsoft.are.util.json.JSONEncoder"%>
+<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%>
+<%
+ //dwTemp.MultiSelect = true; //多选
+ String flowunid = CurPage.getAttribute("FlowUnid");
+ String PhaseNo = CurPage.getParameter("PhaseNo");
+ String temp = "true";
+ if("0020".equals(PhaseNo)){
+ temp = "false";
+ };
+ //参数:0.是否显示, 1.标题, 2.JS事件字符串表示(TabContentFrame会替换为真实名称), 3. 是否缓存(默认是), 4. 是否有关闭按钮(默认无), 5. Strip高度(默认600px)
+ String sTabStrip[][] = {
+ {temp, "分润计划", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')","false"},
+ {"true", "分润支付数据", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')", "false"},
+ // {"true", "分润支付汇总数据", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')", "false"},
+ };
+
+ //参数:0.是否显示, 1.权限, 2.类型, 3.按钮文字, 4.说明文字, 5.事件, 6.快捷键, 7.资源路径, 8.资源路径参数, 9.图标, 10.风格
+ String sButtons[][] = {
+ };
+
+ // BeforeTabStripHtml-html
+ CurPage.setAttribute("BeforeTabStripHtml", Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
+
+ // TabStrip-JSON
+ CurPage.setAttribute("TabStrip", JSONEncoder.encode(sTabStrip));
+
+ // TabStripType-tab/strip 默认为tab
+ //CurPage.setAttribute("TabStripType", "strip");
+
+ // First-num 默认为0
+ CurPage.setAttribute("First", "0");
+
+%>
+<%@ include file="/Frame/resources/include/ui/include_tabstrip.jspf"%>
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp
new file mode 100644
index 000000000..e5e766db5
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp
@@ -0,0 +1,60 @@
+<%@page import="jbo.app.tenwa.calc.LC_EBANK_PROCESS"%>
+<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+
+ String flowunid = CurPage.getParameter("FlowUnid");
+ String rightType = CurPage.getParameter("RightType");
+ String applytype = CurPage.getParameter("ApplyType");
+
+ ASObjectModel doTemp = new ASObjectModel("SplittingList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ if(!"ReadOnly".equals(rightType)){
+ dwTemp.MultiSelect = true;
+ }
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"ReadOnly".equals(rightType)?"false":"true","","Button","生成分润支付数据","生成分润支付数据","createSplittingPay()","","","","btn_icon_add",""}
+ };
+%><%@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/Rent/RentReback/SurplusReback.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SurplusReback.jsp
new file mode 100644
index 000000000..093edbb11
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SurplusReback.jsp
@@ -0,0 +1,37 @@
+<%@page import="com.amarsoft.are.util.json.JSONEncoder"%>
+<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%>
+<%
+ //dwTemp.MultiSelect = true; //多选
+ String flowunid = CurPage.getAttribute("FlowUnid");
+ String PhaseNo = CurPage.getParameter("PhaseNo");
+ String temp = "true";
+ if("0020".equals(PhaseNo)){
+ temp = "false";
+ };
+ //参数:0.是否显示, 1.标题, 2.JS事件字符串表示(TabContentFrame会替换为真实名称), 3. 是否缓存(默认是), 4. 是否有关闭按钮(默认无), 5. Strip高度(默认600px)
+ String sTabStrip[][] = {
+ {temp, "网银数据", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')","false"},
+ {"true", "剩余退回数据", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')", "false"},
+ };
+
+ //参数:0.是否显示, 1.权限, 2.类型, 3.按钮文字, 4.说明文字, 5.事件, 6.快捷键, 7.资源路径, 8.资源路径参数, 9.图标, 10.风格
+ String sButtons[][] = {
+ };
+
+ // BeforeTabStripHtml-html
+ CurPage.setAttribute("BeforeTabStripHtml", Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig));
+
+ // TabStrip-JSON
+ CurPage.setAttribute("TabStrip", JSONEncoder.encode(sTabStrip));
+
+ // TabStripType-tab/strip 默认为tab
+ //CurPage.setAttribute("TabStripType", "strip");
+
+ // First-num 默认为0
+ CurPage.setAttribute("First", "2");
+
+%>
+<%@ include file="/Frame/resources/include/ui/include_tabstrip.jspf"%>
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index bfe2aa368..3a0ba8c08 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -1371,6 +1371,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1564,4 +1599,5 @@
+
diff --git a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java
new file mode 100644
index 000000000..a956c83cf
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java
@@ -0,0 +1,101 @@
+package com.tenwa.lease.flow.rent.rentreback;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
+import jbo.app.tenwa.customer.LPOUNDAGE_MAINTENANCE;
+import jbo.com.tenwa.entity.comm.flow.LC_SPLITTING_PAY_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.are.util.StringFunction;
+
+public class OtherPayMethod {
+
+ private String flowunid;
+ private String planIDs;
+ private String interestSPs;
+ private String serviceType;
+
+ public String createSplittingPayTemp(JBOTransaction tx){
+ SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd");
+ String currentDate = df.format(new Date());
+ BizObjectManager lm;
+ BigDecimal ratio = null;
+ String rate = "0";
+ try {
+ lm = JBOFactory.getBizObjectManager(LPOUNDAGE_MAINTENANCE.CLASS_NAME,tx);
+ String getServiceRatioSQL = "select rate from O where charge_way='"+serviceType+"' AND start_date<='"+currentDate+"' AND expiry_date>='"+currentDate+"'";
+ BizObject boRatio = lm.createQuery(getServiceRatioSQL).getSingleResult(false);
+ rate = boRatio.getAttribute("rate").toString();
+ ratio = (new BigDecimal(rate)).divide(new BigDecimal("100"), 6, BigDecimal.ROUND_HALF_UP);
+ } catch (JBOException e1) {
+ e1.printStackTrace();
+ return "获取手续费费率失败";
+ }
+ if(ratio!=null){
+ String[] interestSP = interestSPs.split("@");
+ String[] planID = planIDs.split("@");
+ if(interestSP.length==planID.length){
+ for(int i=0;i