diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
index bb78e597e..0bb311d10 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
@@ -14,6 +14,7 @@
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
} */
String IS_FLOWING = Sqlca.getString(new SqlObject("select IS_FLOWING from lc_fund_income_temp where flowunid='"+flowunid+"'"));
+ String payType = Sqlca.getString(new SqlObject("SELECT payType FROM LC_FUND_INCOME_TEMP_HXM WHERE flowunid='"+flowunid+"'"));
doTemp.appendJboWhere("AND O.IS_FLOWING='"+IS_FLOWING+"'");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
@@ -34,7 +35,7 @@
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String[][] sButtons = null;
- if("ReadOnly".equals(rightType)){
+ if("ReadOnly".equals(rightType)||"0020".equals(payType)||"0030".equals(payType)){
sButtons = new String[][]{
};
}else if("0020".equals(phaseNo)){
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp
index 9fa5bae2c..3194e31fd 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp
@@ -41,15 +41,16 @@
return;
}
var contractIds = "";
+ var payType = getItemValue(0,rows[0],"payType");
for(var i in rows){
- if(getItemValue(0,rows[i],"payType")!=getItemValue(0,rows[0],"payType")){
+ if(getItemValue(0,rows[i],"payType")!=payType){
AsDebug.showMessage("提示","每次只能生成放款方式相同的合同！","","",true);
return;
}
contractIds += "@"+getItemValue(0,rows[i],"ID");
}
contractIds = contractIds.substring(1);
- var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","createActualPayment","contractIds="+contractIds+",flowunid=<%=flowunid%>,userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
+ var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","createActualPayment","contractIds="+contractIds+",flowunid=<%=flowunid%>,userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>"+",payType="+payType);
if("SUCCESS" == result){
AsDebug.showMessage("提示","操作成功！","","",true);
reloadSelf();
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index e78b92129..f64bc40a3 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -3225,7 +3225,7 @@
-
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index cd8165ac7..99020edf2 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -272,6 +272,7 @@
+
@@ -1404,7 +1405,7 @@
-
+
@@ -1966,7 +1967,7 @@
-
+
@@ -3464,7 +3465,7 @@
-
+
@@ -3915,7 +3916,8 @@
-
+
+
diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_C绔.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_C绔.docx
new file mode 100644
index 000000000..5d76ab499
Binary files /dev/null and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_C绔.docx differ
diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯I.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯I.docx
new file mode 100644
index 000000000..05bcade7a
Binary files /dev/null and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯I.docx differ
diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯S.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯S.docx
new file mode 100644
index 000000000..95ec0f4cb
Binary files /dev/null and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯S.docx differ
diff --git a/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_C绔.docx b/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_C绔.docx
new file mode 100644
index 000000000..3fd9cc334
Binary files /dev/null and b/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_C绔.docx differ
diff --git a/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_鍖楁苯I.docx b/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_鍖楁苯I.docx
new file mode 100644
index 000000000..003cb8928
Binary files /dev/null and b/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_鍖楁苯I.docx differ
diff --git a/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_鍖楁苯S.docx b/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_鍖楁苯S.docx
new file mode 100644
index 000000000..ea2e0e1b3
Binary files /dev/null and b/WebContent/fileTemplate/鍚堝悓锛堢洿绉燂級_鍖楁苯S.docx differ
diff --git a/calc/com/tenwa/reckon/executor/rentTerminate/RentTerminateExe.java b/calc/com/tenwa/reckon/executor/rentTerminate/RentTerminateExe.java
index aa4de28e5..27199924e 100644
--- a/calc/com/tenwa/reckon/executor/rentTerminate/RentTerminateExe.java
+++ b/calc/com/tenwa/reckon/executor/rentTerminate/RentTerminateExe.java
@@ -56,6 +56,11 @@ public class RentTerminateExe {
corpusMoney = corpusOverage.subtract(endCorpus).setScale(Scale.RENT_SCALE, BigDecimal.ROUND_HALF_UP);
}
BigDecimal yearRate =endInterest.divide(endCorpus,Scale.RATE_SCALE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(1200)).setScale(Scale.GENERAL_RATE, BigDecimal.ROUND_HALF_UP) ;
+ String table = tcb.getRentPlan_tb();
+ BizObject oldbm = null;
+ if("jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP".equals(table)){
+ oldbm = bm.createQuery("flowunid=:flowunid and plan_list='1'").setParameter("flowunid", tcb.getDocId()).getSingleResult(false);
+ }
if(new BigDecimal(bo.getAttribute("REPURCHASE_RATIO").getString()).compareTo(new BigDecimal(100))==0){
//删除原先的租金计划
bm.createQuery("delete from O where flowunid=:flowunid and plan_list>=:rentlist").setParameter("flowunid",tcb.getDocId()).setParameter("rentlist", rent_list).executeUpdate();
@@ -86,6 +91,12 @@ public class RentTerminateExe {
rentNew.setAttributeValue("interest", "0");
rentNew.setAttributeValue("corpus", endCorpus);
rentNew.setAttributeValue("ALL_REMAIN_CORPUS", corpusMoney);
+ if(oldbm!=null){
+ rentNew.setAttributeValue("project_id", oldbm.getAttribute("project_id").getString());
+ rentNew.setAttributeValue("project_plan_number", oldbm.getAttribute("project_plan_number").getString());
+ rentNew.setAttributeValue("contract_id", oldbm.getAttribute("contract_id").getString());
+ rentNew.setAttributeValue("contract_plan_number",oldbm.getAttribute("contract_plan_number").getString());
+ }
bm.saveObject(rentNew);
diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
index e38311bce..495080d5e 100644
--- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
+++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
@@ -42,6 +42,7 @@ public class FundIncomeMethod {
private String userId;
private String orgId;
private String status;
+ private String payType;
public String getIsChanged() {
return isChanged;
@@ -154,6 +155,13 @@ public class FundIncomeMethod {
public void setStatus(String status) {
this.status = status;
}
+ public String getPayType() {
+ return payType;
+ }
+
+ public void setPayType(String payType) {
+ this.payType = payType;
+ }
public String getContactId(JBOTransaction tx) throws SQLException, Exception{
SqlObject s = new SqlObject("select customertype,contract_number,customer_id,"
@@ -374,6 +382,12 @@ public class FundIncomeMethod {
otherProperty.put("ACC_NUMBER", boOA.getAttribute("ACC_NUMBER").getString());
otherProperty.put("INCOME_ID", bo.getAttribute("ID").getString());
otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "03");
+ if("0020".equals(payType)||"0030".equals(payType)){
+ otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "05");
+ }
+ if("0030".equals(payType)){
+ otherProperty.put(LC_FUND_INCOME.SETTLE_METHOD, "settlemethod13");
+ }
otherProperty.put("FACT_DATE", StringFunction.getToday());
DataOperatorUtil.copySingleJBO(LC_FUND_INCOME.CLASS_NAME, fromCondition,LC_FUND_INCOME_TEMP.CLASS_NAME, null, otherProperty,tx);
}
@@ -433,4 +447,6 @@ public class FundIncomeMethod {
// double CerificationMoney= Double.valueOf(corpus)+Double.valueOf(interest)+Double.valueOf(penalty);
return c.doubleValue()+"";
}
+
+
}