anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into guojiayi1

Browse Source
This commit is contained in:
G 2019-01-11 16:57:12 +08:00
commit cd93ec38e6
12 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
View File

@ -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)){

5
WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlan.jsp
View File

@ -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();

2
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -3225,7 +3225,7 @@
<attribute name="CLIENT_BANK" label="对方银行" type="STRING"/>
<attribute name="CLIENT_ACCOUNT" label="对方帐户" type="STRING"/>
<attribute name="CLIENT_ACCNUMBER" label="对方帐号" type="STRING"/>
<attribute name="payType" label="付款方式" type="STRING"/>
</attributes>
<manager>
<managerProperties>

10
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -272,6 +272,7 @@
<attribute name="TRANSPORTDATE" label="道路运输许可证照有效期" TYPE="STRING" LENGTH="32"/>
<attribute name="NETCERTID" label="证照号码" TYPE="STRING" LENGTH="32"/>
<attribute name="LEGALPERSONID" label="法定代表人/经营者身份证号" TYPE="STRING" LENGTH="32"/>
<attribute name="source_type" label="申请类型" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -1404,7 +1405,7 @@
<attribute name="DEVICE_TYPE" label="设备类型" type="STRING" length="30"/>
<attribute name="EQUIP_NAME" label="设备名称" type="STRING" length="200"/>
<attribute name="BRAND" label="品牌" type="STRING" length="30"/>
<attribute name="MODEL" label="型号/规格" type="STRING" length="60"/>
<attribute name="MODEL" label="型号/规格" type="STRING" length="200"/>
<attribute name="EQUIP_NUM" label="数量" type="STRING" length="30"/>
<attribute name="PRICE" label="单价" type="STRING" length="30"/>
<attribute name="UNIT" label="单位" type="STRING" length="30"/>
@ -1966,7 +1967,7 @@
<attribute name="DEVICE_TYPE" label="设备类型" type="STRING" length="30"/>
<attribute name="EQUIP_NAME" label="设备名称" type="STRING" length="200"/>
<attribute name="BRAND" label="品牌" type="STRING" length="30"/>
<attribute name="MODEL" label="型号/规格" type="STRING" length="60"/>
<attribute name="MODEL" label="型号/规格" type="STRING" length="200"/>
<attribute name="EQUIP_NUM" label="数量" type="STRING" length="30"/>
<attribute name="PRICE" label="单价" type="STRING" length="30"/>
<attribute name="UNIT" label="单位" type="STRING" length="30"/>
@ -3464,7 +3465,7 @@
<attribute name="DEVICE_TYPE" label="车辆类型" type="STRING" length="30"/>
<attribute name="EQUIP_NAME" label="设备名称" type="STRING" length="200"/>
<attribute name="BRAND" label="车辆品牌" type="STRING" length="30"/>
<attribute name="MODEL" label="型号" type="STRING" length="60"/>
<attribute name="MODEL" label="型号" type="STRING" length="200"/>
<attribute name="EQUIP_NUM" label="数量" type="STRING" length="30"/>
<attribute name="PRICE" label="单价" type="STRING" length="30"/>
<attribute name="UNIT" label="单位" type="STRING" length="30"/>
@ -3915,7 +3916,8 @@
<attribute name="REQSTS" label="REQSTS" type="STRING"/>
<attribute name="RTNFLG" label="RTNFLG" type="STRING"/>
<attribute name="ERRTXT" label="ERRTXT" type="STRING"/>
<attribute name="IS_FLOWING" label="IS_FLOWING" type="STRING"/>
<attribute name="IS_FLOWING" label="IS_FLOWING" type="STRING"/>
<attribute name="payType" label="付款类型" type="STRING"/>
</attributes>
<manager>
<managerProperties>

BIN
WebContent/fileTemplate/合同（售后回租）_C端.docx Normal file
View File

Binary file not shown.

BIN
WebContent/fileTemplate/合同（售后回租）_北汽I.docx Normal file
View File

Binary file not shown.

BIN
WebContent/fileTemplate/合同（售后回租）_北汽S.docx Normal file
View File

Binary file not shown.

BIN
WebContent/fileTemplate/合同（直租）_C端.docx Normal file
View File

Binary file not shown.

BIN
WebContent/fileTemplate/合同（直租）_北汽I.docx Normal file
View File

Binary file not shown.

BIN
WebContent/fileTemplate/合同（直租）_北汽S.docx Normal file
View File

Binary file not shown.

11
calc/com/tenwa/reckon/executor/rentTerminate/RentTerminateExe.java
View File

@ -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);

16
src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
View File

@ -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()+"";
}
}