Merge branch 'develop' of
http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2 Conflicts: src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java
This commit is contained in:
zhouyahui
commit
60cb16fd16
@ -17,13 +17,14 @@
|
||||
String taskno = CurPage.getParameter("TaskNo");
|
||||
String settleMethod="";
|
||||
String rentOrRate="";
|
||||
BizObject condition=null;
|
||||
if(plannumber==null){
|
||||
BizObject condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
|
||||
condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
|
||||
plannumber=condition.getAttribute("payment_number").getString();
|
||||
settleMethod=condition.getAttribute("SETTLE_METHOD").getString();
|
||||
rentOrRate=condition.getAttribute("RENT_OR_RATE").getString();
|
||||
}else{
|
||||
BizObject condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid and payment_number=:plannumber").setParameter("flowunid", flowunid).setParameter("plannumber", plannumber).getSingleResult(false);
|
||||
condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid and payment_number=:plannumber").setParameter("flowunid", flowunid).setParameter("plannumber", plannumber).getSingleResult(false);
|
||||
settleMethod=condition.getAttribute("SETTLE_METHOD").getString();
|
||||
rentOrRate=condition.getAttribute("RENT_OR_RATE").getString();
|
||||
}
|
||||
@ -120,12 +121,14 @@ $(function(){
|
||||
function saveRecord(sPostEvents)
|
||||
{
|
||||
//检查是否进行过变更
|
||||
var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","checkIsRentChange","flowunid=<%=flowunid%>,plannumber=<%=plannumber%>");
|
||||
as_save("myiframe0","run()");
|
||||
|
||||
<%-- var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","checkIsRentChange","flowunid=<%=flowunid%>,plannumber=<%=plannumber%>");
|
||||
if(result == 'true'){
|
||||
as_save("myiframe0","run()");
|
||||
}else{
|
||||
alert('请先撤销变更，再进行变更操作！！！');
|
||||
}
|
||||
} --%>
|
||||
}
|
||||
|
||||
function cancelChange(){
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
String plannumber=CurPage.getParameter("plannumber");
|
||||
String ishistory=CurPage.getParameter("IsHistory");
|
||||
String nodeNo=CurPage.getParameter("NodeNo");
|
||||
String FlowNo=CurPage.getParameter("FlowNo");//流程名称
|
||||
String taskno = CurPage.getParameter("TaskNo");
|
||||
if(null!=ishistory&&ishistory.equals("true")){
|
||||
doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcCondtionInfoArachiveShow");//如果是历史则新显示历史数据
|
||||
@ -63,14 +64,18 @@
|
||||
dwTemp.replaceColumn("knowing_config", "<iframe type='iframe' id='frame_list_knowing' name=\"frame_list_knowing\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/KnowConfigList.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput());
|
||||
|
||||
String sButtons[][] = {
|
||||
{"true","","Button","保存","保存所有修改","as_save(0)","","","",""},
|
||||
{"ContractOnhireCarChangeFlow".equals(FlowNo)?"false":"true","","Button","保存","保存所有修改","as_save(0)","","","",""},
|
||||
};
|
||||
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
|
||||
<script type="text/javascript">
|
||||
var calcRules=eval("(<%=calcRules%>)");
|
||||
$(function(){
|
||||
document.getElementById('div_my0').innerHTML = '<div style="width:1160px;overflow: scroll;">'+document.getElementById('div_my0').innerHTML+'</div>';
|
||||
changeSettleMethod();
|
||||
try {
|
||||
changeSettleMethod();
|
||||
} catch (e) {
|
||||
// TODO: handle exception
|
||||
}
|
||||
initYearRate();
|
||||
});
|
||||
|
||||
|
||||
@ -28,12 +28,12 @@
|
||||
String sButtons[][] =null;
|
||||
|
||||
sButtons=new String[][] {
|
||||
{"true","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
|
||||
{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""},
|
||||
{"true","","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
|
||||
{"true","","Button","更新现金流","更新现金流","updateFlow()","","","","btn_icon_detail",""},
|
||||
{"true","","Button","导入租金计划","导入租金计划","importRentPlan()","","","","btn_icon_detail",""},
|
||||
{"true","","Button","模板下载","模板下载","downloadTemplate()","","","","btn_icon_set",""},
|
||||
{"false","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
|
||||
{"false","","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""},
|
||||
{"false","","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
|
||||
{"false","","Button","更新现金流","更新现金流","updateFlow()","","","","btn_icon_detail",""},
|
||||
{"false","","Button","导入租金计划","导入租金计划","importRentPlan()","","","","btn_icon_detail",""},
|
||||
{"false","","Button","模板下载","模板下载","downloadTemplate()","","","","btn_icon_set",""},
|
||||
};
|
||||
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
|
||||
<script type="text/javascript">
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
if(sPrevUrl == null) sPrevUrl = "";
|
||||
|
||||
String sTempletNo = "CustomerCompanyTempInfo";//--Ä£°åºÅ--
|
||||
if("01".equals(customertype)&&"ｺﾏﾍｬﾖﾆﾗ<EFBE86><EFBE97>ﾌ".equals(flowName)){
|
||||
if("01".equals(customertype)&&!("业务申请流程".equals(flowName))){
|
||||
sTempletNo = "MakingCustomerCompanyTempInfo";//--Ä£°åºÅ--
|
||||
}
|
||||
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
|
||||
@ -30,13 +30,13 @@
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
var nameResult = checkName();
|
||||
var flowName = "<%=flowName%>"
|
||||
if(nameResult=="2" && "ｺﾏﾍｬﾖﾆﾗ<EFBE86><EFBE97>ﾌ"!=flowName){
|
||||
var flowName = "<%=flowName%>";
|
||||
if(nameResult=="2" &&"合同制作流程"!=flowName&& "合同变更流程"!=flowName&&"合同撤销流程（汽车）"!=flowName){
|
||||
//$("#FULLNAME").attr("style","color:red;");
|
||||
$("#ENTERPRISENAME").css("color","red");
|
||||
}
|
||||
var certResult = checkCertId();
|
||||
if(certResult=="4" && "ｺﾏﾍｬﾖﾆﾗ<EFBFBD><EFBFBD>ﾌ"!=flowName){
|
||||
if(certResult=="4" && "合同制作流程"!=flowName && "合同变更流程"!=flowName&&"合同撤销流程（汽车）"!=flowName){
|
||||
//$("#FULLNAME").attr("style","color:red;");
|
||||
$("#CERTID").css("color","red");
|
||||
}
|
||||
|
||||
@ -50,9 +50,15 @@
|
||||
dwTemp.replaceColumn("BaseInfo", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"630px\" frameborder=\"0\" src=\""+sWebRootPath+userll+compClientID+"\"></iframe>", CurPage.getObjectWindowOutput());
|
||||
|
||||
String sButtons[][] = null;
|
||||
sButtons = new String[][]{
|
||||
{"true","","Button","保存","保存所有修改","saveRend()","","","",""},
|
||||
};
|
||||
if(!"ContractOnhireCarChangeFlow".equals(FlowNo)){
|
||||
sButtons = new String[][]{
|
||||
{"true","","Button","保存","保存所有修改","saveRend()","","","",""},
|
||||
};
|
||||
}else{
|
||||
sButtons = new String[][]{
|
||||
{"false","","Button","保存","保存所有修改","saveRend()","","","",""},
|
||||
};
|
||||
}
|
||||
sButtonPosition = "north";
|
||||
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
|
||||
<script type="text/javascript">
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
|
||||
String customertype = CurPage.getParameter("customertype");//获取客户类型，用于判断生成合同的方法
|
||||
String productId = CurPage.getParameter("ProjectId");
|
||||
String flowName = CurPage.getParameter("FlowName");
|
||||
if(sFlowUnid == null)sFlowUnid = "";
|
||||
String sTempletNo = CurPage.getParameter("TempletNo");//模板号
|
||||
if(sTempletNo == null) sTempletNo = "LBContractTemplateList";
|
||||
@ -40,7 +41,7 @@
|
||||
|
||||
//法人客户不能删除
|
||||
String falg = "true";
|
||||
if("01".equals(customertype)){
|
||||
if("01".equals(customertype)&&!"ºÏͬ±ä¸üÁ÷³Ì".equals(flowName)){
|
||||
falg = "false";
|
||||
}
|
||||
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
|
||||
@ -95,11 +96,12 @@
|
||||
//获取合同状态，已经发起或完成的电子签约，不允许删除
|
||||
var results = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","projectStatus","project_id=<%=productId%>,FlowUnid=<%=sFlowUnid%>");
|
||||
var result = results.split("@");
|
||||
if(eval(result[0])==4){
|
||||
var flowName = "<%=flowName%>";
|
||||
if(eval(result[0])==4 && "ºÏͬ±ä¸üÁ÷³Ì"!=flowName){
|
||||
AsDebug.showMessage("提示","电子签约已完成,无发删除！","","",true);
|
||||
return;
|
||||
};
|
||||
if(eval(result[0])==8){
|
||||
if(eval(result[0])==8 && "ºÏͬ±ä¸üÁ÷³Ì"!=flowName){
|
||||
AsDebug.showMessage("提示","电子签约已发起,无发删除！","","",true);
|
||||
return;
|
||||
};
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
<%@ page contentType="text/html; charset=GBK"%>
|
||||
<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%>
|
||||
<%@page import="jbo.app.tenwa.customer.CUSTOMER_COMPANY_TEMP"%>
|
||||
<%@page import="jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP"%>
|
||||
<%@page import="com.amarsoft.app.check.CheckFLowPhaseNo"%>
|
||||
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
|
||||
/*
|
||||
@ -16,6 +18,11 @@
|
||||
String taskno=CurPage.getParameter("TaskNo");
|
||||
String nodeNo=CurPage.getParameter("NodeNo");
|
||||
String contractNo=CurPage.getParameter("ContractNo");
|
||||
String FlowKey=CurPage.getParameter("FlowKey");//获取合同编号
|
||||
String flowName=CurPage.getParameter("FlowName");//获取合同名称
|
||||
if(null==contractNo ||"null".equals(contractNo) ){
|
||||
contractNo=FlowKey;
|
||||
}
|
||||
String RightType= CurPage.getParameter("RightType");
|
||||
String phaseno = CheckFLowPhaseNo.run(flowunid, taskno);
|
||||
String sFileSaveMode = CurConfig.getConfigure("FileSaveMode");
|
||||
@ -26,6 +33,30 @@
|
||||
if(sPrevUrl == null) sPrevUrl = "";
|
||||
String sTempletNo = "BaseFileTemplateSelect";//--Ä£°åºÅ--
|
||||
|
||||
//获取对应的承租信息
|
||||
String certid=null;
|
||||
String mobile=null;
|
||||
String address=null;
|
||||
/* BizObjectManager lultm = JBOFactory.getBizObjectManager(LB_UNION_LESSEE_temp.CLASS_NAME);
|
||||
String sSql = "select o.CUSTOMER_ID FROM o where o.flowunid =:flowunid";
|
||||
BizObject lult = lultm.createQuery(sSql).setParameter("flowunid", flowunid).getSingleResult(false); */
|
||||
String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'");
|
||||
if("01".equals(customertype)){
|
||||
BizObjectManager cctm = JBOFactory.getBizObjectManager(CUSTOMER_COMPANY_TEMP.CLASS_NAME);
|
||||
String sSql = "select o.certid,o.tel,o.reg_address FROM o where o.customerid =:customerid";
|
||||
BizObject cct = cctm.createQuery(sSql).setParameter("customerid", customerid).getSingleResult(false);
|
||||
certid=cct.getAttribute("certid").getString();
|
||||
mobile=cct.getAttribute("tel").getString();
|
||||
address=cct.getAttribute("reg_address").getString();
|
||||
}else{
|
||||
BizObjectManager cptm = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME);
|
||||
String sSql = "select o.certid,o.mobile,o.nativeplace FROM o where o.customerid =:customerid and o.flowunid=:flowunid";
|
||||
BizObject cpt = cptm.createQuery(sSql).setParameter("customerid", customerid).setParameter("flowunid", flowunid).getSingleResult(false);
|
||||
certid=cpt.getAttribute("certid").getString();
|
||||
mobile=cpt.getAttribute("mobile").getString();
|
||||
address=cpt.getAttribute("nativeplace").getString();
|
||||
}
|
||||
|
||||
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
|
||||
String a="false";//ÈÚ×Ê×âÁÞ
|
||||
String b="false";//±£Àí
|
||||
@ -223,6 +254,9 @@
|
||||
tempParam["CONTRACT_ID"]="<%=sContractId%>";
|
||||
tempParam["PROJ_ID"]="<%=sProjId%>";
|
||||
tempParam["contractNo"]="<%=contractNo%>";
|
||||
tempParam["certid"]="<%=certid%>";
|
||||
tempParam["mobile"]="<%=mobile%>";
|
||||
tempParam["address"]="<%=address%>";
|
||||
|
||||
tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
dwTemp.setPageSize(20);
|
||||
dwTemp.genHTMLObjectWindow(sFlowUnid);
|
||||
String sButtons[][] =null;
|
||||
if((null!=RightType&&RightType.equals("ReadOnly")) || "ºÏͬÖÆ×÷Á÷³Ì".equals(FlowName)){
|
||||
if((null!=RightType&&RightType.equals("ReadOnly")) || "ｺﾏﾍｬﾖﾆﾗ<EFBFBD><EFBFBD>ﾌ".equals(FlowName)||"ｺﾏﾍｬｱ荳<EFBDB1><E88DB3>ﾌ".equals(FlowName)){
|
||||
sButtons=new String[][] {
|
||||
{"true","","Button","ÏêÇé","ÏêÇé","viewAndEdit2()","","","","btn_icon_edit"}
|
||||
};
|
||||
|
||||
@ -80,7 +80,11 @@
|
||||
setItemValue(0,getRow(),"FIST_RENT",terminateInfo.fist_rent);
|
||||
setItemValue(0,getRow(),"FIST_CORPUS",terminateInfo.fist_corpus);
|
||||
setItemValue(0,getRow(),"HANDLING_CHARGE",Number(terminateInfo.fist_corpus*0.05).toFixed(2));
|
||||
setItemValue(0,getRow(),"REPAYMENT_INTEREST",terminateInfo.REPAYMENT_INTEREST);
|
||||
if(terminateInfo.fist_rent>0){
|
||||
setItemValue(0,getRow(),"REPAYMENT_INTEREST","0");
|
||||
}else{
|
||||
setItemValue(0,getRow(),"REPAYMENT_INTEREST",terminateInfo.REPAYMENT_INTEREST);
|
||||
}
|
||||
|
||||
setItemValue(0,getRow(),"SDNOMINAL_PRICE","0");
|
||||
setItemValue(0,getRow(),"SDHANDLING_CHARGE","0");
|
||||
@ -166,7 +170,8 @@
|
||||
setItemValue(0,getRow(),p,result[p]);
|
||||
}
|
||||
}
|
||||
|
||||
setItemValue(0,getRow(),"OTHER_IN","0");
|
||||
setItemValue(0,getRow(),"OTHER_OUT","0");
|
||||
});
|
||||
</script>
|
||||
<%@ include file="/Frame/resources/include/include_end.jspf"%>
|
||||
@ -16,8 +16,9 @@
|
||||
var product_id=sReturn[2];
|
||||
var contract_number = sReturn[3];
|
||||
var project_name = sReturn[4];
|
||||
var customertype = sReturn[5];
|
||||
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
|
||||
sParams =sParams+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
|
||||
sParams =sParams+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
|
||||
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
|
||||
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
|
||||
var sReturnInfos=sReturnInfo.split("@");
|
||||
|
||||
@ -70,4 +70,5 @@ base.filter.user.role.id=none
|
||||
|
||||
base.business.type=1
|
||||
base.company.doc.name=\u627F\u79DF\u4EBA\u8EAB\u4EFD\u8BC1\uFF08\u6B63\u53CD\u9762\uFF09@\u627F\u79DF\u4EBA\u8EAB\u4EFD\u8BC1\uFF08\u6B63\u53CD\u9762\uFF09
|
||||
base.person.doc.name=\u627F\u79DF\u4EBA\u8EAB\u4EFD\u8BC1\uFF08\u6B63\u53CD\u9762\uFF09@\u627F\u79DF\u4EBA\u8EAB\u4EFD\u8BC1\uFF08\u6B63\u53CD\u9762\uFF09
|
||||
base.person.doc.name=\u5171\u540C\u627F\u79DF\u4EBA\u8EAB\u4EFD\u8BC1\uFF08\u6B63\u53CD\u9762\uFF09@\u5171\u540C\u627F\u79DF\u4EBA\u8EAB\u4EFD\u8BC1\uFF08\u6B63\u53CD\u9762\uFF09,\u62C5\u4FDD\u4EBA\u8EAB\u4EFD\u8BC1\uFF08\u6B63\u53CD\u9762\uFF09@\u62C5\u4FDD\u4EBA\u8EAB\u4EFD\u8BC1\uFF08\u6B63\u53CD\u9762\uFF09
|
||||
|
||||
|
||||
@ -31,6 +31,8 @@ public class ConditionBean implements Cloneable{
|
||||
private String custId;//客户编号
|
||||
private String plannumber;//方案编号
|
||||
|
||||
private int oldIncomeNumber;//原还款总期次
|
||||
private Boolean deferStr=false;//是否展期
|
||||
|
||||
//*********************************************************************************【授信条件开始：】
|
||||
private String equipAmt;//设备款
|
||||
@ -1716,4 +1718,17 @@ public class ConditionBean implements Cloneable{
|
||||
public void setFinalPaymentMethod(String finalPaymentMethod) {
|
||||
this.finalPaymentMethod = finalPaymentMethod;
|
||||
}
|
||||
public int getOldIncomeNumber() {
|
||||
return oldIncomeNumber;
|
||||
}
|
||||
public void setOldIncomeNumber(int oldIncomeNumber) {
|
||||
this.oldIncomeNumber = oldIncomeNumber;
|
||||
}
|
||||
public Boolean getDeferStr() {
|
||||
return deferStr;
|
||||
}
|
||||
public void setDeferStr(Boolean deferStr) {
|
||||
this.deferStr = deferStr;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -532,6 +532,7 @@ public class CreateTransactionExecutor implements Transaction {
|
||||
AdjustBean ab = ObjectConvertUtils.converBizObjectToBean(AdjustBean.class, bo);
|
||||
RentChangeExe exe = new RentChangeExe(tx);
|
||||
ConditionBean csOld=bean.getCb().clone();
|
||||
csOld.setOldIncomeNumber(csOld.getIncomeNumber());
|
||||
FundRentPlanBean rentPlan = exe.create(bean.getCb(), ab, bean);
|
||||
//设置新的
|
||||
csOld.setIncomeNumber(ab.getAdjustList());
|
||||
|
||||
@ -159,7 +159,6 @@ public abstract class FundRentPlanExecutor {
|
||||
bm.createQuery(sql).executeUpdate();
|
||||
}
|
||||
public abstract FundRentPlanBean create(TabCalBean tcb,Integer startList) throws Exception ;
|
||||
|
||||
public FundRentPlanBean createOnhire(TabCalBean tcb ) throws Exception {
|
||||
ConditionBean cb = tcb.getCb();
|
||||
// 查询他的租金计划
|
||||
@ -212,6 +211,6 @@ public abstract class FundRentPlanExecutor {
|
||||
retainage = retainage.add(new BigDecimal(cb.getFactoryAccessories()));
|
||||
}
|
||||
cb.setShare(share);
|
||||
cb.setRetainage(retainage);
|
||||
//cb.setRetainage(retainage);
|
||||
}
|
||||
}
|
||||
|
||||
@ -145,7 +145,7 @@ public class RentCalHelper {
|
||||
+ " sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.remaininterest else 0 end ) remaininterest, "
|
||||
+" sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.corpus else 0 end ) remainfincorpus,"
|
||||
+" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.interest else 0 end ) remainfininterest,"
|
||||
+" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') <= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.overduerent else 0 end ) overduerent,sum(case when t.cou< t.planlist and t.planlist-t.cou<=12-t.cou then t.rent else 0 end) fist_rent,"
|
||||
+" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') < DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.overduerent else 0 end ) overduerent,sum(case when t.cou< t.planlist and t.planlist-t.cou<=12-t.cou then t.rent else 0 end) fist_rent,"
|
||||
+ " sum(case when t.cou< t.planlist and t.planlist-t.cou>12-t.cou then t.corpus else 0 end) fist_corpus,"
|
||||
+ " max( case when DATE_FORMAT(t.plandate, '%Y/%m/%d') < DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.plandate else '0' end) plandate"
|
||||
+ " from ("
|
||||
@ -156,7 +156,7 @@ public class RentCalHelper {
|
||||
+ " t1.corpus,"
|
||||
+ " t1.interest,"
|
||||
+ " t1.plandate,"
|
||||
+ " t1.planlist,IFNULL(t2.cou,0) cou"
|
||||
+ " t1.planlist,IFNULL(t2.planlist,0) cou"
|
||||
+ " from ("
|
||||
+ " select cfrp.plan_date plandate,"
|
||||
+ " cfrp.plan_list planlist,"
|
||||
@ -174,7 +174,7 @@ public class RentCalHelper {
|
||||
+ " ,sum(cfri.interest ) sumincomeinterest,"
|
||||
+ " sum( cfri.rent ) sumincomerent,"
|
||||
+ " min(cfri.contract_id) contractid,"
|
||||
+ " cfri.plan_list planlist,count(1) cou"
|
||||
+ " cfri.plan_list planlist "
|
||||
+ " from LC_RENT_INCOME cfri "
|
||||
+ " where cfri.contract_id = ? and payment_number=?"
|
||||
+ " group by cfri.plan_list"
|
||||
|
||||
@ -72,9 +72,12 @@ public class RentChangeExe {
|
||||
FundRentPlanBean frpb = this.before(cb, ab, tcb);
|
||||
FundRentPlanExecutor executor = this.getPmtExe(cb);
|
||||
// 得到正常pmt租金测算后的租金计划
|
||||
frpb = executor.create(tcb,startList);
|
||||
|
||||
|
||||
if(ab.getAdjustList()>cb.getOldIncomeNumber()){
|
||||
cb.setDeferStr(true);
|
||||
frpb = executor.create(tcb,startList);
|
||||
}else{
|
||||
frpb = executor.createOnhire(tcb);
|
||||
}
|
||||
//重置起租日
|
||||
String start_date="";
|
||||
if(ab.getPaydayAdjust()==null||ab.getPaydayAdjust().equals("")){
|
||||
@ -85,7 +88,7 @@ public class RentChangeExe {
|
||||
if(ab.getStartList()==1){
|
||||
start_date=cb.getStartDate();
|
||||
}else{
|
||||
start_date=frpb.getPlanDateList().get(ab.getStartList()-2).toString();
|
||||
start_date=ab.getPaydayAdjust();
|
||||
}
|
||||
}
|
||||
cb.setStartDate(start_date);
|
||||
|
||||
@ -73,7 +73,11 @@ public class RentalServiceImpl {
|
||||
}else{
|
||||
BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment());
|
||||
if(finalPayment.compareTo(BigDecimal.ZERO) != 0) {
|
||||
rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, finalPayment.toString(), cb.getPeriodType())).toString();
|
||||
if(cb.getDeferStr()){
|
||||
rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, "0", cb.getPeriodType())).toString();
|
||||
}else{
|
||||
rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, finalPayment.toString(), cb.getPeriodType())).toString();
|
||||
}
|
||||
} else {
|
||||
rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, cb.getEquipEndValue(), cb.getPeriodType())).toString();
|
||||
}
|
||||
|
||||
@ -5,11 +5,10 @@
|
||||
#ce shi huan jing url dai shou collect si yao su bank feiyasuo
|
||||
com.tenwa.yangdm.collect.serverUrl=http://59.41.103.98:333/gzdsf/ProcessServlet
|
||||
com.tenwa.yangdm.bank.serverUrl=http://59.41.103.98:9110/gzdsf/ProcessServlet
|
||||
|
||||
#---------------------------------------------------------------------------------------------
|
||||
|
||||
#clearFile downUrl
|
||||
com.tenwa.yangdm.bank.clearRequestUrl=http://59.41.103.98:333/gzdsf/GetSettFile.do
|
||||
com.tenwa.yangdm.bank.clearRequestUrl=http://59.41.103.98:9110/gzdsf/GetSettFile.do
|
||||
#com.tenwa.yangdm.merchantId=000191400207649
|
||||
#test shang hu dai ma
|
||||
com.tenwa.yangdm.merchantId=001053110000001
|
||||
|
||||
@ -25,7 +25,7 @@ c3p0.preferredTestQuery=select 1
|
||||
|
||||
org.quartz.scheduler.skipUpdateCheck=true
|
||||
#QuartzScheduler
|
||||
org.quartz.scheduler.instanceName=liuyifan
|
||||
org.quartz.scheduler.instanceName=QuartzScheduler
|
||||
org.quartz.scheduler.instanceId=AUTO
|
||||
org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
|
||||
org.quartz.threadPool.threadCount=50
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user