From c4e4b984d062ecde4240ef88a2f15c3fe4b48580 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Sun, 7 Feb 2021 13:51:27 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=87=AF=E6=8D=B7=E5=AF=B9=E6=8E=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lease/flow/project/commbusiness/PlatformDataToTemp.java | 3 ++- .../flow/project/commbusiness/PlatformDataToTempNotKjflc.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java index 3be856fcc..868068195 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java @@ -40,7 +40,8 @@ public class PlatformDataToTemp extends BaseBussiness { this.initBussinessParam(Sqlca); if (this.getAttribute("serial") == null) return "true"; String channel_kjflc = InterfacePlatformConfigure.get("channel_kjflc"); - if (this.getAttribute("channel") != null && !this.getAttribute("channel").toString().equals(channel_kjflc)) +// if (this.getAttribute("channel") != null && !this.getAttribute("channel").toString().equals(channel_kjflc)) + if (this.getAttribute("channel") != null) return "true"; ASUser asUser = new ASUser(this.getAttribute("CurUserID").toString()); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java index be59e4c4d..10aaea9f9 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java @@ -34,8 +34,8 @@ public class PlatformDataToTempNotKjflc extends BaseBussiness { this.initBussinessParam(Sqlca); if (this.getAttribute("serial") == null) return "true"; String channel_kjflc = InterfacePlatformConfigure.get("channel_kjflc"); - if (this.getAttribute("channel") != null && this.getAttribute("channel").toString().equals(channel_kjflc)) - return "true"; +// if (this.getAttribute("channel") != null && this.getAttribute("channel").toString().equals(channel_kjflc)) +// return "true"; String flowunid = this.getAttribute("ObjectNo").toString(); String projectId = this.getAttribute("ProjectId").toString(); From 88395472485ab0962a4ea7d17860ec39755fcc9b Mon Sep 17 00:00:00 2001 From: zhanglei Date: Thu, 4 Mar 2021 11:53:57 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E7=9B=B4=E8=90=A5=E5=BA=97=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp | 20 +++++++--- .../DistributorApproval/LDistributorInfo.jsp | 2 +- .../DistributorChange/LDistributorInfo.jsp | 2 +- .../ProjectDistriborInfo.jsp | 12 +++++- .../ProjectApprovalCreationInfo.jsp | 38 ++++++++++++++++--- 5 files changed, 60 insertions(+), 14 deletions(-) diff --git a/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp b/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp index 1f04aa4ad..959081b5e 100644 --- a/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp +++ b/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp @@ -27,13 +27,21 @@ String id = Sqlca.getString("select id from LM_GPS_ORDER_TEMP where APPLY_NO='"+ProjectNo+"'"); String contact_name = Sqlca.getString("select CONTACT_NAME from GPS_config_info where isenable='1' ");//派工联系人 String contact_phone = Sqlca.getString("select CONTACT_PHONE from GPS_config_info where isenable='1' ");//派工联系人电话 - System.out.println("经销商orgId=" + CurUser.getOrgID()); - //如果部门是南京直销的话 CurUser.getOrgID()== 8006014 拉车单位显示南京直销 - String distributor_name = "安鹏汽车业务直销部（江苏）"; - if(!"8006014".equals(CurUser.getOrgID())){ + + //如果当前有记录优先取数据库中的记录 + String distributor_name = ""; + if("null".equals(id)){ + System.out.println("经销商orgId=" + CurUser.getOrgID()); + String distributor_id = Sqlca.getString("select distributor_id from lb_project_info where id='"+ProjectId+"'");//获取经销商ID + distributor_name = Sqlca.getString("select distributor_name from distributor_info where distributor_no='"+distributor_id+"'");//获取经销名称 + }else { + distributor_name = Sqlca.getString("select CAR_ACCOUNT from LM_GPS_ORDER_TEMP where APPLY_NO='"+ProjectNo+"'"); + System.out.println("经销商distributor_name=" + distributor_name); + } + //如果当前部门为直销&&有记录&&0010显示 直销 或者 无记录&&直销&&0010 + if("8006014".equals(CurUser.getOrgID()) && "0010".equals(PhaseNo)){ System.out.println("经销商id不等于【8006014】，经销商id=" + CurUser.getOrgID()); - String distributor_id = Sqlca.getString("select distributor_id from lb_project_info where id='"+ProjectId+"'");//获取经销商ID - distributor_name = Sqlca.getString("select distributor_name from distributor_info where distributor_no='"+distributor_id+"'");//获取经销名称 + distributor_name = "安鹏汽车业务直销部（江苏）"; } BigDecimal incomNuber = new BigDecimal(Sqlca.getString("select INCOME_NUMBER from LC_CALC_CONDITION_TEMP where FLOWUNID='"+flowunid+"'")); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp index 25810df47..2c7c7ac28 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp @@ -204,7 +204,7 @@ $(function(){ //请选择经销商名称 function selectcompany(){ - AsDialog.OpenSelector("SelectCompany","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + AsDialog.OpenSelector("SelectCompanyNew","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ alert(getHtmlMessage('1'));//请选择一条信息！ return; diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp index b898e4c68..4cc48399d 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp @@ -100,7 +100,7 @@ function saveproj_name(){ //请选择经销商名称 function selectcompany(){ - AsDialog.OpenSelector("SelectCompany","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + AsDialog.OpenSelector("SelectCompanyNew","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ alert(getHtmlMessage('1'));//请选择一条信息！ return; diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp index 834a5f096..d7c08a3af 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp @@ -7,6 +7,16 @@ */ String sPrevUrl = CurPage.getParameter("PrevUrl"); String flowunid = CurPage.getParameter("FlowUnid"); + String productId = CurPage.getParameter("ProductId"); + String distributorNo = CurPage.getParameter("distributorNo"); + String orgId = CurUser.getOrgID(); + //如果是直营店，则显示子经销。 + String sSql = "select DISTRIBUTOR_NO,F_I_TYPE from O where ORGID = :orgId"; + // F_I_TYPE=f_i_type03 直营店 + BizObject bo = JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", sSql).setParameter("orgId", orgId).getSingleResult(false); + if(bo != null){ + distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); + } String phaseNo = CurPage.getParameter("PhaseNo"); if(sPrevUrl == null) sPrevUrl = ""; @@ -34,7 +44,7 @@ } function selectDistributor(){ - AsDialog.OpenSelector("selectDistributor","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + AsDialog.OpenSelector("selectDistributorNew","distributorNum,<%=distributorNo%>,productId,,<%=productId%>","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="") { diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index 14310a9f4..2d19c905e 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -25,6 +25,19 @@ <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info02;Describe=定义变量，获取参数;]~*/%> <% + String distributorNo = ""; + String distributorType = ""; + String orgId = CurUser.getOrgID(); + //如果是直营店，则显示子经销。 + String sSql = "select DISTRIBUTOR_NO,F_I_TYPE from O where ORGID = :orgId"; + // F_I_TYPE=f_i_type03 直营店 + BizObject bo = JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", sSql).setParameter("orgId", orgId).getSingleResult(false); + if(bo != null){ + distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); + distributorType = bo.getAttribute("F_I_TYPE").getString(); + } + System.out.println(distributorNo); + System.out.println(distributorType); String sApplyType = CurPage.getParameter("ApplyType"); String sInputUserID = CurUser.getUserID(); @@ -102,7 +115,7 @@ setItemValue(0,getRow(),"geartype",data[10]); setItemValue(0,getRow(),"newtype","ysp"); - + setItemValue(0,0,"CUSTOMER_TYPE","03"); setItemValue(0,0,"certtype","Ind01"); } @@ -113,6 +126,16 @@ function changeProductName(){//清空产品名称 setItemValue(0,getRow(0),"productName",""); } + + //判断经销商是否显示: 如果为自营则显示 + function checkDispalyDistributor() { + var distributorNo22 = "<%=distributorNo%>"; + var distributorType22 = "<%=distributorType%>"; + if(distributorType22 == "f_i_type03"){ + return true; + } + return false; + } function checkNameAndCertId(){//校验姓名和证件号 //var customerName = getItemValue(0,getRow(),"CustomerName"); @@ -198,12 +221,14 @@ alert(message[1]); return; } - + var distributorType = "<%=distributorType%>"; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+message[1]+",ProductId="+productId+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem+",custname="+custname+",certtype="+certtype+",certid="+certid+",CustomerId="+CustomerId+",productModel="+productModel+",carSeries="+carSeries+",versionid="+versionid+",modelid="+modelid+",businessType="+businessType+",price="+price+",liter="+liter+",geartype="+geartype+",sourcetype=web,operationType="+operationType+",newtype="+newtype; sParams =sParams+",cartype="+cartype+",vehicletype="+vehicletype+",vehiclelevel="+vehiclelevel;//赋值新增的三个车型信息 + sParams =sParams+",distributorType="+distributorType;//新增自营店信息作为显示经销商变更页签显示条件 // - if("BAIC_MOTOR"==operationType){ + // if("BAIC_MOTOR"==operationType){ + if(checkDispalyDistributor()){ sParams = sParams+",distributorNo="+getItemValue(0,getRow(),"distributorNo")+",distributorName="+getItemValue(0,getRow(),"distributorName"); } //如果是个人，将对应的性别参数参数到流程中 @@ -405,6 +430,8 @@ setItemValue(0,0,"versionid",sReturn[4]); setItemValue(0,0,"carAttributes",sReturn[9]); setItemValue(0,0,"leasehold",sReturn[10]); + setItemValue(0,0,"distributorName",""); + setItemValue(0,0,"distributorNo",""); dispalyDistributor(operationType);//根据产品判断是否选择经销商 },"请选择产品",''); }else{ @@ -451,7 +478,7 @@ } //根据产品是否选择经销商 function dispalyDistributor(operationType){ - if("BAIC_MOTOR"==operationType){ + if(checkDispalyDistributor()){ $("#A_div_0150").attr("style","display:block;"); setItemRequired(0,"DISTRIBUTORNAME",true); }else{ @@ -460,7 +487,8 @@ } } function selectDistributor(){ - AsDialog.OpenSelector("selectDistributor","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + var productId = getItemValue(0,0,"productId"); + AsDialog.OpenSelector("selectDistributorNew","distributorNum,<%=distributorNo%>,productId,"+productId,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="") { From 57b54cee11cf8d80ed630b56a5d2e0092f3f5d31 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 19 Mar 2021 10:01:12 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=87=AF=E6=8D=B7=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=AF=B9=E5=BA=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lease/flow/project/commbusiness/PlatformDataToTemp.java | 2 +- .../flow/project/commbusiness/PlatformDataToTempNotKjflc.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java index 3be856fcc..f969dfa07 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java @@ -40,7 +40,7 @@ public class PlatformDataToTemp extends BaseBussiness { this.initBussinessParam(Sqlca); if (this.getAttribute("serial") == null) return "true"; String channel_kjflc = InterfacePlatformConfigure.get("channel_kjflc"); - if (this.getAttribute("channel") != null && !this.getAttribute("channel").toString().equals(channel_kjflc)) + if (this.getAttribute("channel") != null) return "true"; ASUser asUser = new ASUser(this.getAttribute("CurUserID").toString()); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java index be59e4c4d..10aaea9f9 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java @@ -34,8 +34,8 @@ public class PlatformDataToTempNotKjflc extends BaseBussiness { this.initBussinessParam(Sqlca); if (this.getAttribute("serial") == null) return "true"; String channel_kjflc = InterfacePlatformConfigure.get("channel_kjflc"); - if (this.getAttribute("channel") != null && this.getAttribute("channel").toString().equals(channel_kjflc)) - return "true"; +// if (this.getAttribute("channel") != null && this.getAttribute("channel").toString().equals(channel_kjflc)) +// return "true"; String flowunid = this.getAttribute("ObjectNo").toString(); String projectId = this.getAttribute("ProjectId").toString(); From e91d00130c9b067a9f0d7774e35da48a240223c6 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 19 Mar 2021 10:34:59 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E7=9B=B4=E8=90=A5=E5=BA=97=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDistriborInfo.jsp | 54 +++++++++---------- .../ProjectApprovalCreationInfo.jsp | 8 +-- .../LBProjectIntoTempInitCarBusiness.java | 8 +-- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp index d7c08a3af..0394926a8 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp @@ -9,14 +9,14 @@ String flowunid = CurPage.getParameter("FlowUnid"); String productId = CurPage.getParameter("ProductId"); String distributorNo = CurPage.getParameter("distributorNo"); - String orgId = CurUser.getOrgID(); - //如果是直营店，则显示子经销。 - String sSql = "select DISTRIBUTOR_NO,F_I_TYPE from O where ORGID = :orgId"; - // F_I_TYPE=f_i_type03 直营店 - BizObject bo = JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", sSql).setParameter("orgId", orgId).getSingleResult(false); - if(bo != null){ - distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); - } + String orgId = CurUser.getOrgID(); + //如果是直营店，则显示子经销。 + String sSql = "select DISTRIBUTOR_NO,F_I_TYPE from O where ORGID = :orgId"; + // F_I_TYPE=f_i_type03 直营店 + BizObject bo = JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", sSql).setParameter("orgId", orgId).getSingleResult(false); + if(bo != null){ + distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); + } String phaseNo = CurPage.getParameter("PhaseNo"); if(sPrevUrl == null) sPrevUrl = ""; @@ -25,38 +25,38 @@ String flag = "false"; if("0010".equals(phaseNo)||"0020".equals(phaseNo)){ doTemp.setColInnerBtEvent("DISTRIBUTOR_NAME", "selectDistributor()"); - flag = "true"; + flag = "true"; } ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 dwTemp.genHTMLObjectWindow(flowunid); - + String sButtons[][] = { - {flag,"All","Button","保存","保存所有修改","as_save(0)","","","",""}, + {flag,"All","Button","保存","保存所有修改","as_save(0)","","","",""}, // {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} }; // sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index 2d19c905e..f8bce9363 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -29,12 +29,12 @@ String distributorType = ""; String orgId = CurUser.getOrgID(); //如果是直营店，则显示子经销。 - String sSql = "select DISTRIBUTOR_NO,F_I_TYPE from O where ORGID = :orgId"; - // F_I_TYPE=f_i_type03 直营店 + String sSql = "select DISTRIBUTOR_NO,TYPE from O where ORGID = :orgId"; + // TYPE=type03 直营店 包含 中车 BizObject bo = JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", sSql).setParameter("orgId", orgId).getSingleResult(false); if(bo != null){ distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); - distributorType = bo.getAttribute("F_I_TYPE").getString(); + distributorType = bo.getAttribute("TYPE").getString(); } System.out.println(distributorNo); System.out.println(distributorType); @@ -131,7 +131,7 @@ function checkDispalyDistributor() { var distributorNo22 = "<%=distributorNo%>"; var distributorType22 = "<%=distributorType%>"; - if(distributorType22 == "f_i_type03"){ + if(distributorType22 == "type03"){ return true; } return false; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index 2facebcd2..c56a1cae0 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -121,9 +121,9 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { //cust_type.cust if("cust_type.cust".equals(custType)){ BizObject distributorBo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false); - String fiType = distributorBo.getAttribute("F_I_TYPE").toString(); + String distributorType = distributorBo.getAttribute("TYPE").toString(); if((this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())) - || "f_i_type03".equals(fiType)){//自营店 + || "type03".equals(distributorType)){//自营店 distributoIid=this.getAttribute("distributorNo").toString(); vndrName=this.getAttribute("distributorName").toString(); }else{ @@ -195,9 +195,9 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { this.saveBusinessStatus(bsbom, tx, asUser);//项目进度表 }else{ BizObject distributorBo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false); - String fiType = distributorBo.getAttribute("F_I_TYPE").toString(); + String fiType = distributorBo.getAttribute("TYPE").toString(); if((this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())) - || "f_i_type03".equals(fiType)){//自营店 + || "type03".equals(fiType)){//自营店 distributoIid=this.getAttribute("distributorNo").toString(); vndrName=this.getAttribute("distributorName").toString(); }else{ From 28ead09158857a44a09974fc230a34da728ebf08 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Sat, 20 Mar 2021 18:16:20 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AD=E8=BD=A6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=E9=80=BB=E8=BE=91=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBDebitCard/DebitCardInfo.jsp | 6 ++- .../BusinessProjectTempInfo.jsp | 43 ++++++++++++++++++- .../BusinessApplication/CustomerInfo.jsp | 10 +++-- .../ProjectApprovalCreationInfo.jsp | 17 ++++++-- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 15 +++++++ .../customerfilterlist/DebitCardAction.java | 24 ++++++++++- .../tenwa/lease/comm/LB_CONTRACT_INFO.java | 12 ++++++ .../lease/comm/LB_CONTRACT_INFO_HIS.java | 12 ++++++ .../lease/comm/LB_CONTRACT_INFO_TEMP.java | 12 ++++++ .../com/tenwa/lease/comm/LB_PROJECT_INFO.java | 12 ++++++ .../lease/comm/LB_PROJECT_INFO_TEMP.java | 12 ++++++ src_sql/棰勬姇SQL/v20210415/tft20210415.sql | 19 ++++++++ .../businessapply/CustomerInfoManage.java | 32 ++++++++++++++ src_tenwa/com/tenwa/util/ProjectConstant.java | 1 + 14 files changed, 215 insertions(+), 12 deletions(-) create mode 100644 src_sql/棰勬姇SQL/v20210415/tft20210415.sql diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index b4d2434b7..d1dd2cac8 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -23,6 +23,7 @@ String ApplyType=CurPage.getParameter("ApplyType"); String PhaseNo=CurPage.getParameter("PhaseNo"); String subjectId=CurPage.getParameter("SubjectId");//获取主体信息，用于是否签约查询 + String channel=CurPage.getParameter("channel"); BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); BizObject ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractId).getSingleResult(false); System.out.print("=========="+ldcls+"=========="); @@ -188,13 +189,16 @@ } if("BusinessApplyApply"=="<%=ApplyType%>"||"BusinessChangeApply"=="<%=ApplyType%>"||"BContractApproveApply"=="<%=ApplyType%>"||"BContractChangeApply"=="<%=ApplyType%>"){ - var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>,subjectId=<%=subjectId%>,collect_type="+getItemValue(0,getRow(),"collect_type"); + var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>,subjectId=<%=subjectId%>,channel=<%=channel%>,collect_type="+getItemValue(0,getRow(),"collect_type"); var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams); if("false"==meassge){ alert("合同已生成，请先删除合同再修改扣款卡信息！"); return ; }else if("Y"==meassge){ setItemValue(0,0,"sign_status","Y"); + }else if("ZCfalse" == meassge){ + alert("该扣款卡信息没有签约，无法保存！"); + return ; }else{ setItemValue(0,0,"sign_status",""); } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 2439981d9..402f30d83 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -19,6 +19,8 @@ BizObject bo=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT", "flow_unid=:flowunid").setParameter("flowunid",sFlowUnid).getSingleResult(false); String custype = CurPage.getParameter("CustomerType"); String customertype = CurPage.getParameter("customertype"); + String channel = CurPage.getParameter("channel"); + ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setHtmlEvent("inputTel","onChange","checkTel"); //租赁形式set只读 @@ -42,7 +44,12 @@ if("01".equals(custype)||"01".equals(customertype)){ userll="/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp?CompClientID="; } - + if("ZC".equals(channel)){ + doTemp.setVisible("ZC_PROJECT_NUMBER",true); + doTemp.setRequired("ZC_PROJECT_NUMBER",true); + doTemp.setVisible("ZC_CONTRACT_NUMBER",true); + doTemp.setRequired("ZC_CONTRACT_NUMBER",true); + } ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); dwTemp.Style = "2";//freeform dwTemp.setGroupHidden("0020"); @@ -70,10 +77,20 @@ if(!checkTel()){ return ; } + if("ZC"=="<%=channel%>"){ + if(!checkZcProjectNumber()){ + return ; + } + if(!checkZcContractNumber()){ + return ; + } + } var leasfrom = getItemValue(0,getRow(),"LEAS_FORM"); var projectSource = getItemValue(0,getRow(),"PROJECT_SOURCE"); var inputName = getItemValue(0,getRow(),"inputName"); var inputTel = getItemValue(0,getRow(),"inputTel"); + var zcProjectNumber = getItemValue(0,getRow(),"ZC_PROJECT_NUMBER"); + var zcContractNumber = getItemValue(0,getRow(),"ZC_CONTRACT_NUMBER"); var customerType = "<%=custype%>"; var customerT = "<%=customertype%>"; var projectNo=getItemValue(0,getRow(),"PROJECT_NO"); @@ -100,7 +117,7 @@ //as_save(0); } if(customerType=="03"||customerT=="03"){//自然人 - frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType); + frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType,zcProjectNumber,zcContractNumber); //as_save("myiframe0","frame_list.window.as_save(0);"); } } @@ -130,5 +147,27 @@ return true; } } + + function checkZcProjectNumber(){ + var zcProjectNumber = getItemValue(0,getRow(0),"ZC_PROJECT_NUMBER"); + if(zcProjectNumber==""){ + setErrorTips("ZC_PROJECT_NUMBER","中车申请号不能为空!"); + return false; + }else{ + setErrorTips("ZC_PROJECT_NUMBER",""); + return true; + } + } + + function checkZcContractNumber(){ + var zcContractNumber = getItemValue(0,getRow(0),"ZC_CONTRACT_NUMBER"); + if(zcContractNumber==""){ + setErrorTips("ZC_CONTRACT_NUMBER","中车合同号不能为空!"); + return false; + }else{ + setErrorTips("ZC_CONTRACT_NUMBER",""); + return true; + } + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 4f90b2071..172810e3c 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -14,6 +14,8 @@ String FlowName = CurPage.getParameter("FlowName");//获取流程名称 String IsHistory = CurPage.getParameter("IsHistory");//获取流程名称 String projectId = CurPage.getParameter("ProjectId"); + String channel = CurPage.getParameter("channel"); + String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'"); String sTempletNo = "";//--模板号-- String sexChange=""; @@ -439,7 +441,7 @@ } */ } - function saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType){//保存 + function saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType,zcProjectNumber,zcContractNumber){//保存 //校验申请人手机号和配偶手机号是否重复 var RepeatReault = ""; var customerType = "03"; @@ -559,13 +561,13 @@ var certid=getItemValue(0,0,"CERTID"); <%-- var customerid=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerAction","updateCustomerId",'certid='+certid+',flowunid=<%=flowunid%>'); --%> // setItemValue(0,0,"customerid",customerid); - as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"','"+leasfrom+"','"+projectSource+"','"+projectNo+"','"+operationType+"')"); + as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"','"+leasfrom+"','"+projectSource+"','"+projectNo+"','"+operationType+"','"+zcProjectNumber+"','"+zcContractNumber+"')"); return true; }; } - function saveCertInfo(inputName,inputTel,leasfrom,projectSource,projectNo,operationType){ - var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCertInfo",'projectNo='+projectNo+',inputName='+inputName+',operationType='+operationType+',inputTel='+inputTel+',project_source='+projectSource+',leas_from='+leasfrom+',idexpiry='+getItemValue(0,0,"idexpiry")+',certtype='+getItemValue(0,0,"certtype")+',customerid='+getItemValue(0,0,"customerid")+',flowunid=<%=flowunid%>,certid='+getItemValue(0,0,"certid")+',name='+getItemValue(0,0,"name")+',userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>'); + function saveCertInfo(inputName,inputTel,leasfrom,projectSource,projectNo,operationType,zcProjectNumber,zcContractNumber){ + var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCertInfo",'zcProjectNumber='+zcProjectNumber+',zcContractNumber='+zcContractNumber+',projectNo='+projectNo+',inputName='+inputName+',operationType='+operationType+',inputTel='+inputTel+',project_source='+projectSource+',leas_from='+leasfrom+',idexpiry='+getItemValue(0,0,"idexpiry")+',certtype='+getItemValue(0,0,"certtype")+',customerid='+getItemValue(0,0,"customerid")+',flowunid=<%=flowunid%>,certid='+getItemValue(0,0,"certid")+',name='+getItemValue(0,0,"name")+',userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>,channel=<%=channel%>'); if(sResult == "SUCCESS"){ parent.reloadSelf(); } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index f8bce9363..a2959fd7b 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -1,4 +1,5 @@ <%@ page contentType="text/html; charset=GBK"%> +<%@ page import="com.tenwa.util.ProjectConstant"%> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%> <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%> @@ -36,6 +37,7 @@ distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); distributorType = bo.getAttribute("TYPE").getString(); } + String distributorNoConfig = ProjectConstant.DISTIRBUTOR_NO;//获取需要配置经销商 System.out.println(distributorNo); System.out.println(distributorType); String sApplyType = CurPage.getParameter("ApplyType"); @@ -88,7 +90,11 @@ <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%> -<%/*~END~*/%> + if(!checkCertInfo(true)) return ; + if(!iV_all(0)) return ; + saveRecord(); + } + + /*~[Describe=返回列表;InputParam=无;OutPutParam=无;]~*/ + function doCancel() + { + parent.AsDialog.ClosePage(); + reloadSelf(); + } + + +<%/*~END~*/%> <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info07;Describe=自定义函数;]~*/%> - + if(CheckLicense(certid) ){ + return true; + }else{ + setErrorTips("certid","身份证格式错误！"); + return false; + } + } + if(certType =='Ent02'){ + if(!checkORGRight(certid) ){ + setErrorTips("certid","统一社会信用代码格式错误！"); + return false; + } + } + return true; + } + + <%/*~END~*/%> - - + + <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info08;Describe=页面装载时，进行初始化;]~*/%> - - <%/*~END~*/%> - - + +<%/*~END~*/%> + + <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 7e45ecda124d6532d91a77b37c167cf066d48d2f Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Mon, 22 Mar 2021 15:49:44 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=BC=8F=E6=8E=89sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/棰勬姇SQL/v20210415/zhangbb20210415.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src_sql/棰勬姇SQL/v20210415/zhangbb20210415.sql b/src_sql/棰勬姇SQL/v20210415/zhangbb20210415.sql index bf15427ee..2e189e10f 100644 --- a/src_sql/棰勬姇SQL/v20210415/zhangbb20210415.sql +++ b/src_sql/棰勬姇SQL/v20210415/zhangbb20210415.sql @@ -1,6 +1,9 @@ INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LoanSimulationBasicFlexibleInfo', '0170', '0170', '1', 'O', 'PERSONAL_INSURANCE', 'PERSONAL_INSURANCE', 'Number', '0', '个人意外险', '元', '1', 'Text', '2', '1', '', '', '', null, '1', '0', '0', '1', '0', 0, '', 'credit_conditon', '', 'SYS_Designer', '2021/01/02 09:16:37', 'SYS_Designer', '2021/01/02 09:16:37', '0', '', '1', '', '', '', ''); INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LoanSimulationBasicFlexibleInfo', '0175', '0175', '1', 'O', 'DISCOUNT_INTEREST', 'DISCOUNT_INTEREST', 'Number', '0', '贴息', '元', '1', 'Text', '2', '1', '', '', '', null, '1', '0', '0', '1', '0', 0, '', 'credit_conditon', '', 'SYS_Designer', '2021/01/02 09:16:37', 'SYS_Designer', '2021/01/02 09:16:37', '0', '', '1', '', '', '', ''); +INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LCFundPaymentTempInfo', '0240', '0056', '1', null, '''''', 'PERSONAL_INSURANCE', 'String', null, '抵扣个人意外险', null, '1', 'Text', '2', '1', null, null, null, null, '0', '1', '0', '1', '0', 0, null, null, null, 'SYS_Designer', '2021/03/21 11:17:19', 'SYS_Designer', '2021/03/21 11:17:19', null, null, '1', null, null, null, null); +INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LCFundPaymentTempInfo', '0250', '0057', '1', null, '''''', 'DISCOUNT_INTEREST', 'String', null, '抵扣贴息', null, '1', 'Text', '2', '1', null, null, null, null, '0', '1', '0', '1', '0', 0, null, null, null, 'SYS_Designer', '2021/03/21 11:17:19', 'SYS_Designer', '2021/03/21 11:17:19', null, null, '1', null, null, null, null); + alter table lc_calc_condition_temp add PERSONAL_INSURANCE decimal(22,2) comment '个人意外险'; alter table lc_calc_condition_temp From 38de764b79cd16d2dfcc0e81fb86ecffbf732b06 Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Mon, 22 Mar 2021 15:55:11 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E5=95=86=E5=8A=A1=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E8=BF=98=E6=AC=BE=E9=87=91=E9=A2=9D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8C=89=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 7e981f817..dd0028db8 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -264,7 +264,7 @@ $(function(){ CalcControl.InitLsaseTerm(); //CalcControl.PeriodTypeView(); //CalcControl.SettleMethodView(); - //changeSettleMethod2(); + changeSettleMethod2(); //changeRateType(); //CalcControl.RentOrRateView(); var inerNumber = $("#INCOME_NUMBER").val(); From 43c655cc11f35fa980b855830f9a84f9a7fccc10 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 23 Mar 2021 09:15:36 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=91=E8=B5=B7=E5=8F=82=E6=95=B0=E5=92=8C?= =?UTF-8?q?IRR=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApproval/ProjectApprovalCreationInfo.jsp | 7 +++++++ calc/com/tenwa/reckon/executor/CashFlowExecutor.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index fdfc30cc7..658d6e331 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -240,6 +240,13 @@ sParams = sParams+",sex=1"; } } + //判断是否是中车经销商。如果是中车的渠道类型是为ZC，如果是正常的合同渠道类型是CG + if("<%=distributorType%>" == "types03"){ + sParams = sParams+",channel=ZC"; + }else{ + sParams = sParams+",channel=CG"; + } + var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);//定义流程中需要的参数 if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" ) { diff --git a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java index 97d5d1442..482996878 100644 --- a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java +++ b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java @@ -132,7 +132,7 @@ public class CashFlowExecutor { if("Y".equals( cb.getFlexible() ) ){ Map> productRevenue = tcb.getProductRevenues(); String GPSDifference = productRevenues.get( "GPSDifference" ).get( "GPSDifference" ); - sql += "union all select DATE_FORMAT(CURDATE(),'%Y/%m/%d') plan_date,'"+GPSDifference+"' flowin,'GPS差额:"+GPSDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+GPSDifference+"' cleanfow from dual "; + sql += "union all select plan_date,'"+GPSDifference+"' flowin,'GPS差额:"+GPSDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+GPSDifference+"' cleanfow from lc_fund_plan_temp where flowunid = '"+tcb.getDocId()+"' and fee_type='feetype10' "; } }else if("ORACLE".equals(InitDBType.DBTYPE)){ sql += "INSERT INTO " +Tools.getTable(tcb.getContractCashTb())+ " (id," + tcb.getPlanCName() + ""; From 57543496f72a0064ef53d46a180b9b70b76282df Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Tue, 23 Mar 2021 09:32:13 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E4=BA=BA=E6=84=8F=E5=A4=96=E9=99=A9=E5=92=8C?= =?UTF-8?q?=E8=B4=B4=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../etc/app/component/component-config.xml | 206 +++++++++--------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index af2356c5f..3f62be718 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -16,7 +16,7 @@ - + @@ -31,12 +31,12 @@ - + - + @@ -429,24 +429,24 @@ - - + @@ -778,7 +778,7 @@ - + @@ -788,31 +788,31 @@ - + - + - + - + - + - + - + - + @@ -850,15 +850,15 @@ - + - - - - + + + + @@ -887,44 +887,44 @@ - @@ -942,7 +942,7 @@ - + @@ -1006,26 +1006,26 @@ - + - + - + - + - + - - + + @@ -1043,17 +1043,17 @@ - - - - - - - - + + + + + + + + - + @@ -1061,28 +1061,28 @@ - - + + - - - - + + + + - - + + - + - + - + @@ -1093,18 +1093,18 @@ - - - + + + - + - + - \ No newline at end of file + \ No newline at end of file From 2ddbbd5817ab6d04852e55689c16c14cf2a0a805 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 23 Mar 2021 14:17:36 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=AD=E8=BD=A6=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApproval/ProjectApprovalCreationInfo.jsp | 11 ++++++----- .../project/businessapply/CustomerInfoManage.java | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index 658d6e331..160e5fae0 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -1,4 +1,5 @@ <%@ page contentType="text/html; charset=GBK"%> +<%@ page import="com.tenwa.util.ProjectConstant"%> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%> <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%> @@ -40,7 +41,9 @@ System.out.println(distributorType); String sApplyType = CurPage.getParameter("ApplyType"); String sInputUserID = CurUser.getUserID(); - + + String distributorNoConfig = ProjectConstant.DISTIRBUTOR_NO;//获取需要配置经销商 + if(StringX.isSpace(sApplyType)) sApplyType = ""; if(StringX.isSpace(sInputUserID)) sInputUserID = ""; @@ -240,11 +243,9 @@ sParams = sParams+",sex=1"; } } - //判断是否是中车经销商。如果是中车的渠道类型是为ZC，如果是正常的合同渠道类型是CG - if("<%=distributorType%>" == "types03"){ + //判断是否是中车经销商。如果是中车的渠道类型是为ZC，其它的则不存 + if("<%=distributorNoConfig%>" == "<%=distributorNo%>" ){ sParams = sParams+",channel=ZC"; - }else{ - sParams = sParams+",channel=CG"; } var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);//定义流程中需要的参数 diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java index 4850ad994..e4762ec3e 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java @@ -421,7 +421,9 @@ public class CustomerInfoManage { proj.setAttributeValue("inputName", inputName); proj.setAttributeValue("inputTel", inputTel); proj.setAttributeValue("PROJECT_NO", projectNo); - proj.setAttributeValue("CHANNEL", channel); + if(channel != null && "ZC".equals(channel)){//只存中车进单的标识 + proj.setAttributeValue("CHANNEL", channel); + } proj.setAttributeValue("ZC_PROJECT_NUMBER", zcProjectNumber); proj.setAttributeValue("ZC_CONTRACT_NUMBER", zcContractNumber); } From 8b3be0feebd400b2f81081d29b41fc550857b2f8 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 23 Mar 2021 15:11:26 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E6=94=BE=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=A1=E5=AE=A1=E6=9C=89=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/commcheck/TermValidityCheck.java | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commcheck/TermValidityCheck.java diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/TermValidityCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/TermValidityCheck.java new file mode 100644 index 000000000..3b2842955 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/TermValidityCheck.java @@ -0,0 +1,115 @@ +package com.tenwa.lease.flow.project.commcheck; + +import java.text.SimpleDateFormat; +import java.util.*; + +import com.amarsoft.are.jbo.JBOException; +import com.tenwa.lease.app.allinpay.util.AllinpayProperties; +import com.tenwa.reckon.util.DateUtil; +import com.tenwa.reckon.util.DateUtils; +import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; +import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP; + +import com.amarsoft.app.util.ProductParamUtil; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.doc.action.DocListInitAction; +import com.tenwa.template.check.DefaultBussinessCheck; +import jbo.sys.FLOW_TASK; +import org.apache.commons.collections.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 信审通过有效期校验 + * @author 20210324 + * + */ +public class TermValidityCheck extends DefaultBussinessCheck { + + private static final Logger logger = LoggerFactory.getLogger(TermValidityCheck.class); + @Override + public Object run(Transaction Sqlca) throws Exception { + //如果放款流程涉及退回再提交，则不判断信审有效期 + boolean validityBack = false;//是否发生退回 + List flowTaskList = JBOFactory.createBizObjectQuery(FLOW_TASK.CLASS_NAME, "OBJECTNO=:OBJECTNO").setParameter("OBJECTNO", this.getAttribute("ObjectNo").toString()).getResultList(false); + if(CollectionUtils.isEmpty(flowTaskList)){ + logger.error("当前流程对应 flow_task 记录不存在！objectNo=" + this.getAttribute("ObjectNo").toString()); + putMsg("系统繁忙，请稍后再试！"); + setPass(false); + return null; + } + for(BizObject flowTask: flowTaskList){ + if("0020".equals(flowTask.getAttribute("PHASENO").getString())){ + logger.info("当前流程含有退回再提交流程，故不校验有效期！"); + validityBack = true;//含有初审流程 + break; + } + } + if(validityBack){ + logger.info("当前流程含有退回再提交流程，故不校验有效期！"); + setPass(true); + return null; + } + //获取配置的超时天数 + String sql1 = "SELECT max(INPUTTIME) inputtime,over_date FROM lb_business_overdate where inputtime is not null and over_date>0 group by INPUTTIME"; + List> ds = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + String overDate = ""; + if(ds.size()>0){ + overDate = ds.get(0).get("over_date"); + } + if(overDate ==""||Integer.parseInt(overDate)==0){ + logger.error("请配置信审通过有效期天数!"); + putMsg("请配置信审通过有效期天数"); + setPass(false); + return null; + } + //获取信审通过时间 + BizObject flowBus = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:flowunid").setParameter("flowunid", this.getAttribute("ObjectNo").toString()).getSingleResult(false); + String projectId = flowBus.getAttribute("proj_id").toString(); + String sqlFlow = "SELECT InputTime as inputtime,flow_unid FROM flow_bussiness_object where proj_id='"+ projectId +"' and flow_name in('业务申请流程','业务变更流程') order by InputTime desc limit 1"; + List> resFlowList = DataOperatorUtil.getDataBySql(Sqlca, sqlFlow, null); + String objectNoXs = null; + if(resFlowList.size()>0){ + objectNoXs = resFlowList.get(0).get("flow_unid"); + } + List flowAuditTaskList = JBOFactory.createBizObjectQuery(FLOW_TASK.CLASS_NAME, "OBJECTNO=:OBJECTNO").setParameter("OBJECTNO", objectNoXs).getResultList(false); + if(CollectionUtils.isEmpty(flowAuditTaskList)){ + logger.error("当前流程对应 flow_task 记录不存在！objectNo=" + objectNoXs); + putMsg("系统繁忙，请稍后再试！"); + setPass(false); + return null; + } + String endTime = null; + for(BizObject flow: flowAuditTaskList){ + if("1000".equals(flow.getAttribute("PHASENO").getString())){//通过 + endTime = flow.getAttribute("ENDTIME").getString();//含有初审流程 + break; + } + } + if (null == endTime){ + logger.error("当前流程对应 flow_task 记录不存在endTime！objectNo=" + objectNoXs); + putMsg("系统繁忙，请稍后再试！"); + setPass(false); + return null; + } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd"); + Date endDate = sdf2.parse(sdf2.format(sdf.parse(endTime))); + Date nowDate = new Date(); + int daySum =(int)((nowDate.getTime() - endDate.getTime())/86400000l) ; + //求出信审通过时间和现在的时间差 + int overDays = Integer.parseInt(overDate); + + // 比较 是否在信审有效期内 + if(daySum - overDays > 0){ + setPass(false); + }else{ + setPass(true); + } + return null; + } +} From cdc4d2292ce2edc9c5c0473ca144163127741024 Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Tue, 23 Mar 2021 17:26:03 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=BD=A6?= =?UTF-8?q?=E8=BF=98=E6=AC=BE=E6=97=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/CreateTransactionExecutor.java | 103 +++++++++--------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 9bffffcd5..3d5a1d2ab 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -1,26 +1,7 @@ package com.tenwa.reckon.executor; -import java.io.InputStream; -import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import com.amarsoft.app.util.ProductParamUtil; -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.jbo.*; import com.amarsoft.are.util.json.JSONEncoder; import com.amarsoft.are.util.json.JSONObject; import com.amarsoft.awe.util.ASResultSet; @@ -32,42 +13,29 @@ import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; import com.tenwa.officetempalte.util.ExcelVersionEnum; import com.tenwa.quartz.StringUtil; -import com.tenwa.reckon.bean.AdjustBean; -import com.tenwa.reckon.bean.ConditionBean; -import com.tenwa.reckon.bean.FundRentPlanBean; -import com.tenwa.reckon.bean.FundRentPlanIrr; -import com.tenwa.reckon.bean.KnowingTableBean; -import com.tenwa.reckon.bean.TabCalBean; +import com.tenwa.reckon.bean.*; import com.tenwa.reckon.executor.rentChange.RentChangeExe; import com.tenwa.reckon.executor.rentTerminate.RentTerminateExe; import com.tenwa.reckon.help.CalYearRateFromRent; import com.tenwa.reckon.help.ConditionHelper; import com.tenwa.reckon.help.RentPlanContrCalDAOImpl; -import com.tenwa.reckon.util.DateUtil; -import com.tenwa.reckon.util.DictTools; -import com.tenwa.reckon.util.ExcelReader; -import com.tenwa.reckon.util.MoneyUtils; -import com.tenwa.reckon.util.ObjectConvertUtils; -import com.tenwa.reckon.util.TbBeanTools; - -import jbo.app.tenwa.calc.LC_CALC_CONDITION; -import jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP; -import jbo.app.tenwa.calc.LC_CALC_RULES_TEMP; -import jbo.app.tenwa.calc.LC_CASH_FLOW; -import jbo.app.tenwa.calc.LC_CASH_FLOW_TEMP; -import jbo.app.tenwa.calc.LC_EBANK; -import jbo.app.tenwa.calc.LC_EBANK_PROCESS; -import jbo.app.tenwa.calc.LC_EBANK_TEMP; -import jbo.app.tenwa.calc.LC_FUND_PLAN; -import jbo.app.tenwa.calc.LC_FUND_PLAN_TEMP; -import jbo.app.tenwa.calc.LC_FUND_RENT_ADJUST_TEMP; -import jbo.app.tenwa.calc.LC_RENT_PLAN; -import jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP; +import com.tenwa.reckon.util.*; +import jbo.app.tenwa.calc.*; import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP; import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION_TEMP; import jbo.sys.CODE_LIBRARY; +import java.io.InputStream; +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.Map.Entry; + /** * * @author chuang 租金测算主入口 @@ -288,19 +256,29 @@ public class CreateTransactionExecutor implements Transaction { JBOTransaction tx=null; BizObjectManager Bm=JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME, Sqlca); BizObject boLCC = Bm.createQuery("contract_id='" + contractId + "'").getSingleResult(true); + BizObjectManager bmLCI=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, Sqlca); + BizObject boLCI = bmLCI.createQuery("contract_id='" + contractId + "'").getSingleResult(false); //获取期次 if(boLCC != null) { String settleMethod = boLCC.getAttribute("SETTLE_METHOD").getString(); String defaultDueDay = ProductParamUtil.getProductParameterValue(productId, "PRD0301", settleMethod, "DefaultDueDay"); int incomeNumber = boLCC.getAttribute("INCOME_NUMBER").getInt(); + //期初-期末 String periodType = boLCC.getAttribute("PERIOD_TYPE").getString(); String incomeIntervalMonth = boLCC.getAttribute("INCOME_INTERVAL_MONTH").getInt() + ""; List planDateList = null; - if("02".equals(defaultDueDay)) { - planDateList = getPlanDateListFixed(incomeNumber, periodType, incomeIntervalMonth, startDate); - } else { - planDateList = getPlanDateList(incomeNumber, periodType, incomeIntervalMonth, startDate); + //是否为中车产品(无论期初期末，无论是按固定还款日还是按起租日，只要是中车的，一律按这套逻辑来---唐福堂) + String channel = boLCI.getAttribute("CHANNEL")==null?"":boLCI.getAttribute("CHANNEL").toString(); + if("zc".equals(channel)){ + planDateList = getPlanDateListZC(incomeNumber, incomeIntervalMonth, startDate); + }else{ + if("02".equals(defaultDueDay)) { + planDateList = getPlanDateListFixed(incomeNumber, periodType, incomeIntervalMonth, startDate); + } else { + planDateList = getPlanDateList(incomeNumber, periodType, incomeIntervalMonth, startDate); + } } + String insertSql="insert into lc_rent_plan(id,quot_id,cust_id, project_id, project_plan_number,contract_id,contract_plan_number,payment_number,plan_list,plan_date,plan_status,rent,corpus,interest,penalty,corpus_business,interest_business,rent_adjust,all_remain_corpus,settle_method,coin,year_rate,memo,flowunid,inputuserid,inputorgid,inputtime,updateuserid,updateorgid,updatetime,interest_date) select id,quot_id,cust_id, project_id, project_plan_number,contract_id,contract_plan_number,payment_number,plan_list,plan_date,plan_status,rent,corpus,interest,penalty,corpus_business,interest_business,rent_adjust,all_remain_corpus,settle_method,coin,year_rate,memo,flowunid,inputuserid,inputorgid,inputtime,updateuserid,updateorgid,updatetime,interest_date from lc_pay_rent_plan where payment_number = '" + this.plannumber + "'"; Sqlca.executeSQL(new SqlObject(insertSql)); Connection conn = Sqlca.getConnection(Sqlca); @@ -454,7 +432,27 @@ public class CreateTransactionExecutor implements Transaction { sql +=" )t group by t.plan_date "; Sqlca.executeSQL(new SqlObject(sql)); } - + //中车产品获取还款日 + public static List getPlanDateListZC(int incomeNumber, String incomeIntervalMonth, String startDate) throws ParseException { + List planDate = new ArrayList(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(com.amarsoft.app.als.sys.tools.DateUtil.parseStringToDate(startDate, "yyyy/MM/dd")); + int day = calendar.get(Calendar.DAY_OF_MONTH); + calendar.set(Calendar.DAY_OF_MONTH, 15); + if(day <= 15){ + calendar.add(Calendar.MONTH, 1); + }else{ + calendar.add(Calendar.MONTH, 2); + } + int addMonth = Integer.parseInt(incomeIntervalMonth); + for(int i = 0; i < incomeNumber; i ++) { + if(i!=0){ + calendar.add(Calendar.MONTH, addMonth); + } + planDate.add(com.amarsoft.app.als.sys.tools.DateUtil.formatDateToString(calendar.getTime(), "yyyy/MM/dd")); + } + return planDate; + } //固定还款日 public static List getPlanDateListFixed(int incomeNumber, String periodType, String incomeIntervalMonth, String startDate) throws ParseException { List planDate = new ArrayList(); @@ -462,6 +460,7 @@ public class CreateTransactionExecutor implements Transaction { calendar.setTime(com.amarsoft.app.als.sys.tools.DateUtil.parseStringToDate(startDate, "yyyy/MM/dd")); int day = calendar.get(Calendar.DAY_OF_MONTH); boolean flag = false; + //期末 if("period_type_0".equals(periodType)) { if(day >= 1 && day <= 9) { day = 5; @@ -1076,7 +1075,7 @@ public class CreateTransactionExecutor implements Transaction { } /** * 租金计划变更 更新现金流前先计算增值税 - * @param tx + * @param * @return * @throws Exception */ From 07225d7972b98f3d9aa052fe0ad1d87173333035 Mon Sep 17 00:00:00 2001 From: gityjf <2211675158@qq.com> Date: Wed, 24 Mar 2021 09:15:43 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E9=80=9A=E8=81=94=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/New_Sign_index.jsp | 268 ++++++++++++++++++ WebContent/js/jquery/register.js | 26 +- .../app/allinpay/servlet/AllinpayServlet.java | 155 +++++++--- 3 files changed, 392 insertions(+), 57 deletions(-) create mode 100644 WebContent/New_Sign_index.jsp diff --git a/WebContent/New_Sign_index.jsp b/WebContent/New_Sign_index.jsp new file mode 100644 index 000000000..3c92b30ce --- /dev/null +++ b/WebContent/New_Sign_index.jsp @@ -0,0 +1,268 @@ +<%@ page language="java" contentType="text/html; charset=GBK" + pageEncoding="GBK"%> + + + + + 通联卡扣签约 + + + + + + + + + + + + +
+
安鹏租赁 版权所有
+
+ + + diff --git a/WebContent/js/jquery/register.js b/WebContent/js/jquery/register.js index 7b13547e7..67ad1b699 100644 --- a/WebContent/js/jquery/register.js +++ b/WebContent/js/jquery/register.js @@ -120,18 +120,23 @@ var flowunid = $.trim($("#flowunid").val()); var signType = $.trim($("#signType").val()); var signSource = $.trim($("#signSource").val()); + var inputPage = $.trim($("#inputPage").val()); + var data = { "method":"allinPaySendMessages", "projectId":projectId, "flowunid":flowunid, "signSource":signSource, "signType":signType}; + if(inputPage == 'increment'){ + var accountNo = $.trim($("#accountNo").val()); + var accountName = $.trim($("#accountName").val()); + var tel = $.trim($("#tel").val()); + var idCard = $.trim($("#idCard").val()); + data = {"method":"allinPaySendMessages","signSource":signSource,"signType":signType, + "accountNo":accountNo,"accountName":accountName, + "tel":tel,"idCard":idCard,"inputPage":inputPage}; + } $.ajax({ type : "POST", url : "sign", async : true, dataType: "json", - data : { - "method":"allinPaySendMessages", - "projectId":projectId, - "flowunid":flowunid, - "signSource":signSource, - "signType":signType - }, + data : data, success : function(data) { if("success" == data.message){ alert("短信验证码发送成功，请留意您的短信提示"); @@ -154,9 +159,10 @@ } $('body').on({ blur: function(a) { - d.formValidator($(this)); + var status = d.formValidator($(this)); if (b.phone && $(this).attr("id") === "phone") d._change($(this)); - b.onBlur ? b.onBlur($(this)) : '' + b.onBlur ? b.onBlur($(this)) : ''; + if (status && $(this).attr("id") === "accountNo") cardVerify(); }, focus: function(a) { b.onFocus ? b.onFocus($(this)) : $(this).parent().find("label.focus").not(".valid").removeClass("hide").siblings(".valid").addClass("hide") && $(this).parent().find(".blank").addClass("hide") && $(this).parent().find(".close").addClass("hide") @@ -491,4 +497,4 @@ var countdown; sendVerify() }, 1000) } -} \ No newline at end of file +} diff --git a/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java b/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java index 304c60e68..cb3af2f27 100644 --- a/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java +++ b/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java @@ -10,6 +10,7 @@ import com.amarsoft.app.lc.util.DateAssistant; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.ASResultSet; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; @@ -36,28 +37,34 @@ public class AllinpayServlet extends BaseServlet { // 通联卡扣短信发送 public String allinPaySendMessages(HttpServletRequest request, HttpServletResponse response) throws Exception { String signType = request.getParameter("signType"); + String signSource = request.getParameter("signSource"); String projectId = request.getParameter("projectId"); String flowunid = request.getParameter("flowunid"); - String signSource = request.getParameter("signSource"); - + String inputPage = request.getParameter("inputPage");//录入页面标识 Map msg = new HashMap<>(); - SignDto signObj = getSignObj(projectId, flowunid); if (signType.equals("YCcollect")) { -// return new YCPaySignServlet().ycDXNotice(request, response, getSignObj(projectId)); msg.put("message", "渠道错误"); response.getWriter().write(JSON.toJSONString(msg)); return null; } - - String phoneNumber = signObj.getPhoneNumber(); - AllinpayProperties factory = new AllinpayProperties(signSource); + String phoneNumber = null; Map xmlMap = new HashMap<>(); - xmlMap.put("phoneNumber", phoneNumber); - xmlMap.put("userName", signObj.getUserName()); - xmlMap.put("accNumber", signObj.getAccNumber()); - xmlMap.put("certId", signObj.getCertId()); + if (StringUtils.isBlank(inputPage)) { + SignDto signObj = getSignObj(projectId, flowunid); + phoneNumber = signObj.getPhoneNumber(); + xmlMap.put("phoneNumber", phoneNumber); + xmlMap.put("userName", signObj.getUserName()); + xmlMap.put("accNumber", signObj.getAccNumber()); + xmlMap.put("certId", signObj.getCertId()); + } else { + phoneNumber = request.getParameter("tel"); + xmlMap.put("phoneNumber",phoneNumber); + xmlMap.put("userName", request.getParameter("accountName")); + xmlMap.put("accNumber", request.getParameter("accountNo")); + xmlMap.put("certId", request.getParameter("idCard")); + } + AllinpayProperties factory = new AllinpayProperties(signSource); Map map = factory.allinPaySendMessages(xmlMap); - if (!"success".equals(map.get("message"))) { logger.info("系统异常或通联反馈异常:" + map.get("msg")); throw new Exception(map.get("msg")); @@ -89,24 +96,24 @@ public class AllinpayServlet extends BaseServlet { msg.put("message", ret.getERR_MSG()); } } - - SqlObject sqlObject = null; - if (isSucc) { - String sql = "UPDATE LC_CARD_TLSIGN SET CUSTOMER_LAUNCH_TIME=:customerLaunchTime WHERE PROJECT_ID=:projectId"; - sqlObject = new SqlObject(sql); - sqlObject.setParameter("customerLaunchTime", time); - sqlObject.setParameter("projectId", projectId); - } else { - String sql = "UPDATE LC_CARD_TLSIGN SET CUSTOMER_LAUNCH_TIME=:customerLaunchTime,REQUEST_CONTENT=:requestContent,RESPONSE_CONTENT=:responseContent WHERE PROJECT_ID=:projectId"; - sqlObject = new SqlObject(sql); - sqlObject.setParameter("customerLaunchTime", time); - sqlObject.setParameter("requestContent", requestContent); - sqlObject.setParameter("responseContent", responseContent); - sqlObject.setParameter("projectId", projectId); + if (StringUtils.isBlank(inputPage)) { + SqlObject sqlObject = null; + if (isSucc) { + String sql = "UPDATE LC_CARD_TLSIGN SET CUSTOMER_LAUNCH_TIME=:customerLaunchTime WHERE PROJECT_ID=:projectId"; + sqlObject = new SqlObject(sql); + sqlObject.setParameter("customerLaunchTime", time); + sqlObject.setParameter("projectId", projectId); + } else { + String sql = "UPDATE LC_CARD_TLSIGN SET CUSTOMER_LAUNCH_TIME=:customerLaunchTime,REQUEST_CONTENT=:requestContent,RESPONSE_CONTENT=:responseContent WHERE PROJECT_ID=:projectId"; + sqlObject = new SqlObject(sql); + sqlObject.setParameter("customerLaunchTime", time); + sqlObject.setParameter("requestContent", requestContent); + sqlObject.setParameter("responseContent", responseContent); + sqlObject.setParameter("projectId", projectId); + } + allinpayService.update(sqlObject); } - allinpayService.update(sqlObject); } - String message = JSON.toJSONString(msg); response.getWriter().write(message); return null; @@ -118,10 +125,10 @@ public class AllinpayServlet extends BaseServlet { String signSource = request.getParameter("signSource"); String projectId = request.getParameter("projectId"); String phoneNumber = request.getParameter("phoneNumber"); + String inputPage = request.getParameter("inputPage"); Map msg = new HashMap<>(); msg.put("message", "error"); if (signType.equals("YCcollect")) { -// return new YCPaySignServlet().ycDXSign(request, response, getSignObj(projectId)); msg.put("message", "渠道错误"); response.getWriter().write(JSON.toJSONString(msg)); return null; @@ -171,25 +178,51 @@ public class AllinpayServlet extends BaseServlet { } else { msg.put("msg", infoRsp.getERR_MSG()); } - SqlObject sqlObject = null; - if (isSucc) { - String sql = "UPDATE LC_CARD_TLSIGN SET SIGN_TIME=:signTime,AGRMNO=:agrmno,SIGN_STATUS=:signStatus WHERE PROJECT_ID=:projectId"; - sqlObject = new SqlObject(sql); - sqlObject.setParameter("signTime", time); - sqlObject.setParameter("agrmno", agrmNo); - sqlObject.setParameter("signStatus", "sign_status2"); - sqlObject.setParameter("projectId", projectId); + if (StringUtils.isNotBlank(inputPage)) { + if (isSucc) { + String bankName = request.getParameter("bankName"); + String accountNo = request.getParameter("accountNo"); + String accountName = request.getParameter("accountName"); + String idCard = request.getParameter("idCard"); + String insertSql = "insert into customer_account_input (id,bank_name,acc_number,account,certid,tel,collect_type,sign_status,inputtime,subjectid,agrmno)" + + " values (replace(uuid(),'-',''),:bankName,:accountNo,:accountName,:idCard,:tel,'TLcollect','Y',DATE_FORMAT(now(),'%Y/%m/%d %H:%i:%s'),:signSource,:agrmNo)"; + sqlObject = new SqlObject(insertSql); + sqlObject.setParameter("bankName", bankName); + sqlObject.setParameter("accountNo", accountNo); + sqlObject.setParameter("accountName", accountName); + sqlObject.setParameter("idCard", idCard); + sqlObject.setParameter("tel", phoneNumber); + sqlObject.setParameter("signSource", signSource); + sqlObject.setParameter("agrmNo", agrmNo); + Transaction Sqlca = Transaction.createTransaction(JBOFactory.createJBOTransaction()); + try { + Sqlca.executeSQL(sqlObject); + Sqlca.commit(); + } catch (Exception e) { + Sqlca.rollback(); + throw e; + } + } } else { - String sql = "UPDATE LC_CARD_TLSIGN SET SIGN_TIME=:signTime,SIGN_STATUS=:signStatus,REQUEST_CONTENT=:requestContent,RESPONSE_CONTENT=:responseContent WHERE PROJECT_ID=:projectId"; - sqlObject = new SqlObject(sql); - sqlObject.setParameter("signTime", time); - sqlObject.setParameter("signStatus", "sign_status3"); - sqlObject.setParameter("requestContent", requestContent); - sqlObject.setParameter("responseContent", responseContent); - sqlObject.setParameter("projectId", projectId); + if (isSucc) { + String sql = "UPDATE LC_CARD_TLSIGN SET SIGN_TIME=:signTime,AGRMNO=:agrmno,SIGN_STATUS=:signStatus WHERE PROJECT_ID=:projectId"; + sqlObject = new SqlObject(sql); + sqlObject.setParameter("signTime", time); + sqlObject.setParameter("agrmno", agrmNo); + sqlObject.setParameter("signStatus", "sign_status2"); + sqlObject.setParameter("projectId", projectId); + } else { + String sql = "UPDATE LC_CARD_TLSIGN SET SIGN_TIME=:signTime,SIGN_STATUS=:signStatus,REQUEST_CONTENT=:requestContent,RESPONSE_CONTENT=:responseContent WHERE PROJECT_ID=:projectId"; + sqlObject = new SqlObject(sql); + sqlObject.setParameter("signTime", time); + sqlObject.setParameter("signStatus", "sign_status3"); + sqlObject.setParameter("requestContent", requestContent); + sqlObject.setParameter("responseContent", responseContent); + sqlObject.setParameter("projectId", projectId); + } + allinpayService.update(sqlObject); } - allinpayService.update(sqlObject); } String message = JSON.toJSONString(msg); response.getWriter().write(message); @@ -205,7 +238,7 @@ public class AllinpayServlet extends BaseServlet { String projectId = request.getParameter("con"); String flowunid = request.getParameter("flowunid"); SignDto signObj = getSignObj(projectId, flowunid); - String userName = "", phoneNumber = "", accNumber = "", certId = "", collectType = "", queryId = "",signSource =""; + String userName = "", phoneNumber = "", accNumber = "", certId = "", collectType = "", queryId = "", signSource = ""; if (signObj != null) { userName = signObj.getUserName(); phoneNumber = signObj.getPhoneNumber(); @@ -301,7 +334,7 @@ public class AllinpayServlet extends BaseServlet { String collectType = res.getString("collectType"); String subjectid = res.getString("subjectid"); String db_projectId = res.getString("project_id"); - signDto = new SignDto(userName, phoneNumber, certId, accNumber, collectType, db_projectId,subjectid); + signDto = new SignDto(userName, phoneNumber, certId, accNumber, collectType, db_projectId, subjectid); } Sqlca.commit(); } catch (Exception e) { @@ -310,4 +343,32 @@ public class AllinpayServlet extends BaseServlet { } return signDto; } + + // 签约页面（录入页面） + public String allinPaySignNew(HttpServletRequest request, HttpServletResponse response) { + return "/New_Sign_index.jsp"; + } + + //卡号前六位带出银行名称 + public String obtainBankName(HttpServletRequest request, HttpServletResponse response) throws Exception { + JBOTransaction tx = null; + try { + String accountNo = request.getParameter("accountNo"); + String shortCode = accountNo.substring(0, 6); + tx = JBOFactory.createJBOTransaction(); + String querySql = "select bank_name from bank_bin_config where bank_code = '" + shortCode + "'"; + String bankName = Transaction.createTransaction(tx).getString(querySql); + HashMap map = new HashMap<>(); + map.put("status", "error"); + if (bankName != null) { + map.put("status", "success"); + map.put("bankName", bankName.split("·")[0]); + } + String message = JSON.toJSONString(map); + response.getWriter().write(message); + } finally { + if (tx != null) tx.commit(); + } + return null; + } } From 3c8f097885a79c0a994dce078c92371f81331610 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 24 Mar 2021 14:56:03 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E8=81=94?= =?UTF-8?q?=E6=89=A3=E6=AC=BE=E5=8D=A1=E6=A0=A1=E9=AA=8C=E5=92=8Capp?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBDebitCard/DebitCardInfo.jsp | 3 +++ .../sys/service/impl/VersionServiceImpl.java | 3 ++- .../customerfilterlist/DebitCardAction.java | 22 ++++++++++++++----- src_sql/棰勬姇SQL/v20210415/tft20210415.sql | 5 ----- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index d1dd2cac8..b227e9104 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -199,6 +199,9 @@ }else if("ZCfalse" == meassge){ alert("该扣款卡信息没有签约，无法保存！"); return ; + }else if("NotFalse" == meassge){ + alert("没有匹配到对应的扣款渠道，无法保存！"); + return ; }else{ setItemValue(0,0,"sign_status",""); } diff --git a/src_app_fresh/apx/com/amarsoft/als/user/sys/service/impl/VersionServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/sys/service/impl/VersionServiceImpl.java index f4e66f042..272756c01 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/sys/service/impl/VersionServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/sys/service/impl/VersionServiceImpl.java @@ -27,7 +27,7 @@ public class VersionServiceImpl implements VersionService { // } // } - String sVersionCode = request.getParameter("versioncode"); + String sVersionCode = request.getParameter("versioncode").replace(".",""); if (null == sDevOs) sDevOs = ""; if (null == sVersionCode) @@ -46,6 +46,7 @@ public class VersionServiceImpl implements VersionService { String oVersionCode = versionMap.get("VERSION_CODE".toLowerCase()).toString(); oVersionCode = oVersionCode.replace(".",""); + System.out.println("app传入的版本号"+sVersionCode +"=======系统配置版本号："+ oVersionCode); if (Integer.valueOf(sVersionCode)>=Integer.valueOf(oVersionCode)) { // 当前意见最新版本 // 没有数据 当前最新版本 diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index 21d804f53..4dec3f2a4 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -280,15 +280,29 @@ public class DebitCardAction { return "false"; } } + //查询当前项目是否有对应的签约记录 + BizObjectManager lcthManage = JBOFactory.getFactory().getManager(LC_CARD_TLSIGN.CLASS_NAME,tx); + BizObject lct = lcthManage.createQuery("PROJECT_ID=:project_id ").setParameter("project_id", projectid).getSingleResult(true); + if("ZC".equals(channel)){ - String sql = "select id from customer_account_input where collect_type='"+collect_type+"' and acc_number='"+acc_number+"' and account='"+account+"' and certid='"+certId+"' and tel='"+mobile+"' and subjectid='"+subjectId+"' and sign_status='Y' "; + String sql = "select id,agrmno,inputtime from customer_account_input where collect_type='"+collect_type+"' and acc_number='"+acc_number+"' and account='"+account+"' and certid='"+certId+"' and tel='"+mobile+"' and subjectid='"+subjectId+"' and sign_status='Y' "; List> dataBySql = DataOperatorUtil.getDataBySql(sql); if( dataBySql == null || dataBySql.size() == 0){ return "ZCfalse"; }else if("YLcollect".equals(collect_type)){ return "Y"; + }else if("TLcollect".equals(collect_type)){ + if(lct == null){ + lct = lcthManage.newObject(); + lct.setAttributeValue("PROJECT_ID", projectid); + } + lct.setAttributeValue("SIGN_STATUS", "sign_status2"); + lct.setAttributeValue("sign_type", collect_type); + lct.setAttributeValue("AGRMNO", dataBySql.get(0).get("agrmno")); + lct.setAttributeValue("SIGN_TIME", dataBySql.get(0).get("inputtime")); + lcthManage.saveObject(lct); }else{ - + return "NotFalse"; } return "N"; } @@ -297,10 +311,6 @@ public class DebitCardAction { BizObject lcss = lcsshManage.createQuery("select O.AGRMNO from O left join jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lpi on lpi.id=O.project_id where O.tl_status='sign_status2' and O.account=:account and O.acc_number=:acc_number and O.certid=:certid and O.mobile=:mobile and O.sign_type=:sign_type and lpi.subjectid=:subjectId ") .setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).setParameter("mobile", mobile).setParameter("sign_type", collect_type).setParameter("subjectId", subjectId).getSingleResult(false); - //查询当前项目是否有对应的签约记录 - BizObjectManager lcthManage = JBOFactory.getFactory().getManager(LC_CARD_TLSIGN.CLASS_NAME,tx); - BizObject lct = lcthManage.createQuery("PROJECT_ID=:project_id ").setParameter("project_id", projectid).getSingleResult(true); - //查看现有卡是否签约 BizObject caAgrmno = lcthManage.createQuery("select O.AGRMNO from O left join jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca on ca.project_id=O.project_id left join jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lpi on lpi.id=O.project_id where O.sign_status='sign_status2' and lpi.subjectid=:subjectid and O.sign_type=:sign_type and ca.acc_number=:acc_number and ca.certid=:certid and ca.mobile=:mobile ") .setParameter("subjectId", subjectId).setParameter("sign_type", collect_type).setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).setParameter("mobile", mobile).getSingleResult(false); diff --git a/src_sql/棰勬姇SQL/v20210415/tft20210415.sql b/src_sql/棰勬姇SQL/v20210415/tft20210415.sql index 7de25f93d..fa7f38297 100644 --- a/src_sql/棰勬姇SQL/v20210415/tft20210415.sql +++ b/src_sql/棰勬姇SQL/v20210415/tft20210415.sql @@ -7,11 +7,6 @@ Alter table lb_project_info_temp add column CHANNEL varchar(32) NULL COMMENT ' Alter table lb_contract_info add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; Alter table lb_contract_info_temp add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; Alter table lb_contract_info_his add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; -update lb_project_info set channel='CG'; -update lb_project_info_temp set channel='CG'; -update lb_contract_info set channel='CG'; -update lb_contract_info_temp set channel='CG'; -update lb_contract_info_his set channel='CG'; -- 业务申请详情页面添加中车申请号和中车合同编号 Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessProjectTempInfo','0074','0074','1','O','ZC_PROJECT_NUMBER','ZC_PROJECT_NUMBER','String','','中车申请号','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/20 14:48:55','SYS_Designer','2021/03/20 15:01:12','0','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessProjectTempInfo','0078','0078','1','O','ZC_CONTRACT_NUMBER','ZC_CONTRACT_NUMBER','String','','中车合同号','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/20 14:48:55','SYS_Designer','2021/03/20 15:01:12','0','','1','','','',''); From 35096fe5217251dffb3ed890a65b121da55a3531 Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Wed, 24 Mar 2021 15:05:02 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=BD=A6?= =?UTF-8?q?=E8=BF=98=E6=AC=BE=E6=97=A5=E9=94=99=E8=AF=AF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 3d5a1d2ab..ff2b52039 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -257,7 +257,7 @@ public class CreateTransactionExecutor implements Transaction { BizObjectManager Bm=JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME, Sqlca); BizObject boLCC = Bm.createQuery("contract_id='" + contractId + "'").getSingleResult(true); BizObjectManager bmLCI=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, Sqlca); - BizObject boLCI = bmLCI.createQuery("contract_id='" + contractId + "'").getSingleResult(false); + BizObject boLCI = bmLCI.createQuery("id='" + contractId + "'").getSingleResult(false); //获取期次 if(boLCC != null) { String settleMethod = boLCC.getAttribute("SETTLE_METHOD").getString(); From 53877f44a48763eb6b390de97716cbb72be39678 Mon Sep 17 00:00:00 2001 From: chenleiying Date: Wed, 24 Mar 2021 16:36:13 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E5=87=AD=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FundofDiscountInterest.java | 24 + .../FundofPersonalInsurance.java | 24 + .../CreateVoucherLoanDistributor.java | 899 ++++++++++-------- .../ContractOnhireVoucher.java | 99 +- 4 files changed, 592 insertions(+), 454 deletions(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundofDiscountInterest.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundofPersonalInsurance.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundofDiscountInterest.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundofDiscountInterest.java new file mode 100644 index 000000000..2ca6e7697 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundofDiscountInterest.java @@ -0,0 +1,24 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; + +public class FundofDiscountInterest implements VoucherJavaParamService{ + + @Override + public Map getJavaParam(JBOTransaction tx, + Map param,Map subData) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + // GPS + String DISCOUNT_INTEREST=param.get("DISCOUNT_INTEREST")==null?"0.00":param.get("DISCOUNT_INTEREST"); + //returnValue.put("FUNDTYPE","01"); + returnValue.put("MONEY",DISCOUNT_INTEREST); + return returnValue; + } + +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundofPersonalInsurance.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundofPersonalInsurance.java new file mode 100644 index 000000000..698919a08 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundofPersonalInsurance.java @@ -0,0 +1,24 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; + +public class FundofPersonalInsurance implements VoucherJavaParamService{ + + @Override + public Map getJavaParam(JBOTransaction tx, + Map param,Map subData) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + // GPS + String PERSONAL_INSURANCE=param.get("PERSONAL_INSURANCE")==null?"0.00":param.get("PERSONAL_INSURANCE"); + //returnValue.put("FUNDTYPE","01"); + returnValue.put("MONEY",PERSONAL_INSURANCE); + return returnValue; + } + +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 260cb9c1d..814019b74 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -1,406 +1,493 @@ -package com.tenwa.voucher.CreateVoucherProcess; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jbo.app.tenwa.customer.CUSTOMER_LIST; -import jbo.voucher.LV_VOUCHER_CONFIG; -import jbo.voucher.TAX_CODE; - -import com.amarsoft.app.util.ProductParamUtil; -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.util.Transaction; -import com.amarsoft.dict.als.cache.CacheLoaderFactory; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; - -public class CreateVoucherLoanDistributor { - public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) throws Exception { - - Transaction Sqlca =null; - Map map=new HashMap(); - Map param=new HashMap(); - - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - String MONEY=null; - String MONEYNOTAX=null; - String MONEYTAX=null; - String GPS_FEE_FINANCE=null; - String CAUTION_MONEY=null; - String HANDLING_CHARGE_MONEY=null; - String INTEREST=null; - String FIRST_ADD_FINANCING=null;//首付款+融资额 - String FINANCING_SUB_OTHERS=null;//首付款+融资额-首付款-手续费-保证金-GPS - String FIRST_ADD_HANDLING=null;//首付款+手续费 - String INTEREST_ADD_HANDLING=null;//利息（含税）+手续费（不含税） - String ACCOUNT_DATE=null; - String FACT_DATE=null; - String CONTRACT_ID=null; - String CONTRACT_NUMBER=null; - String PROJECT_NAME=null; - String leas_form=null; - String DISTRIBUTOR_ID=null; - String DISTRIBUTOR_NAME=null; - String F_I_TYPE=null;// 集团内外判断条件 集团内/01 || 集团外/02 - String CUSTID=null; - String CUSTNAME=null; - String CUSTOMERTYPE=null; - String BUSINESSTYPE=null; - String ACC_NUMBER=null; - String REQNBR=null; - String PRODUCT_ID=null; - String TAX_TYPE=null; - String TAX_NUM=null; - String OTHERNOTAX=null; - String FIRST_NOTAX=null; - String FIRST_TAX=null; - - String sql=""; - String moneyDataSource=""; - param.clear(); - map.put("FlowUnid", FlowUnid); - - // 确认GPS收入-回租/直租 - if("PZ2018073100000061".equals(VOUCHERNO) || "PZ2019070100000001".equals(VOUCHERNO)){moneyDataSource="LCCT.GPS_FEE";TAX_TYPE="GPS";} - // 收取首付款-回租/直租 - if("PZ2018070900000003".equals(VOUCHERNO) || "PZ2019070100000002".equals(VOUCHERNO)){moneyDataSource="LCCT.FIRST_PAYMENT";TAX_TYPE="本金";} - // 收取客户保证金-回租 - if("PZ2018071000000004".equals(VOUCHERNO) || "PZ2020080500000001".equals(VOUCHERNO)){moneyDataSource="LCCT.CAUTION_MONEY";TAX_TYPE="本金";} - // 收取客户手续费（一次性确认收入）/按月分摊-回租 - if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2018071000000009".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO) || "PZ2019070100000006".equals(VOUCHERNO) ){moneyDataSource="LCCT.HANDLING_CHARGE_MONEY";TAX_TYPE="手续费";} - // 直租购入保险 - if("PZ2019082600000002".equals(VOUCHERNO)){moneyDataSource="IFNULL(LCCT.INSURANCE_PREMIUM, 0)";TAX_TYPE="本金";} - // 直租购入购置税 - if("PZ2019082600000003".equals(VOUCHERNO)){moneyDataSource="IFNULL(LCCT.PURCHASE_TAX, 0)";TAX_TYPE="本金";} - - // 合同起租（一次性确认收入）-回租&&合同起租（按月分摊收入）--回租 - if("PZ2018071000000005".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)) { - sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LRPT.INTEREST, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),0) AS INTEREST_ADD_HANDLING,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID)LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID "; - // 合同起租-直租(天津或者深圳) - }else if("PZ2019070100000004".equals(VOUCHERNO)) { - sql="SELECT IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0))-((IFNULL(LCCT.GPS_FEE, 0)) - IFNULL(ROUND((IFNULL(LCCT.GPS_FEE, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0))) AS MONEYTAX,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INSURANCE_PREMIUM_NOTAX,IFNULL(ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS PURCHASE_TAX_NOTAX,IFNULL(ROUND((IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERNOTAX,IFNULL(ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME = LCI.SUBJECTNAME) "; - // 合同起租-直租（分子公司） - }else if("PZ2020081100000005".equals(VOUCHERNO)) { - sql="SELECT IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0))-((IFNULL(LCCT.GPS_FEE, 0)) - IFNULL(ROUND((IFNULL(LCCT.GPS_FEE, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0))) AS MONEYTAX,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY,0)-IFNULL(LCCT.GPS_FEE, 0))/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NOT NULL AND LPCI.COMPANY_NAME <> LCI.SUBJECTNAME) "; - // 购置融资租赁产-回租 - }else if("PZ2018070900000002".equals(VOUCHERNO)) { - sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID=LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (PSL.operationType <>'DYCD' OR PSL.operationType IS NULL) AND LFIT.FLOWUNID = :FLOWUNID "; - // 购置融资租赁产-直租（深圳或者天津公司） - }else if("PZ2019070100000003".equals(VOUCHERNO)) { - sql="SELECT ROUND(IFNULL(LCCT.EQUIP_AMT, 0) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2) AS MONEY,(IFNULL(LCCT.EQUIP_AMT, 0) - ROUND(IFNULL(LCCT.EQUIP_AMT, 0) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID = LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME=LCI.SUBJECTNAME)"; - // 购置融资租赁产-直租（分子公司） - }else if("PZ2020081100000004".equals(VOUCHERNO)) { - sql="SELECT ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2) AS MONEY,((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) - ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS MONEYTAX,(IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0)) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,ROUND(IFNULL(LCCT.FIRST_PAYMENT, 0) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2) AS FIRST_NOTAX,(IFNULL(LCCT.FIRST_PAYMENT, 0)-ROUND(IFNULL(LCCT.FIRST_PAYMENT, 0) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS FIRST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID = LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NOT NULL AND LPCI.COMPANY_NAME<>LCI.SUBJECTNAME)"; - // 第一车贷购置融资租赁资产-回租 - }else if("PZ2018073100000062".equals(VOUCHERNO)){ - sql="SELECT IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) AS MONEYNOTAX,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND PSL.operationType = 'DYCD' AND LFIT.FLOWUNID = :FLOWUNID "; - // 加装及杂费-直租 - }else if("PZ2020041000000002".equals(VOUCHERNO)) { - sql="SELECT ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0) AS MONEY,IFNULL(ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0)+IFNULL(ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(IFNULL(LCCT.TABLEWARE_FEE, 0) - ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0)+IFNULL(IFNULL(LCCT.INCIDENTAL, 0) - ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0))>0 AND lfit.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME IN(SELECT ITEMNAME FROM CODE_LIBRARY WHERE CODENO='ManySubject'))"; - }else{ - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL("+moneyDataSource+", 0) AS MONEY,IFNULL(ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL("+moneyDataSource+" - ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND lfit.FLOWUNID = :FLOWUNID "; - } - - // 手续费收入（一次性确认收入） - if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO)){ - sql+=" AND (lcct.HANDLING_CHARGE_MONEY_TYPE='0010' OR lcct.HANDLING_CHARGE_MONEY_TYPE IS NULL OR lcct.HANDLING_CHARGE_MONEY_TYPE='')"; - // 收到手续费（按月分摊收入） - }else if("PZ2018071000000009".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO) || "PZ2019070100000006".equals(VOUCHERNO)){ - sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' "; - // 购入保险-直租/购入购置税-直租 - }else if("PZ2019082600000002".equals(VOUCHERNO) || "PZ2019082600000003".equals(VOUCHERNO)) { - sql+=" AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME IN(SELECT ITEMNAME FROM CODE_LIBRARY WHERE CODENO='ManySubject')) "; - } - - List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); - - CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); - String VOUCHER_TYPE="1";// 凭证分类 金蝶 - - for (int i=0;i0){ - MONEYNOTAX=dataList.get(i).get("MONEYNOTAX"); - MONEYTAX=dataList.get(i).get("MONEYTAX"); - ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE"); - FACT_DATE =dataList.get(i).get("FACT_DATE"); - CONTRACT_ID=dataList.get(i).get("CONTRACT_ID"); - CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER"); - PROJECT_NAME=dataList.get(i).get("PROJECT_NAME"); - leas_form=dataList.get(i).get("LEAS_FORM"); - DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID"); - DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); - F_I_TYPE=dataList.get(i).get("F_I_TYPE"); - CUSTID=dataList.get(i).get("CUSTOMERID"); - CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); - CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE"); - BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); - ACC_NUMBER=dataList.get(i).get("ACC_NUMBER"); - REQNBR=dataList.get(i).get("REQNBR"); - - param.put("FACT_MONEY",MONEY); - param.put("INTERESTNOTAX",MONEYNOTAX); - param.put("TAX",MONEYTAX); - param.put("ACCOUNT_DATE",ACCOUNT_DATE); - param.put("FACT_DATE",FACT_DATE); - param.put("CONTRACT_ID",CONTRACT_ID); - param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); - param.put("PROJECT_NAME",PROJECT_NAME); - param.put("LEAS_FORM",leas_form); - param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); - param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); - param.put("F_I_TYPE",F_I_TYPE); - param.put("CUSTID",CUSTID); - param.put("CUSTNAME",CUSTNAME); - param.put("CUSTOMERTYPE",CUSTOMERTYPE); - param.put("BUSINESSTYPE",BUSINESSTYPE); - param.put("ACC_NUMBER",ACC_NUMBER); - param.put("REQNBR",REQNBR); - param.put("VOUCHERNO",VOUCHERNO); - // 通过客户名称获取客户编码维护里面的数据, 如果有数据说明是集团内, 如果没有数据说明是集团外 - BizObject cust_list1=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+DISTRIBUTOR_ID+"'").getSingleResult(false); - BizObject cust_list2=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+CUSTID+"'").getSingleResult(false); - - if(cust_list1 != null || cust_list2 !=null) {// 集团内 - param.put("CASHFLOW", "11212");// 现金流项目 - }else {// 集团外 - param.put("CASHFLOW", "11213");// 现金流项目 - } - param.put("BUSINESSTYPE", ""); - - param.put("FlowUnid", FlowUnid); - map.clear(); - map.put("PROJ_TYPE", leas_form); - map.put("VOUCHER_NO", VOUCHERNO); - BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); - - if(vouch!=null){ - vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); - } - } - }else { - PRODUCT_ID=dataList.get(i).get("PRODUCT_ID");// 产品编号 - // 判断购置税是否参融 - String FINAN1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "PURCHASE_TAX","FINAN"); - // 判断保险费是否参融 - String FINAN2 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "INSURANCE_PREMIUM","FINAN"); - // 判断手续费是否差额 - String isBalance1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "HANDLING_CHARGE_MONEY","isBalance"); - // 判断保证金是否差额 - String isBalance2 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "CAUTION_MONEY","isBalance"); - // 判断首付款是否差额 - String isBalance3 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "FIRST_PAYMENT","isBalance"); - MONEY=dataList.get(i).get("MONEY"); - if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)){ - MONEY=dataList.get(i).get("FIRST_ADD_FINANCING"); - }else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2018071000000009".equals(VOUCHERNO)) { - // 如果手续费是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费 - if("no".equals(isBalance1)) { - MONEY="0.00"; - } - }else if("PZ2018071000000004".equals(VOUCHERNO)) { - // 如果手续费是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费 - if("no".equals(isBalance2)) { - MONEY="0.00"; - } - } - if("".equals(MONEY)||MONEY==null) MONEY="0.00"; - double mon=Double.parseDouble(MONEY); - if(mon>0){ - MONEYTAX=dataList.get(i).get("MONEYTAX"); - MONEYNOTAX=dataList.get(i).get("MONEYNOTAX"); - HANDLING_CHARGE_MONEY=dataList.get(i).get("HANDLING_CHARGE_MONEY"); - CAUTION_MONEY=dataList.get(i).get("CAUTION_MONEY"); - FINANCING_SUB_OTHERS=dataList.get(i).get("FINANCING_SUB_OTHERS"); - FIRST_ADD_HANDLING=dataList.get(i).get("FIRST_ADD_HANDLING"); - FIRST_NOTAX=dataList.get(i).get("FIRST_NOTAX"); - FIRST_TAX=dataList.get(i).get("FIRST_TAX"); - OTHERNOTAX=dataList.get(i).get("OTHERNOTAX"); - INSURANCE_PREMIUM_NOTAX=dataList.get(i).get("INSURANCE_PREMIUM_NOTAX"); - PURCHASE_TAX_NOTAX=dataList.get(i).get("PURCHASE_TAX_NOTAX"); - // 直租合同起租（深圳或者天津公司） - if("PZ2019070100000004".equals(VOUCHERNO)){ - // 如果不参融， 获取对应金额 - if("N".equals(FINAN1)){ - PURCHASE_TAX_NOTAX="0.00"; - } - if("N".equals(FINAN2)){ - INSURANCE_PREMIUM_NOTAX="0.00"; - } - // 直租购置融资租赁资产(深圳或者天津公司) - }else if("PZ2019070100000003".equals(VOUCHERNO)) { - // 贷1如果保证金不是差额放款，不应该-保证金， 所以加回来 - if("no".equals(isBalance2)) { - FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(CAUTION_MONEY)+""; - CAUTION_MONEY="0.00"; - } - // 贷1如果首付款不是差额放款，不应该-首付款， 所以加回来 - if("no".equals(isBalance3)) { - FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(FIRST_ADD_HANDLING)+""; - FIRST_ADD_HANDLING="0.00"; - } - // 直租购置融资租赁资产(子公司) - }else if("PZ2020081100000004".equals(VOUCHERNO)) { - // 借1和借2如果保证金不是差额放款，不应该减保证金， 所以加上 - if("no".equals(isBalance2)) { - FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(CAUTION_MONEY)+""; - CAUTION_MONEY="0.00"; - } - // 借1和借2如果首付款不是差额放款，不应该加首付款， 所以减去 - if("no".equals(isBalance3)) { - MONEY=Double.parseDouble(MONEY)-Double.parseDouble(FIRST_NOTAX)+""; - MONEYTAX=Double.parseDouble(MONEYTAX)-Double.parseDouble(FIRST_TAX)+""; - FIRST_ADD_HANDLING="0.00"; - } - } - - // 购置融资租赁资产配置差额, 非差额 - if("PZ2018070900000002".equals(VOUCHERNO)){ - // 如果手续费是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费 - if("no".equals(isBalance1)) { - FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(HANDLING_CHARGE_MONEY)+""; - FIRST_ADD_HANDLING=Double.parseDouble(FIRST_ADD_HANDLING)-Double.parseDouble(HANDLING_CHARGE_MONEY)+""; - } - // 如果保证金是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费 - if("no".equals(isBalance2)) { - FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(CAUTION_MONEY)+""; - CAUTION_MONEY="0.00"; - } - } - - GPS_FEE_FINANCE=dataList.get(i).get("GPS_FEE_FINANCE"); - INTEREST=dataList.get(i).get("INTEREST"); - FIRST_ADD_FINANCING=dataList.get(i).get("FIRST_ADD_FINANCING"); - INTEREST_ADD_HANDLING=dataList.get(i).get("INTEREST_ADD_HANDLING"); - ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE"); - FACT_DATE =dataList.get(i).get("FACT_DATE"); - CONTRACT_ID=dataList.get(i).get("CONTRACT_ID"); - CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER"); - PROJECT_NAME=dataList.get(i).get("PROJECT_NAME"); - leas_form=dataList.get(i).get("LEAS_FORM"); - DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID"); - DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); - F_I_TYPE=dataList.get(i).get("F_I_TYPE"); - CUSTID=dataList.get(i).get("CUSTOMERID"); - CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); - CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE"); - BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); - ACC_NUMBER=dataList.get(i).get("ACC_NUMBER"); - REQNBR=dataList.get(i).get("REQNBR"); - PRODUCT_ID=dataList.get(i).get("PRODUCT_ID"); - TAX_NUM=dataList.get(i).get("TAX_NUM"); - // 通过税率获取编码 - BizObject TAX_CODES=null; - if(TAX_NUM!=null && !"".equals(TAX_NUM)) { - TAX_CODES=JBOFactory.createBizObjectQuery(TAX_CODE.CLASS_NAME,"TAX_NUMBER='"+TAX_NUM+"'").getSingleResult(false); - } - - param.put("FACT_MONEY",MONEY); - param.put("INTERESTNOTAX",MONEYNOTAX); - param.put("TAX",MONEYTAX); - param.put("GPS_FEE_FINANCE",GPS_FEE_FINANCE); - param.put("CAUTION_MONEY",CAUTION_MONEY); - param.put("INTEREST",INTEREST); - param.put("PURCHASE_TAX",PURCHASE_TAX_NOTAX); - param.put("INSURANCE_PREMIUM",INSURANCE_PREMIUM_NOTAX); - param.put("FIRST_ADD_FINANCING",FIRST_ADD_FINANCING); - param.put("FINANCING_SUB_OTHERS",FINANCING_SUB_OTHERS); - param.put("FIRST_ADD_HANDLING",FIRST_ADD_HANDLING); - param.put("INTEREST_ADD_HANDLING",INTEREST_ADD_HANDLING); - param.put("OTHERNOTAX",OTHERNOTAX); - param.put("ACCOUNT_DATE",ACCOUNT_DATE); - param.put("FACT_DATE",FACT_DATE); - param.put("CONTRACT_ID",CONTRACT_ID); - param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); - param.put("PROJECT_NAME",PROJECT_NAME); - param.put("LEAS_FORM",leas_form); - param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); - param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); - param.put("F_I_TYPE",F_I_TYPE); - param.put("CUSTID",CUSTID); - param.put("CUSTNAME",CUSTNAME); - param.put("CUSTOMERTYPE",CUSTOMERTYPE); - param.put("BUSINESSTYPE",BUSINESSTYPE); - param.put("ACC_NUMBER",ACC_NUMBER); - param.put("REQNBR",REQNBR); - param.put("VOUCHERNO",VOUCHERNO); - if(TAX_CODES!=null) { - param.put("TAX_CODE",TAX_CODES.getAttribute("TAX_CODES").getString()); - } - // 通过客户名称获取客户编码维护里面的数据, 如果有数据说明是集团内, 如果没有数据说明是集团外 - BizObject cust_list1=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+DISTRIBUTOR_ID+"'").getSingleResult(false); - BizObject cust_list2=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+CUSTID+"'").getSingleResult(false); - if("1".equals(BUSINESSTYPE)){ - if("PZ2018073100000061".equals(VOUCHERNO) || "PZ2019070100000001".equals(VOUCHERNO)){// 确认GPS收入 - param.put("CASHFLOW", "");// 现金流项目 - param.put("BUSINESSTYPE", "0601");// 主营类型 - }else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO)){// 收取客户手续费 - param.put("CASHFLOW", "");// 现金流项目 - param.put("BUSINESSTYPE", "0604"); - }else if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2019070100000003".equals(VOUCHERNO)){// 购置融资租赁资产 - if(cust_list1 != null || cust_list2 !=null) {// 集团内 - param.put("CASHFLOW", "11212");// 现金流项目 - }else {// 集团外 - param.put("CASHFLOW", "11213");// 现金流项目 - } - param.put("BUSINESSTYPE", ""); - // 购置融资租赁资产-直租（分子公司） - }else if("PZ2020081100000004".equals(VOUCHERNO)) { - param.put("CASHFLOW", "11212");// 现金流项目 - }else { - param.put("CASHFLOW", "");// 现金流项目 - param.put("BUSINESSTYPE", "");// 主营类型 - } - } - - param.put("FlowUnid", FlowUnid); - map.clear(); - map.put("PROJ_TYPE", leas_form); - map.put("VOUCHER_NO", VOUCHERNO); - BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); - - if(vouch!=null){ - // 购入保险-直租 - if("PZ2019082600000002".equals(VOUCHERNO)){ - if("Y".equals(FINAN2)){ - vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); - } - // 购入购置税-直租 - }else if("PZ2019082600000003".equals(VOUCHERNO)){ - if("Y".equals(FINAN1)){ - vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); - } - // 收取首付款-直租 - }else if("PZ2019070100000002".equals(VOUCHERNO)) { - if("yes".equals(isBalance3)){ - vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); - } - // 收取客户保证金-直租 - }else if("PZ2020080500000001".equals(VOUCHERNO)) { - if("yes".equals(isBalance2)){ - vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); - } - }else{ - vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); - } - } - } - } - } - - if(Sqlca!=null){ - Sqlca.commit(); - } - - String sMessage="true"; - return sMessage; - } -} +package com.tenwa.voucher.CreateVoucherProcess; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.app.tenwa.customer.CUSTOMER_LIST; +import jbo.voucher.LV_VOUCHER_CONFIG; +import jbo.voucher.TAX_CODE; + +import com.amarsoft.app.util.ProductParamUtil; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; + +public class CreateVoucherLoanDistributor { + public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) throws Exception { + + Transaction Sqlca =null; + Map map=new HashMap(); + Map param=new HashMap(); + + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String MONEY=null; + String MONEYNOTAX=null; + String MONEYTAX=null; + String GPS_FEE_FINANCE=null; + String CAUTION_MONEY=null; + String HANDLING_CHARGE_MONEY=null; + String INTEREST=null; + String FIRST_ADD_FINANCING=null;//首付款+融资额 + String FINANCING_SUB_OTHERS=null;//首付款+融资额-首付款-手续费-保证金-GPS + String FIRST_ADD_HANDLING=null;//首付款+手续费 + String INTEREST_ADD_HANDLING=null;//利息（含税）+手续费（不含税） + String ACCOUNT_DATE=null; + String FACT_DATE=null; + String CONTRACT_ID=null; + String CONTRACT_NUMBER=null; + String PROJECT_NAME=null; + String leas_form=null; + String DISTRIBUTOR_ID=null; + String DISTRIBUTOR_NAME=null; + String F_I_TYPE=null;// 集团内外判断条件 集团内/01 || 集团外/02 + String CUSTID=null; + String CUSTNAME=null; + String CUSTOMERTYPE=null; + String BUSINESSTYPE=null; + String ACC_NUMBER=null; + String REQNBR=null; + String PRODUCT_ID=null; + String TAX_TYPE=null; + String TAX_NUM=null; + String OTHERNOTAX=null; + String FIRST_NOTAX=null; + String FIRST_TAX=null; + + /** + * --------------------------------------------增加三个属性-------------------------------- + */ + String channl=null;//渠道，用来判断是不是中车业务 + String PERSONAL_INSURANCE="0.00";//个人意外险 + String DISCOUNT_INTEREST="0.00";//贴息 + /** + * ----------------------------------------------修改结束------------------------------------------ + */ + String sql=""; + String moneyDataSource=""; + param.clear(); + map.put("FlowUnid", FlowUnid); + + // 确认GPS收入-回租/直租 + if("PZ2018073100000061".equals(VOUCHERNO) || "PZ2019070100000001".equals(VOUCHERNO)){moneyDataSource="LCCT.GPS_FEE";TAX_TYPE="GPS";} + // 收取首付款-回租/直租 + if("PZ2018070900000003".equals(VOUCHERNO) || "PZ2019070100000002".equals(VOUCHERNO)){moneyDataSource="LCCT.FIRST_PAYMENT";TAX_TYPE="本金";} + // 收取客户保证金-回租 + if("PZ2018071000000004".equals(VOUCHERNO) || "PZ2020080500000001".equals(VOUCHERNO)){moneyDataSource="LCCT.CAUTION_MONEY";TAX_TYPE="本金";} + // 收取客户手续费（一次性确认收入）/按月分摊-回租 + if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2018071000000009".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO) || "PZ2019070100000006".equals(VOUCHERNO) ){moneyDataSource="LCCT.HANDLING_CHARGE_MONEY";TAX_TYPE="手续费";} + /** + * ---------------------------------------------起租-收到个人意外险金额--回租------------------------------------- + */ + if("PZ2021032400000003".equals(VOUCHERNO)){moneyDataSource="LCCT.PERSONAL_INSURANCE";TAX_TYPE="手续费";} + + /** + * ---------------------------------------------起租-收到贴息--回租------------------------------------- + */ + if("PZ2021032400000004".equals(VOUCHERNO)){moneyDataSource="LCCT.DISCOUNT_INTEREST";TAX_TYPE="手续费";} + + + + /** + * ------------------------------------------------修改结束------------------------------------------------------ + */ + // 直租购入保险 + if("PZ2019082600000002".equals(VOUCHERNO)){moneyDataSource="IFNULL(LCCT.INSURANCE_PREMIUM, 0)";TAX_TYPE="本金";} + // 直租购入购置税 + if("PZ2019082600000003".equals(VOUCHERNO)){moneyDataSource="IFNULL(LCCT.PURCHASE_TAX, 0)";TAX_TYPE="本金";} + + // 合同起租（一次性确认收入）-回租&&合同起租（按月分摊收入）--回租 + if("PZ2018071000000005".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)) { + sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LRPT.INTEREST, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),0) AS INTEREST_ADD_HANDLING,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID)LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID "; + // 合同起租-直租(天津或者深圳) + }else if("PZ2019070100000004".equals(VOUCHERNO)) { + sql="SELECT IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0))-((IFNULL(LCCT.GPS_FEE, 0)) - IFNULL(ROUND((IFNULL(LCCT.GPS_FEE, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0))) AS MONEYTAX,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INSURANCE_PREMIUM_NOTAX,IFNULL(ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS PURCHASE_TAX_NOTAX,IFNULL(ROUND((IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERNOTAX,IFNULL(ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME = LCI.SUBJECTNAME) "; + // 合同起租-直租（分子公司） + }else if("PZ2020081100000005".equals(VOUCHERNO)) { + sql="SELECT IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0))-((IFNULL(LCCT.GPS_FEE, 0)) - IFNULL(ROUND((IFNULL(LCCT.GPS_FEE, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0))) AS MONEYTAX,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY,0)-IFNULL(LCCT.GPS_FEE, 0))/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NOT NULL AND LPCI.COMPANY_NAME <> LCI.SUBJECTNAME) "; + // 购置融资租赁产-回租 + /**--------------------------------改了这个SQL的取值----------------------------------------- + * 增加了渠道，保险费，贴息的取值 + */ + }else if("PZ2018070900000002".equals(VOUCHERNO)) { + sql="SELECT LCI.CHANNEL, ifnull(lcct.PERSONAL_INSURANCE,0) as PERSONAL_INSURANCE, ifnull(lcct.DISCOUNT_INTEREST,0) as DISCOUNT_INTEREST, IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID=LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (PSL.operationType <>'DYCD' OR PSL.operationType IS NULL) AND LFIT.FLOWUNID = :FLOWUNID "; + /** + * ----------------------------------修改结束----------------------------------------------------- + */ + + // 购置融资租赁产-直租（深圳或者天津公司） + }else if("PZ2019070100000003".equals(VOUCHERNO)) { + sql="SELECT ROUND(IFNULL(LCCT.EQUIP_AMT, 0) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2) AS MONEY,(IFNULL(LCCT.EQUIP_AMT, 0) - ROUND(IFNULL(LCCT.EQUIP_AMT, 0) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID = LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME=LCI.SUBJECTNAME)"; + // 购置融资租赁产-直租（分子公司） + }else if("PZ2020081100000004".equals(VOUCHERNO)) { + sql="SELECT ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2) AS MONEY,((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) - ROUND((IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) + IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS MONEYTAX,(IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0)) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,ROUND(IFNULL(LCCT.FIRST_PAYMENT, 0) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2) AS FIRST_NOTAX,(IFNULL(LCCT.FIRST_PAYMENT, 0)-ROUND(IFNULL(LCCT.FIRST_PAYMENT, 0) / getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS FIRST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID = LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NOT NULL AND LPCI.COMPANY_NAME<>LCI.SUBJECTNAME)"; + // 第一车贷购置融资租赁资产-回租 + }else if("PZ2018073100000062".equals(VOUCHERNO)){ + sql="SELECT IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) AS MONEYNOTAX,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND PSL.operationType = 'DYCD' AND LFIT.FLOWUNID = :FLOWUNID "; + // 加装及杂费-直租 + }else if("PZ2020041000000002".equals(VOUCHERNO)) { + sql="SELECT ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0) AS MONEY,IFNULL(ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0)+IFNULL(ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(IFNULL(LCCT.TABLEWARE_FEE, 0) - ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0)+IFNULL(IFNULL(LCCT.INCIDENTAL, 0) - ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (IFNULL(LCCT.TABLEWARE_FEE, 0)+IFNULL(LCCT.INCIDENTAL, 0))>0 AND lfit.FLOWUNID = :FLOWUNID AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME IN(SELECT ITEMNAME FROM CODE_LIBRARY WHERE CODENO='ManySubject'))"; + }else{ + sql="SELECT ROUND((getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL("+moneyDataSource+", 0) AS MONEY,IFNULL(ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL("+moneyDataSource+" - ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LB_PRODUCTTOCOMPANY_INFO LPCI ON LPCI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND lfit.FLOWUNID = :FLOWUNID "; + } + + // 手续费收入（一次性确认收入） + if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO)){ + sql+=" AND (lcct.HANDLING_CHARGE_MONEY_TYPE='0010' OR lcct.HANDLING_CHARGE_MONEY_TYPE IS NULL OR lcct.HANDLING_CHARGE_MONEY_TYPE='')"; + // 收到手续费（按月分摊收入） + }else if("PZ2018071000000009".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO) || "PZ2019070100000006".equals(VOUCHERNO)){ + sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' "; + // 购入保险-直租/购入购置税-直租 + }else if("PZ2019082600000002".equals(VOUCHERNO) || "PZ2019082600000003".equals(VOUCHERNO)) { + sql+=" AND (LPCI.COMPANY_NAME IS NULL OR LPCI.COMPANY_NAME IN(SELECT ITEMNAME FROM CODE_LIBRARY WHERE CODENO='ManySubject')) "; + } + + List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); + + CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + String VOUCHER_TYPE="1";// 凭证分类 金蝶 + + for (int i=0;i0){ + MONEYNOTAX=dataList.get(i).get("MONEYNOTAX"); + MONEYTAX=dataList.get(i).get("MONEYTAX"); + ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE"); + FACT_DATE =dataList.get(i).get("FACT_DATE"); + CONTRACT_ID=dataList.get(i).get("CONTRACT_ID"); + CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER"); + PROJECT_NAME=dataList.get(i).get("PROJECT_NAME"); + leas_form=dataList.get(i).get("LEAS_FORM"); + DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID"); + DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); + F_I_TYPE=dataList.get(i).get("F_I_TYPE"); + CUSTID=dataList.get(i).get("CUSTOMERID"); + CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); + CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE"); + BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); + ACC_NUMBER=dataList.get(i).get("ACC_NUMBER"); + REQNBR=dataList.get(i).get("REQNBR"); + + param.put("FACT_MONEY",MONEY); + param.put("INTERESTNOTAX",MONEYNOTAX); + param.put("TAX",MONEYTAX); + param.put("ACCOUNT_DATE",ACCOUNT_DATE); + param.put("FACT_DATE",FACT_DATE); + param.put("CONTRACT_ID",CONTRACT_ID); + param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); + param.put("PROJECT_NAME",PROJECT_NAME); + param.put("LEAS_FORM",leas_form); + param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); + param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); + param.put("F_I_TYPE",F_I_TYPE); + param.put("CUSTID",CUSTID); + param.put("CUSTNAME",CUSTNAME); + param.put("CUSTOMERTYPE",CUSTOMERTYPE); + param.put("BUSINESSTYPE",BUSINESSTYPE); + param.put("ACC_NUMBER",ACC_NUMBER); + param.put("REQNBR",REQNBR); + param.put("VOUCHERNO",VOUCHERNO); + // 通过客户名称获取客户编码维护里面的数据, 如果有数据说明是集团内, 如果没有数据说明是集团外 + BizObject cust_list1=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+DISTRIBUTOR_ID+"'").getSingleResult(false); + BizObject cust_list2=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+CUSTID+"'").getSingleResult(false); + + if(cust_list1 != null || cust_list2 !=null) {// 集团内 + param.put("CASHFLOW", "11212");// 现金流项目 + }else {// 集团外 + param.put("CASHFLOW", "11213");// 现金流项目 + } + param.put("BUSINESSTYPE", ""); + + param.put("FlowUnid", FlowUnid); + map.clear(); + map.put("PROJ_TYPE", leas_form); + map.put("VOUCHER_NO", VOUCHERNO); + BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + + if(vouch!=null){ + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + } + } + }else { + PRODUCT_ID=dataList.get(i).get("PRODUCT_ID");// 产品编号 + // 判断购置税是否参融 + String FINAN1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "PURCHASE_TAX","FINAN"); + // 判断保险费是否参融 + String FINAN2 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "INSURANCE_PREMIUM","FINAN"); + // 判断手续费是否差额 + String isBalance1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "HANDLING_CHARGE_MONEY","isBalance"); + // 判断保证金是否差额 + String isBalance2 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "CAUTION_MONEY","isBalance"); + // 判断首付款是否差额 + String isBalance3 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "FIRST_PAYMENT","isBalance"); + /** + * ---------------------------------------增加了对是否差额的判断------------------------------------------------------- + */ + // 判断首个人意外险是否差额 + String isBalance4 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "PERSONAL_INSURANCE","isBalance"); + // 判断贴息是否差额 + String isBalance5 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "DISCOUNT_INTEREST","isBalance"); + /** + * -----------------------------------------修改结束-------------------------------------------------------------------- + */ + + MONEY=dataList.get(i).get("MONEY"); + if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)){ + MONEY=dataList.get(i).get("FIRST_ADD_FINANCING"); + }else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2018071000000009".equals(VOUCHERNO)||"PZ2021032400000003".equals(VOUCHERNO)||"PZ2021032400000004".equals(VOUCHERNO)) { + // 如果手续费是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费 + if("no".equals(isBalance1)) { + MONEY="0.00"; + } + }else if("PZ2018071000000004".equals(VOUCHERNO)) { + // 如果手续费是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费 + if("no".equals(isBalance2)) { + MONEY="0.00"; + } + } + if("".equals(MONEY)||MONEY==null) MONEY="0.00"; + double mon=Double.parseDouble(MONEY); + if(mon>0){ + MONEYTAX=dataList.get(i).get("MONEYTAX"); + MONEYNOTAX=dataList.get(i).get("MONEYNOTAX"); + HANDLING_CHARGE_MONEY=dataList.get(i).get("HANDLING_CHARGE_MONEY"); + CAUTION_MONEY=dataList.get(i).get("CAUTION_MONEY"); + FINANCING_SUB_OTHERS=dataList.get(i).get("FINANCING_SUB_OTHERS"); + FIRST_ADD_HANDLING=dataList.get(i).get("FIRST_ADD_HANDLING"); + FIRST_NOTAX=dataList.get(i).get("FIRST_NOTAX"); + FIRST_TAX=dataList.get(i).get("FIRST_TAX"); + OTHERNOTAX=dataList.get(i).get("OTHERNOTAX"); + INSURANCE_PREMIUM_NOTAX=dataList.get(i).get("INSURANCE_PREMIUM_NOTAX"); + PURCHASE_TAX_NOTAX=dataList.get(i).get("PURCHASE_TAX_NOTAX"); + + /** + * ---------------------------------获取channl 判断合同是不是ZC----------------------------------------------- + */ + channl=dataList.get(i).get("CHANNEL"); + if(channl!=null&&!"".equals(channl)&&"ZC".equals(channl)&&"PZ2018070900000002".equals(VOUCHERNO)){ + PERSONAL_INSURANCE=dataList.get(i).get("PERSONAL_INSURANCE"); + DISCOUNT_INTEREST=dataList.get(i).get("DISCOUNT_INTEREST"); + } + /** + * ------------------------------------------修改结束------------------------------------------------------- + */ + + // 直租合同起租（深圳或者天津公司） + if("PZ2019070100000004".equals(VOUCHERNO)){ + // 如果不参融， 获取对应金额 + if("N".equals(FINAN1)){ + PURCHASE_TAX_NOTAX="0.00"; + } + if("N".equals(FINAN2)){ + INSURANCE_PREMIUM_NOTAX="0.00"; + } + // 直租购置融资租赁资产(深圳或者天津公司) + }else if("PZ2019070100000003".equals(VOUCHERNO)) { + // 贷1如果保证金不是差额放款，不应该-保证金， 所以加回来 + if("no".equals(isBalance2)) { + FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(CAUTION_MONEY)+""; + CAUTION_MONEY="0.00"; + } + // 贷1如果首付款不是差额放款，不应该-首付款， 所以加回来 + if("no".equals(isBalance3)) { + FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(FIRST_ADD_HANDLING)+""; + FIRST_ADD_HANDLING="0.00"; + } + // 直租购置融资租赁资产(子公司) + }else if("PZ2020081100000004".equals(VOUCHERNO)) { + // 借1和借2如果保证金不是差额放款，不应该减保证金， 所以加上 + if("no".equals(isBalance2)) { + FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(CAUTION_MONEY)+""; + CAUTION_MONEY="0.00"; + } + // 借1和借2如果首付款不是差额放款，不应该加首付款， 所以减去 + if("no".equals(isBalance3)) { + MONEY=Double.parseDouble(MONEY)-Double.parseDouble(FIRST_NOTAX)+""; + MONEYTAX=Double.parseDouble(MONEYTAX)-Double.parseDouble(FIRST_TAX)+""; + FIRST_ADD_HANDLING="0.00"; + } + } + + // 购置融资租赁资产配置差额, 非差额 + if("PZ2018070900000002".equals(VOUCHERNO)){ + // 如果手续费是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费 + if("no".equals(isBalance1)) { + FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(HANDLING_CHARGE_MONEY)+""; + FIRST_ADD_HANDLING=Double.parseDouble(FIRST_ADD_HANDLING)-Double.parseDouble(HANDLING_CHARGE_MONEY)+""; + } + // 如果保证金是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费 + if("no".equals(isBalance2)) { + FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(CAUTION_MONEY)+""; + CAUTION_MONEY="0.00"; + } + + /** + * ----------------------------------------如果个人意外险和贴息是差额放款，那么银行那里给0，如果不是差额，银行那里要加------------------------------------------------ + */ + + + if("no".equals(isBalance4)) { + PERSONAL_INSURANCE="0.00"; + }else if("yes".equals(isBalance4)){ + FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)-Double.parseDouble(PERSONAL_INSURANCE)+""; + } + + if("no".equals(isBalance5)) { + DISCOUNT_INTEREST="0.00"; + }else if("yes".equals(isBalance5)){ + FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)-Double.parseDouble(DISCOUNT_INTEREST)+""; + } + /** + * -----------------------------------------------修改结束----------------------------------------------------------------------------------- + */ + } + + GPS_FEE_FINANCE=dataList.get(i).get("GPS_FEE_FINANCE"); + INTEREST=dataList.get(i).get("INTEREST"); + FIRST_ADD_FINANCING=dataList.get(i).get("FIRST_ADD_FINANCING"); + INTEREST_ADD_HANDLING=dataList.get(i).get("INTEREST_ADD_HANDLING"); + ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE"); + FACT_DATE =dataList.get(i).get("FACT_DATE"); + CONTRACT_ID=dataList.get(i).get("CONTRACT_ID"); + CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER"); + PROJECT_NAME=dataList.get(i).get("PROJECT_NAME"); + leas_form=dataList.get(i).get("LEAS_FORM"); + DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID"); + DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); + F_I_TYPE=dataList.get(i).get("F_I_TYPE"); + CUSTID=dataList.get(i).get("CUSTOMERID"); + CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); + CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE"); + BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); + ACC_NUMBER=dataList.get(i).get("ACC_NUMBER"); + REQNBR=dataList.get(i).get("REQNBR"); + PRODUCT_ID=dataList.get(i).get("PRODUCT_ID"); + TAX_NUM=dataList.get(i).get("TAX_NUM"); + // 通过税率获取编码 + BizObject TAX_CODES=null; + if(TAX_NUM!=null && !"".equals(TAX_NUM)) { + TAX_CODES=JBOFactory.createBizObjectQuery(TAX_CODE.CLASS_NAME,"TAX_NUMBER='"+TAX_NUM+"'").getSingleResult(false); + } + + param.put("FACT_MONEY",MONEY); + param.put("INTERESTNOTAX",MONEYNOTAX); + param.put("TAX",MONEYTAX); + param.put("GPS_FEE_FINANCE",GPS_FEE_FINANCE); + param.put("CAUTION_MONEY",CAUTION_MONEY); + param.put("INTEREST",INTEREST); + param.put("PURCHASE_TAX",PURCHASE_TAX_NOTAX); + param.put("INSURANCE_PREMIUM",INSURANCE_PREMIUM_NOTAX); + param.put("FIRST_ADD_FINANCING",FIRST_ADD_FINANCING); + param.put("FINANCING_SUB_OTHERS",FINANCING_SUB_OTHERS); + param.put("FIRST_ADD_HANDLING",FIRST_ADD_HANDLING); + param.put("INTEREST_ADD_HANDLING",INTEREST_ADD_HANDLING); + param.put("OTHERNOTAX",OTHERNOTAX); + param.put("ACCOUNT_DATE",ACCOUNT_DATE); + param.put("FACT_DATE",FACT_DATE); + param.put("CONTRACT_ID",CONTRACT_ID); + param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); + param.put("PROJECT_NAME",PROJECT_NAME); + param.put("LEAS_FORM",leas_form); + param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); + param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); + param.put("F_I_TYPE",F_I_TYPE); + param.put("CUSTID",CUSTID); + param.put("CUSTNAME",CUSTNAME); + param.put("CUSTOMERTYPE",CUSTOMERTYPE); + param.put("BUSINESSTYPE",BUSINESSTYPE); + param.put("ACC_NUMBER",ACC_NUMBER); + param.put("REQNBR",REQNBR); + param.put("VOUCHERNO",VOUCHERNO); + + /** + * -----------------------------------如果是中车业务 并且是融资租赁资产的凭证-------------------------------------------------- + */ + if(channl!=null&&!"".equals(channl)&&"ZC".equals(channl)&&"PZ2018070900000002".equals(VOUCHERNO)){ + param.put("PERSONAL_INSURANCE",PERSONAL_INSURANCE); + param.put("DISCOUNT_INTEREST",DISCOUNT_INTEREST); + + } + /** + * ------------------------------------------修改结束------------------------------------------- + */ + if(TAX_CODES!=null) { + param.put("TAX_CODE",TAX_CODES.getAttribute("TAX_CODES").getString()); + } + // 通过客户名称获取客户编码维护里面的数据, 如果有数据说明是集团内, 如果没有数据说明是集团外 + BizObject cust_list1=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+DISTRIBUTOR_ID+"'").getSingleResult(false); + BizObject cust_list2=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+CUSTID+"'").getSingleResult(false); + if("1".equals(BUSINESSTYPE)){ + if("PZ2018073100000061".equals(VOUCHERNO) || "PZ2019070100000001".equals(VOUCHERNO)){// 确认GPS收入 + param.put("CASHFLOW", "");// 现金流项目 + param.put("BUSINESSTYPE", "0601");// 主营类型 + }else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO)){// 收取客户手续费 + param.put("CASHFLOW", "");// 现金流项目 + param.put("BUSINESSTYPE", "0604"); + }else if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2019070100000003".equals(VOUCHERNO)){// 购置融资租赁资产 + if(cust_list1 != null || cust_list2 !=null) {// 集团内 + param.put("CASHFLOW", "11212");// 现金流项目 + }else {// 集团外 + param.put("CASHFLOW", "11213");// 现金流项目 + } + param.put("BUSINESSTYPE", ""); + // 购置融资租赁资产-直租（分子公司） + }else if("PZ2020081100000004".equals(VOUCHERNO)) { + param.put("CASHFLOW", "11212");// 现金流项目 + }else { + param.put("CASHFLOW", "");// 现金流项目 + param.put("BUSINESSTYPE", "");// 主营类型 + } + } + + param.put("FlowUnid", FlowUnid); + map.clear(); + map.put("PROJ_TYPE", leas_form); + map.put("VOUCHER_NO", VOUCHERNO); + BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + + if(vouch!=null){ + // 购入保险-直租 + if("PZ2019082600000002".equals(VOUCHERNO)){ + if("Y".equals(FINAN2)){ + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + } + // 购入购置税-直租 + }else if("PZ2019082600000003".equals(VOUCHERNO)){ + if("Y".equals(FINAN1)){ + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + } + // 收取首付款-直租 + }else if("PZ2019070100000002".equals(VOUCHERNO)) { + if("yes".equals(isBalance3)){ + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + } + // 收取客户保证金-直租 + }else if("PZ2020080500000001".equals(VOUCHERNO)) { + if("yes".equals(isBalance2)){ + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + } + }else{ + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + } + } + } + } + } + + if(Sqlca!=null){ + Sqlca.commit(); + } + + String sMessage="true"; + return sMessage; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index 275d63dbf..6f27c998b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -1,48 +1,51 @@ -package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; - -import com.amarsoft.awe.util.Transaction; -import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoanDistributor; -/** - * 起租相关凭证, 实际付款(汽车)流程结束后生成 - * @author xiezhiwen - */ -public class ContractOnhireVoucher extends BaseBussiness { - - public Object run(Transaction Sqlca) throws Exception { - this.initBussinessParam(Sqlca); - String FlowUnid=this.getAttribute("FlowUnid").toString(); - String userid = this.getAttribute("CurUserID").toString(); - - CreateVoucherLoanDistributor cvld=new CreateVoucherLoanDistributor(); - /** - * 回租 - */ - cvld.CreateVoucher(FlowUnid, "PZ2018073100000061",userid);// 确认GPS收入 --回租 - cvld.CreateVoucher(FlowUnid, "PZ2018070900000003",userid);// 收取首付款-回租 - cvld.CreateVoucher(FlowUnid, "PZ2018070900000002",userid);// 购置融资租赁资产-回租 - cvld.CreateVoucher(FlowUnid, "PZ2018073100000062",userid);// 购置融资租赁资产-回--第一车贷 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000005",userid);// 合同起租（一次性确认收入）-回租 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000006",userid);// 合同起租（按月分摊收入）--回租 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000004",userid);// 收取客户保证金--回租 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000007",userid);// 收取客户手续费（一次性确认收入）--回租 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000009",userid);// 收取客户手续费（按月分摊收入）--回租 - - /** - * 直租 - */ - cvld.CreateVoucher(FlowUnid, "PZ2019070100000001",userid);// 确认GPS收入 --直租 - cvld.CreateVoucher(FlowUnid, "PZ2019070100000002",userid);// 收取首付款-直租 - cvld.CreateVoucher(FlowUnid, "PZ2020080500000001",userid);// 收取客户保证金-直租 - cvld.CreateVoucher(FlowUnid, "PZ2019082600000002",userid);// 购入保险-直租 - cvld.CreateVoucher(FlowUnid, "PZ2019082600000003",userid);// 购入购置税-直租 - cvld.CreateVoucher(FlowUnid, "PZ2020041000000002",userid);// 加装及杂费-直租 - cvld.CreateVoucher(FlowUnid, "PZ2019070100000003",userid);// 购置融资租赁资产-直租（深圳或者天津公司） - cvld.CreateVoucher(FlowUnid, "PZ2020081100000004",userid);// 购置融资租赁资产-直租（分子公司） - cvld.CreateVoucher(FlowUnid, "PZ2019070100000004",userid);// 合同起租-直租(车牌挂在天津或者深圳公司下） - cvld.CreateVoucher(FlowUnid, "PZ2020081100000005",userid);// 合同起租-直租（车牌挂在分子公司下） - cvld.CreateVoucher(FlowUnid, "PZ2019070100000005",userid);// 收取客户手续费（一次性确认收入）--直租 - cvld.CreateVoucher(FlowUnid, "PZ2019070100000006",userid);// 收取客户手续费（按月分摊收入）--直租 - return "true"; - } -} +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoanDistributor; +/** + * 起租相关凭证, 实际付款(汽车)流程结束后生成 + * @author xiezhiwen + */ +public class ContractOnhireVoucher extends BaseBussiness { + + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String FlowUnid=this.getAttribute("FlowUnid").toString(); + String userid = this.getAttribute("CurUserID").toString(); + + CreateVoucherLoanDistributor cvld=new CreateVoucherLoanDistributor(); + /** + * 回租 + */ + cvld.CreateVoucher(FlowUnid, "PZ2018073100000061",userid);// 确认GPS收入 --回租 + cvld.CreateVoucher(FlowUnid, "PZ2018070900000003",userid);// 收取首付款-回租 + cvld.CreateVoucher(FlowUnid, "PZ2018070900000002",userid);// 购置融资租赁资产-回租 + cvld.CreateVoucher(FlowUnid, "PZ2018073100000062",userid);// 购置融资租赁资产-回--第一车贷 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000005",userid);// 合同起租（一次性确认收入）-回租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000006",userid);// 合同起租（按月分摊收入）--回租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000004",userid);// 收取客户保证金--回租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000007",userid);// 收取客户手续费（一次性确认收入）--回租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000009",userid);// 收取客户手续费（按月分摊收入）--回租 + + cvld.CreateVoucher(FlowUnid, "PZ2021032400000003",userid);// 起租-收到个人意外险金额--回租 + cvld.CreateVoucher(FlowUnid, "PZ2021032400000004",userid);// 起租-收到贴息--回租 + + /** + * 直租 + */ + cvld.CreateVoucher(FlowUnid, "PZ2019070100000001",userid);// 确认GPS收入 --直租 + cvld.CreateVoucher(FlowUnid, "PZ2019070100000002",userid);// 收取首付款-直租 + cvld.CreateVoucher(FlowUnid, "PZ2020080500000001",userid);// 收取客户保证金-直租 + cvld.CreateVoucher(FlowUnid, "PZ2019082600000002",userid);// 购入保险-直租 + cvld.CreateVoucher(FlowUnid, "PZ2019082600000003",userid);// 购入购置税-直租 + cvld.CreateVoucher(FlowUnid, "PZ2020041000000002",userid);// 加装及杂费-直租 + cvld.CreateVoucher(FlowUnid, "PZ2019070100000003",userid);// 购置融资租赁资产-直租（深圳或者天津公司） + cvld.CreateVoucher(FlowUnid, "PZ2020081100000004",userid);// 购置融资租赁资产-直租（分子公司） + cvld.CreateVoucher(FlowUnid, "PZ2019070100000004",userid);// 合同起租-直租(车牌挂在天津或者深圳公司下） + cvld.CreateVoucher(FlowUnid, "PZ2020081100000005",userid);// 合同起租-直租（车牌挂在分子公司下） + cvld.CreateVoucher(FlowUnid, "PZ2019070100000005",userid);// 收取客户手续费（一次性确认收入）--直租 + cvld.CreateVoucher(FlowUnid, "PZ2019070100000006",userid);// 收取客户手续费（按月分摊收入）--直租 + return "true"; + } +} From 2d3ea962725ec8f989aa531211484a09fcaa952b Mon Sep 17 00:00:00 2001 From: chenleiying Date: Wed, 24 Mar 2021 17:02:44 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E5=87=AD=E8=AF=81=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherCustCautionMoneyIncome.java | 300 +++++++++--------- .../CreateVoucherLoanDistributor.java | 2 +- .../IncomeVoucher.java | 133 ++++---- .../serviceImp/CreateVoucherServiceImpl.java | 2 +- 4 files changed, 220 insertions(+), 217 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index 1bcfb1901..e80e46d90 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -1,150 +1,150 @@ -package com.tenwa.voucher.CreateVoucherProcess; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jbo.voucher.LV_VOUCHER_CONFIG; -import jbo.voucher.TAX_CODE; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.util.Transaction; -import com.amarsoft.dict.als.cache.CacheLoaderFactory; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; - -/** - * 网银回款 - */ -public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { - - public String CreateVoucher(String FlowUnid, String VOUCHERNO, String FeeType,String userid) throws Exception { - - Transaction Sqlca = null; - Map map = new HashMap(); - Map param = new HashMap(); - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - - String MONEY = null; - String MONEYNOTAX = null; - String MONEYTAX = null; - String ACCOUNT_DATE = null; - String FACT_DATE = null; - String CONTRACT_ID = null; - String CONTRACT_NUMBER = null; - String PROJECT_NAME = null; - String leas_form = null; - String DISTRIBUTOR_ID = null; - String DISTRIBUTOR_NAME = null; - String CARID = null; - String CARMODEL = null; - String CUSTID = null; - String CUSTNAME = null; - String CUSTOMERTYPE = null; - String BUSINESSTYPE = null; - String ACC_NUM = null; - String TAX_NUM = null; - String sql = ""; - param.clear(); - map.put("FlowUnid", FlowUnid); - map.put("FEE_TYPE", FeeType); - - sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'手续费',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'留购价',lcct.start_date),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'留购价',lcct.start_date),2)),0) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE != '') THEN LFIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE != '') THEN LFIT.FACT_DATE ELSE NOW() END,'%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; - // 区分手续费是一次性还是按月分摊 - if("PZ2019121600000163".equals(VOUCHERNO)) { - sql+=" AND (lcct.HANDLING_CHARGE_MONEY_TYPE='0010' OR lcct.HANDLING_CHARGE_MONEY_TYPE IS NULL OR lcct.HANDLING_CHARGE_MONEY_TYPE='')"; - // 按月 - }else if("PZ2019121700000164".equals(VOUCHERNO)) { - sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' "; - } - // 查询sql, 将结果集封装到list集合中 - List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); - CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); - String VOUCHER_TYPE = "1";// 凭证分类 金蝶 - - //遍历获取结果集, 将结果写入map中 - for (int i = 0; i < dataList.size(); i++) { - MONEY = dataList.get(i).get("MONEY").toString(); - if ("".equals(MONEY)||MONEY == null)MONEY = "0.00"; - double mon = Double.parseDouble(MONEY); - // 判断有金额, 封装值到map中 - if (Math.abs(mon) > 0) { - MONEYNOTAX = dataList.get(i).get("MONEYNOTAX").toString(); - MONEYTAX = dataList.get(i).get("MONEYTAX").toString(); - ACCOUNT_DATE = dataList.get(i).get("ACCOUNT_DATE").toString(); - FACT_DATE = dataList.get(i).get("FACT_DATE").toString(); - CONTRACT_ID = dataList.get(i).get("CONTRACT_ID").toString(); - CONTRACT_NUMBER = dataList.get(i).get("CONTRACT_NUMBER").toString(); - PROJECT_NAME = dataList.get(i).get("PROJECT_NAME").toString(); - leas_form = dataList.get(i).get("LEAS_FORM").toString(); - DISTRIBUTOR_ID = dataList.get(i).get("DISTRIBUTOR_ID"); - DISTRIBUTOR_NAME = dataList.get(i).get("DISTRIBUTOR_NAME"); - CARID = dataList.get(i).get("CARID"); - CARMODEL = dataList.get(i).get("MODEL"); - CUSTID = dataList.get(i).get("CUSTOMERID"); - CUSTNAME = dataList.get(i).get("CUSTOMERNAME"); - CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE"); - BUSINESSTYPE = dataList.get(i).get("BUSINESSTYPE"); - ACC_NUM = dataList.get(i).get("ACC_NUMBER"); - TAX_NUM = dataList.get(i).get("TAX_NUM"); - // 通过税率获取编码 - BizObject TAX_CODES=null; - if(TAX_NUM!=null && !"".equals(TAX_NUM)) { - TAX_CODES=JBOFactory.createBizObjectQuery(TAX_CODE.CLASS_NAME,"TAX_NUMBER='"+TAX_NUM+"'").getSingleResult(false); - } - - param.put("FACT_MONEY", MONEY); - param.put("INTERESTNOTAX", MONEYNOTAX); - param.put("TAX", MONEYTAX); - param.put("ACCOUNT_DATE", ACCOUNT_DATE); - param.put("FACT_DATE", FACT_DATE); - param.put("CONTRACT_ID", CONTRACT_ID); - param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); - param.put("PROJECT_NAME", PROJECT_NAME); - param.put("LEAS_FORM", leas_form); - param.put("DISTRIBUTOR_ID", DISTRIBUTOR_ID); - param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME); - param.put("CARID", CARID); - param.put("CARMODEL", CARMODEL); - param.put("CUSTID", CUSTID); - param.put("CUSTNAME", CUSTNAME); - param.put("CUSTOMERTYPE", CUSTOMERTYPE); - param.put("BUSINESSTYPE", BUSINESSTYPE); - param.put("ACC_NUMBER", ACC_NUM); - param.put("VOUCHERNO", VOUCHERNO); - if(TAX_CODES!=null) { - param.put("TAX_CODE",TAX_CODES.getAttribute("TAX_CODES").getString()); - } - - if("PZ2018072100000026".equals(VOUCHERNO) || "PZ2019070100000015".equals(VOUCHERNO)) { - param.put("BUSINESSTYPE", "0602");// 主营类型 - }else if("PZ2018072100000031".equals(VOUCHERNO) || "PZ2019070100000019".equals(VOUCHERNO)) { - param.put("BUSINESSTYPE", "0605");// 主营类型 - }else if("PZ2019121600000163".equals(VOUCHERNO)) { - param.put("BUSINESSTYPE", "0604");// 主营类型 - } - // param.put("FUNDTYPE", ""); // 主营类型 - param.put("FlowUnid", FlowUnid); - map.clear(); - map.put("PROJ_TYPE", leas_form); - map.put("VOUCHER_NO", VOUCHERNO); - // 根据map中的参数, 查询LV_VOUCHER_CONFIG表数据 - BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); - // 如果结果不为空, - if (vouch != null) { - //将创建凭证的参数传入在下一层 - vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); - } - } - } - - if (Sqlca != null) { - Sqlca.commit(); - } - - String sMessage = "true"; - return sMessage; - } -} +package com.tenwa.voucher.CreateVoucherProcess; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.voucher.LV_VOUCHER_CONFIG; +import jbo.voucher.TAX_CODE; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; + +/** + * 网银回款 + */ +public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { + + public String CreateVoucher(String FlowUnid, String VOUCHERNO, String FeeType,String userid) throws Exception { + + Transaction Sqlca = null; + Map map = new HashMap(); + Map param = new HashMap(); + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + + String MONEY = null; + String MONEYNOTAX = null; + String MONEYTAX = null; + String ACCOUNT_DATE = null; + String FACT_DATE = null; + String CONTRACT_ID = null; + String CONTRACT_NUMBER = null; + String PROJECT_NAME = null; + String leas_form = null; + String DISTRIBUTOR_ID = null; + String DISTRIBUTOR_NAME = null; + String CARID = null; + String CARMODEL = null; + String CUSTID = null; + String CUSTNAME = null; + String CUSTOMERTYPE = null; + String BUSINESSTYPE = null; + String ACC_NUM = null; + String TAX_NUM = null; + String sql = ""; + param.clear(); + map.put("FlowUnid", FlowUnid); + map.put("FEE_TYPE", FeeType); + + sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'手续费',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'留购价',lcct.start_date),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'留购价',lcct.start_date),2)),0) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE != '') THEN LFIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LFIT.FACT_DATE IS NOT NULL OR LFIT.FACT_DATE != '') THEN LFIT.FACT_DATE ELSE NOW() END,'%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; + // 区分手续费是一次性还是按月分摊 + if("PZ2019121600000163".equals(VOUCHERNO)) { + sql+=" AND (lcct.HANDLING_CHARGE_MONEY_TYPE='0010' OR lcct.HANDLING_CHARGE_MONEY_TYPE IS NULL OR lcct.HANDLING_CHARGE_MONEY_TYPE='')"; + // 按月 + }else if("PZ2019121700000164".equals(VOUCHERNO)) { + sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' "; + } + // 查询sql, 将结果集封装到list集合中 + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); + CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); + String VOUCHER_TYPE = "1";// 凭证分类 金蝶 + + //遍历获取结果集, 将结果写入map中 + for (int i = 0; i < dataList.size(); i++) { + MONEY = dataList.get(i).get("MONEY").toString(); + if ("".equals(MONEY)||MONEY == null)MONEY = "0.00"; + double mon = Double.parseDouble(MONEY); + // 判断有金额, 封装值到map中 + if (Math.abs(mon) > 0) { + MONEYNOTAX = dataList.get(i).get("MONEYNOTAX").toString(); + MONEYTAX = dataList.get(i).get("MONEYTAX").toString(); + ACCOUNT_DATE = dataList.get(i).get("ACCOUNT_DATE").toString(); + FACT_DATE = dataList.get(i).get("FACT_DATE").toString(); + CONTRACT_ID = dataList.get(i).get("CONTRACT_ID").toString(); + CONTRACT_NUMBER = dataList.get(i).get("CONTRACT_NUMBER").toString(); + PROJECT_NAME = dataList.get(i).get("PROJECT_NAME").toString(); + leas_form = dataList.get(i).get("LEAS_FORM").toString(); + DISTRIBUTOR_ID = dataList.get(i).get("DISTRIBUTOR_ID"); + DISTRIBUTOR_NAME = dataList.get(i).get("DISTRIBUTOR_NAME"); + CARID = dataList.get(i).get("CARID"); + CARMODEL = dataList.get(i).get("MODEL"); + CUSTID = dataList.get(i).get("CUSTOMERID"); + CUSTNAME = dataList.get(i).get("CUSTOMERNAME"); + CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE"); + BUSINESSTYPE = dataList.get(i).get("BUSINESSTYPE"); + ACC_NUM = dataList.get(i).get("ACC_NUMBER"); + TAX_NUM = dataList.get(i).get("TAX_NUM"); + // 通过税率获取编码 + BizObject TAX_CODES=null; + if(TAX_NUM!=null && !"".equals(TAX_NUM)) { + TAX_CODES=JBOFactory.createBizObjectQuery(TAX_CODE.CLASS_NAME,"TAX_NUMBER='"+TAX_NUM+"'").getSingleResult(false); + } + + param.put("FACT_MONEY", MONEY); + param.put("INTERESTNOTAX", MONEYNOTAX); + param.put("TAX", MONEYTAX); + param.put("ACCOUNT_DATE", ACCOUNT_DATE); + param.put("FACT_DATE", FACT_DATE); + param.put("CONTRACT_ID", CONTRACT_ID); + param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); + param.put("PROJECT_NAME", PROJECT_NAME); + param.put("LEAS_FORM", leas_form); + param.put("DISTRIBUTOR_ID", DISTRIBUTOR_ID); + param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME); + param.put("CARID", CARID); + param.put("CARMODEL", CARMODEL); + param.put("CUSTID", CUSTID); + param.put("CUSTNAME", CUSTNAME); + param.put("CUSTOMERTYPE", CUSTOMERTYPE); + param.put("BUSINESSTYPE", BUSINESSTYPE); + param.put("ACC_NUMBER", ACC_NUM); + param.put("VOUCHERNO", VOUCHERNO); + if(TAX_CODES!=null) { + param.put("TAX_CODE",TAX_CODES.getAttribute("TAX_CODES").getString()); + } + + if("PZ2018072100000026".equals(VOUCHERNO) || "PZ2019070100000015".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0602");// 主营类型 + }else if("PZ2018072100000031".equals(VOUCHERNO) || "PZ2019070100000019".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0605");// 主营类型 + }else if("PZ2019121600000163".equals(VOUCHERNO)||"PZ2021032400000006".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0604");// 主营类型 + } + // param.put("FUNDTYPE", ""); // 主营类型 + param.put("FlowUnid", FlowUnid); + map.clear(); + map.put("PROJ_TYPE", leas_form); + map.put("VOUCHER_NO", VOUCHERNO); + // 根据map中的参数, 查询LV_VOUCHER_CONFIG表数据 + BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + // 如果结果不为空, + if (vouch != null) { + //将创建凭证的参数传入在下一层 + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); + } + } + } + + if (Sqlca != null) { + Sqlca.commit(); + } + + String sMessage = "true"; + return sMessage; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 814019b74..7f411bf7a 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -429,7 +429,7 @@ public class CreateVoucherLoanDistributor { if("PZ2018073100000061".equals(VOUCHERNO) || "PZ2019070100000001".equals(VOUCHERNO)){// 确认GPS收入 param.put("CASHFLOW", "");// 现金流项目 param.put("BUSINESSTYPE", "0601");// 主营类型 - }else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO)){// 收取客户手续费 + }else if("PZ2018071000000007".equals(VOUCHERNO) || "PZ2019070100000005".equals(VOUCHERNO)||"PZ2021032400000003".equals(VOUCHERNO)){// 收取客户手续费 param.put("CASHFLOW", "");// 现金流项目 param.put("BUSINESSTYPE", "0604"); }else if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2019070100000003".equals(VOUCHERNO)){// 购置融资租赁资产 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java index 1bed22a78..bcd3b16b3 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -1,65 +1,68 @@ -package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; - -import com.amarsoft.awe.util.Transaction; -import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherEbankMoney; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedCompensatory; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncome; -/** - * 网银收款流程结束后生成相应的凭证 - * @author xiezhiwen - */ -public class IncomeVoucher extends BaseBussiness { - - @Override - public Object run(Transaction Sqlca) throws Exception { - this.initBussinessParam(Sqlca); - String FlowUnid=this.getAttribute("FlowUnid").toString(); - String userid = this.getAttribute("CurUserID").toString(); - - /** - * 汽车网银回款-资金部分 - */ - CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome(); - // 汽车回租 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000026", "feetype30",userid);//收到的违约金/罚款 --回租 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4",userid); //收到名义货价 --回租 - cvci.CreateVoucher(FlowUnid, "PZ2019121600000162", "feetype2",userid); //回款-收到客户保证金 --回租 - cvci.CreateVoucher(FlowUnid, "PZ2019121600000163", "feetype1",userid); //回款-收到客户手续费(一次性)--回租 - cvci.CreateVoucher(FlowUnid, "PZ2019121700000164", "feetype1",userid); //回款-收到客户手续费(按月) --回租 - - // 汽车直租 - cvci.CreateVoucher(FlowUnid, "PZ2019070100000015", "feetype30",userid);//收到的违约金/罚款 --回租 - cvci.CreateVoucher(FlowUnid, "PZ2019070100000019", "feetype4",userid); //收到名义货价--直租 - cvci.CreateVoucher(FlowUnid, "PZ2020041000000003", "feetype2",userid); //直租-收到客户保证金 - cvci.CreateVoucher(FlowUnid, "PZ2020080400000003", "feetype5",userid); //直租-收到客户首付款 - - /** - * 汽车网银回款-租金部分 - */ - CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); - // 汽车回租 - cvri.CreateVoucher(FlowUnid,"PZ2018072100000024",userid);//回款-收到的租金(网银)--当月(回租) - cvri.CreateVoucher(FlowUnid,"PZ2018080400000081",userid);//回款-收到的租金(网银)--跨月(回租) - cvri.CreateVoucher(FlowUnid,"PZ2018072100000025",userid);//回款-收到的逾期利息(网银)--(回租) - - // 汽车直租 - cvri.CreateVoucher(FlowUnid,"PZ2019070100000016",userid);//回款-收到的租金(网银)--当月(直租) - cvri.CreateVoucher(FlowUnid,"PZ2019070100000017",userid);//回款-收到的租金(网银)--跨月(直租) - cvri.CreateVoucher(FlowUnid,"PZ2019070100000014",userid);//回款-收到的逾期利息(网银)--(直租) - - /** - * 代偿反冲 - */ - CreateVoucherRedCompensatory cvrcs = new CreateVoucherRedCompensatory(); - cvrcs.CreateVoucher(FlowUnid,"PZ2019071500000030",userid,Sqlca);//代偿租金 - cvrcs.CreateVoucher(FlowUnid,"PZ2019071500000031",userid,Sqlca);//代偿逾期利息 - - CreateVoucherEbankMoney cvem = new CreateVoucherEbankMoney(); - cvem.CreateVoucher(FlowUnid, "PZ2019070100000018", userid,Sqlca);// 回款-多余回款分解 - - return "true"; - } - -} +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherEbankMoney; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedCompensatory; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncome; +/** + * 网银收款流程结束后生成相应的凭证 + * @author xiezhiwen + */ +public class IncomeVoucher extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String FlowUnid=this.getAttribute("FlowUnid").toString(); + String userid = this.getAttribute("CurUserID").toString(); + + /** + * 汽车网银回款-资金部分 + */ + CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome(); + // 汽车回租 + cvci.CreateVoucher(FlowUnid, "PZ2018072100000026", "feetype30",userid);//收到的违约金/罚款 --回租 + cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4",userid); //收到名义货价 --回租 + cvci.CreateVoucher(FlowUnid, "PZ2019121600000162", "feetype2",userid); //回款-收到客户保证金 --回租 + cvci.CreateVoucher(FlowUnid, "PZ2019121600000163", "feetype1",userid); //回款-收到客户手续费(一次性)--回租 + cvci.CreateVoucher(FlowUnid, "PZ2019121700000164", "feetype1",userid); //回款-收到客户手续费(按月) --回租 + + cvci.CreateVoucher(FlowUnid, "PZ2021032400000006", "feetype32",userid); //回款-收到个人意外险(网银来款)--回租 + cvci.CreateVoucher(FlowUnid, "PZ2021032400000005", "feetype33",userid); //回款-收到客户贴息 --回租 + + // 汽车直租 + cvci.CreateVoucher(FlowUnid, "PZ2019070100000015", "feetype30",userid);//收到的违约金/罚款 --回租 + cvci.CreateVoucher(FlowUnid, "PZ2019070100000019", "feetype4",userid); //收到名义货价--直租 + cvci.CreateVoucher(FlowUnid, "PZ2020041000000003", "feetype2",userid); //直租-收到客户保证金 + cvci.CreateVoucher(FlowUnid, "PZ2020080400000003", "feetype5",userid); //直租-收到客户首付款 + + /** + * 汽车网银回款-租金部分 + */ + CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); + // 汽车回租 + cvri.CreateVoucher(FlowUnid,"PZ2018072100000024",userid);//回款-收到的租金(网银)--当月(回租) + cvri.CreateVoucher(FlowUnid,"PZ2018080400000081",userid);//回款-收到的租金(网银)--跨月(回租) + cvri.CreateVoucher(FlowUnid,"PZ2018072100000025",userid);//回款-收到的逾期利息(网银)--(回租) + + // 汽车直租 + cvri.CreateVoucher(FlowUnid,"PZ2019070100000016",userid);//回款-收到的租金(网银)--当月(直租) + cvri.CreateVoucher(FlowUnid,"PZ2019070100000017",userid);//回款-收到的租金(网银)--跨月(直租) + cvri.CreateVoucher(FlowUnid,"PZ2019070100000014",userid);//回款-收到的逾期利息(网银)--(直租) + + /** + * 代偿反冲 + */ + CreateVoucherRedCompensatory cvrcs = new CreateVoucherRedCompensatory(); + cvrcs.CreateVoucher(FlowUnid,"PZ2019071500000030",userid,Sqlca);//代偿租金 + cvrcs.CreateVoucher(FlowUnid,"PZ2019071500000031",userid,Sqlca);//代偿逾期利息 + + CreateVoucherEbankMoney cvem = new CreateVoucherEbankMoney(); + cvem.CreateVoucher(FlowUnid, "PZ2019070100000018", userid,Sqlca);// 回款-多余回款分解 + + return "true"; + } + +} diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index cce526ed7..7e246e55b 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -423,7 +423,7 @@ public class CreateVoucherServiceImpl { }else if("PZ2018081700000134".equals(VOUCHERNO) || "PZ2018081700000138".equals(VOUCHERNO) || "PZ2018072100000047".equals(VOUCHERNO) || "PZ2018081700000132".equals(VOUCHERNO) || "PZ2018081700000130".equals(VOUCHERNO) || "PZ2018081700000128".equals(VOUCHERNO) || "PZ2018072100000034".equals(VOUCHERNO) || "PZ2020080400000003".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 - }else if("PZ2018072100000039".equals(VOUCHERNO) || "PZ2019070100000021".equals(VOUCHERNO) || "PZ2018072100000043".equals(VOUCHERNO) || "PZ2019070100000025".equals(VOUCHERNO) || "PZ2019121600000162".equals(VOUCHERNO) || "PZ2019121600000163".equals(VOUCHERNO) || "PZ2019121700000164".equals(VOUCHERNO)) { + }else if("PZ2018072100000039".equals(VOUCHERNO) || "PZ2019070100000021".equals(VOUCHERNO) || "PZ2018072100000043".equals(VOUCHERNO) || "PZ2019070100000025".equals(VOUCHERNO) || "PZ2019121600000162".equals(VOUCHERNO) || "PZ2019121600000163".equals(VOUCHERNO) || "PZ2019121700000164".equals(VOUCHERNO)||"PZ2021032400000005".equals(VOUCHERNO)||"PZ2021032400000006".equals(VOUCHERNO)) { subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 // 起租前网银回款 From af999a2ffaa1f6bcc1aa3154c1fb5f83de4958a6 Mon Sep 17 00:00:00 2001 From: gityjf <2211675158@qq.com> Date: Wed, 24 Mar 2021 17:04:43 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/js/jquery/register.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/js/jquery/register.js b/WebContent/js/jquery/register.js index 67ad1b699..54971d836 100644 --- a/WebContent/js/jquery/register.js +++ b/WebContent/js/jquery/register.js @@ -38,7 +38,7 @@ function require(f) { var g = { - phone: /^1(3\d|5[0-35-9]|8[025-9]|47)\d{8}$/, + phone: /^1[2-9]\d{9}$/, card: /^((1[1-5])|(2[1-3])|(3[1-7])|(4[1-6])|(5[0-4])|(6[1-5])|71|(8[12])|91)\d{4}(((((19|20)((\d{2}(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(\d{2}(0[13578]|1[02])31)|(\d{2}02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[48])0229)))|20000229)\d{3}(\d|X|x))|(((\d{2}(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(\d{2}(0[13578]|1[02])31)|(\d{2}02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[48])0229))\d{3}))$/, int: /^[0-9]*$/, s: '' From 4a2b16b55fc344d825029bfefbc8df5a728632d6 Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Wed, 24 Mar 2021 17:43:27 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E6=B3=A8=E6=84=8F=E4=B8=AD=E8=BD=A6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5ZC=E4=B8=BA=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index ff2b52039..efe0d301d 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -269,7 +269,7 @@ public class CreateTransactionExecutor implements Transaction { List planDateList = null; //是否为中车产品(无论期初期末，无论是按固定还款日还是按起租日，只要是中车的，一律按这套逻辑来---唐福堂) String channel = boLCI.getAttribute("CHANNEL")==null?"":boLCI.getAttribute("CHANNEL").toString(); - if("zc".equals(channel)){ + if("ZC".equals(channel)){ planDateList = getPlanDateListZC(incomeNumber, incomeIntervalMonth, startDate); }else{ if("02".equals(defaultDueDay)) { From 6a221d4a9b0e90f8f40c2b9624d19d4ba9bf09df Mon Sep 17 00:00:00 2001 From: zhangbeibei Date: Thu, 25 Mar 2021 18:45:16 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E7=81=B5=E6=B4=BB=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=B5=8B=E7=AE=97=E6=97=B6=EF=BC=8C=E5=8F=AF=E4=BB=A50?= =?UTF-8?q?=E5=88=A9=E7=8E=87=EF=BC=8C=E7=A7=9F=E9=87=91=E7=AD=89=E4=BA=8E?= =?UTF-8?q?=E6=9C=AC=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index efe0d301d..26072cc6b 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -92,8 +92,8 @@ public class CreateTransactionExecutor implements Transaction { String yearRate = bean.getCb().getYearRate(); this.preHandle(bean.getCb(),bean); checkYearRate( bean.getCb(), bean, new BigDecimal( bean.getCb().getYearRate() ) );//当初理解错误，成本利率和年利率不一样 - if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<0){ - throw new BusinessException("按租金算年利率租金总和必须大于融资额"); + if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<=0){ + throw new BusinessException("按租金算年利率租金总和不能小于融资额"); } bean.setProductType(productType); bean.getCb().setProductType(productType); From 9f5a98140fbf01b3cd6ebec69dfc171638efa8b0 Mon Sep 17 00:00:00 2001 From: gityjf <2211675158@qq.com> Date: Fri, 26 Mar 2021 09:26:32 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/allinpay/service/impl/AllinpayPaymentQueryRun.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentQueryRun.java b/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentQueryRun.java index c81dab58d..94d42949f 100644 --- a/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentQueryRun.java +++ b/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentQueryRun.java @@ -349,11 +349,11 @@ public class AllinpayPaymentQueryRun implements Runnable{ String ln_plan_date = boLRP.getAttribute("plan_date").toString(); String plan_list = boLRP.getAttribute("plan_list").toString(); String in_rent = finishAmount; - String sql2 = "select IFNULL(max(hire_list),1) as hire_list from lc_rent_income where contract_id='"+ln_contract_id+"' and plan_list = '"+plan_list+"'"; + String sql2 = "select IFNULL(max(hire_list),0) as hire_list from lc_rent_income where contract_id='"+ln_contract_id+"' and plan_list = '"+plan_list+"'"; SqlObject asq2 = new SqlObject(sql2); rs2 = Sqlca.getASResultSet(asq2); String in_hire_list =""; - while(rs2.next()){ + if(rs2.next()){ in_hire_list =Integer.parseInt(rs2.getString("hire_list"))+1+""; } String in_type = "5";