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

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

Browse Source
This commit is contained in:
zhouyahui 2018-12-04 19:13:19 +08:00
commit ff8b9674d3
36 changed files with 287 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Tenwa/Comm/DocList/showImage.jsp
View File

@ -97,7 +97,7 @@ $(function() {
});
var res = viewer.show();
if(res.element){
setTimeout("clickImage()",350);
setTimeout("clickImage()",600);
}
});

2
WebContent/Tenwa/Customer/Lessee/Comm/Telephone/CustomerTelInfo.jsp
View File

@ -59,7 +59,7 @@ if(typeof(telephone) != undefined && telephone!= "" ){
alert("µç»°ºÅÂë¸ñʽ´íÎó");
return false;
}
var myreg=/^[1][3,4,5,7,8][0-9]{9}$/;
var myreg=/^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if (!myreg.test(telephone)) {
alert("µç»°ºÅÂë¸ñʽ´íÎó");
return false;

8
WebContent/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp
View File

@ -48,7 +48,7 @@
//sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
function saveCompany(inputName,inputTel){
function saveCompany(inputName,inputTel,projectNo){
if(!changetel()){
return;
}
@ -58,10 +58,10 @@
if(!changecompany_tel()){
return;
}
as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"')");
as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"','"+projectNo+"')");
}
function saveCertInfo(inputName,inputTel,leasfrom,projectSource){
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCompanyInfo",'inputName='+inputName+',inputTel='+inputTel+',flowunid=<%=flowUnid%>');
function saveCertInfo(inputName,inputTel,leasfrom,projectSource,projectNo){
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCompanyInfo",'projectNo='+projectNo+',inputName='+inputName+',inputTel='+inputTel+',flowunid=<%=flowUnid%>');
if(sResult == "SUCCESS"){
parent.reloadSelf();
}

18
WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp
View File

@ -6,24 +6,36 @@
History Log:
*/
String contract_number = CurPage.getParameter("FlowKey");
String ContractId = CurPage.getParameter("ContractId");
String customerName = Sqlca.getString("SELECT customer_name FROM lb_union_lessee WHERE contract_id='"+ContractId+"'");
String sPrevUrl = CurPage.getParameter("PrevUrl");
if(sPrevUrl == null) sPrevUrl = "";
String sTempletNo = "LBRegisterContractInfoD";//--Ä£°åºÅ--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
//doTemp.setColTips("", "²âÊÔ");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
dwTemp.ReadOnly = "1";//只读模式
dwTemp.genHTMLObjectWindow(contract_number);
String sButtons[][] = {
{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
//{"true","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"%>
<script type="text/javascript">
window.onload=function(){
var contractNumber = getItemValue(0,0,"CONTRACT_NUMBER");
if(contractNumber==""){
setItemValue(0,0,"CONTRACT_NUMBER","<%=contract_number%>");
setItemValue(0,0,"CUSTOMER_NAME","<%=customerName%>");
}
}
function returnList(){
AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
}

2
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/DistributorInfoFirstTrialInfo.jsp
View File

@ -107,7 +107,7 @@
if(LINKMAN_TEL==""){
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(LINKMAN_TEL)){
setErrorTips("LINKMAN_TEL","");
return true;

2
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/DistributorInfoIBatchmportInfo.jsp
View File

@ -107,7 +107,7 @@
if(LINKMAN_TEL==""){
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(LINKMAN_TEL)){
setErrorTips("LINKMAN_TEL","");
return true;

2
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/DistributorInfoIReCheckInfo.jsp
View File

@ -107,7 +107,7 @@
if(LINKMAN_TEL==""){
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(LINKMAN_TEL)){
setErrorTips("LINKMAN_TEL","");
return true;

7
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
View File

@ -93,7 +93,7 @@
if(LINKMAN_TEL==""){
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(LINKMAN_TEL)){
setErrorTips("LINKMAN_TEL","");
return true;
@ -105,7 +105,7 @@
}
/* function checkphone(){
var DISTRIBUTOR_TEL = getItemValue(0,getRow(0),"DISTRIBUTOR_TEL");
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(DISTRIBUTOR_TEL)){
setErrorTips("DISTRIBUTOR_TEL","");
return true;
@ -117,7 +117,7 @@
} */
/* function telnumber(){
var DEALER_PHONE = getItemValue(0,getRow(0),"DEALER_PHONE");
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(DEALER_PHONE)){
setErrorTips("DEALER_PHONE","");
return true;
@ -199,6 +199,7 @@
}
sReturn = sReturn.split("@");//"@"表示了向页面添加数据时的连续性
setItemValue(0,getRow(),"SUBSIDIARY_COMPANY",sReturn[0]);//向页面的框中添加数据
setItemValue(0,getRow(),"LIMIT_APPROVAL_DATE",sReturn[1]);
},"请选择经销商");
}
var province="";//定义一个全局变量

5
WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
View File

@ -272,6 +272,11 @@
alert("请勾选合同模板！");
return;
}
var contractNomessage = RunJavaMethodTrans("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","CheckContractNo","contractId="+"<%=sContractId%>"+",contractNo="+"<%=CurPage.getParameter("ContractNo")%>");
if("error"==contractNomessage){
alert("合同编号重复，请联系后台人员处理！");
return;
}
var message = RunJavaMethodTrans("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","CheckCar","contractId="+"<%=sContractId%>"+",templateIds="+tempids+",flowunid="+"<%=flowunid%>");
if(""!=message){
if("01"=="<%=customertype%>"){

2
WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
View File

@ -110,7 +110,7 @@
// alert("预留手机号不能为空!");
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(mobile)){
setErrorTips("MOBILE","");
return true;

2
WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
View File

@ -121,7 +121,7 @@
// alert("手机号不能为空!");
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(mobile)){
var customerType = "03";
var id = getItemValue(0,getRow(),"id");

38
WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfo.jsp
View File

@ -8,10 +8,27 @@
String ishistory = CurPage.getParameter("IsHistory");
String flowunid = CurPage.getParameter("FlowUnid");
String phaseNo = CurPage.getParameter("PhaseNo");
String productId = CurPage.getParameter("ProductId");
String contractId = CurPage.getParameter("ContractId");
ASObjectModel doTemp = new ASObjectModel("LCFundPaymentTempInfo");
/* if(null!=ishistory&&ishistory.equals("true")){
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");
} */
String operationType = "";
String distributorId = "";
BizObject bo=JBOFactory.createBizObjectQuery("jbo.prd.PRD_SPECIFIC_LIBRARY","PRODUCTID=:productId").setParameter("productId", productId).getSingleResult(false);
BizObject bo1=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO","ID=:contractId").setParameter("contractId", contractId).getSingleResult(false);
if(bo!=null||(!"".equals(bo))){
operationType = bo.getAttribute("operationType").toString();
}
if(bo1!=null||(!"".equals(bo1))){
distributorId = bo1.getAttribute("DISTRIBUTOR_ID").toString();
}
if("BAIC_MOTOR".equals(operationType)&&"0010".equals(phaseNo)){
doTemp.setReadOnly("CLIENT_ACCOUNT",false);
doTemp.setColInnerBtEvent("CLIENT_ACCOUNT", "selectAccount()");
}
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ
@ -49,6 +66,27 @@ function lendingType(){
}
}
//选择子经销商查询
function selectAccount(){
var sdistributorId="<%=distributorId%>";
AsDialog.OpenSelector("SelectDistributorAccount", "distributorid,"+sdistributorId, "dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"){
return;
}
sReturn = sReturn.split("@");
// distributor_id@distributor_name@ACCOUNT@OPEN_BANK@ACC_NUMBER
var distributor_id = sReturn[0];
var distributor_name = sReturn[1];
var account = sReturn[2];
var openBank = sReturn[3];
var accNumber = sReturn[4];
setItemValue(0, 0, "DISTRIBUTOR_ID", distributor_id);
setItemValue(0, 0, "FACT_OBJECT",distributor_name);
setItemValue(0, 0, "CLIENT_ACCOUNT",account);
setItemValue(0, 0, "CLIENT_BANK",openBank);
setItemValue(0, 0, "CLIENT_ACCNUMBER",accNumber);
}, "选择经销商账户",'');
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

21
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
View File

@ -11,6 +11,7 @@
String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号
String FlowNo=CurPage.getParameter("FlowNo");//流程名称
String sPrevUrl = CurPage.getParameter("PrevUrl");
String operationType = CurPage.getParameter("operationType");//获取产品类型
if(sPrevUrl == null) sPrevUrl = "";
String compClientID = CurPage.getParameter("CompClientID");
String rightType = CurPage.getParameter("RightType");
@ -30,6 +31,12 @@
doTemp.setReadOnly("INPUTNAME", true);
doTemp.setReadOnly("INPUTTEL", true);
}
//如果是北汽的产品，业务申请号可编辑
if(!"ReadOnly".equals(rightType)&&sPhaseNo.equals("0010")&&"BAIC_MOTOR".equals(operationType)){
doTemp.setReadOnly("PROJECT_NO", false);
}else{
doTemp.setReadOnly("PROJECT_NO", true);
}
String userll=null;
userll="/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp?CompClientID=";
if("01".equals(custype)||"01".equals(customertype)){
@ -67,13 +74,23 @@
var inputName = getItemValue(0,getRow(),"inputName");
var inputTel = getItemValue(0,getRow(),"inputTel");
var customerType = "<%=custype%>";
var projectNo=getItemValue(0,getRow(),"PROJECT_NO");
if(projectNo.length<=0){
alert("请填写业务申请编号！！！");
return;
}
var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkProjectNo","projectNo="+projectNo+",id="+getItemValue(0,getRow(),"ID"));
if("error"==sReturnInfo){
alert("业务申请编号已被占用，请重新填写！！！");
return;
}
if(customerType=="01"){//法人
//as_save("myiframe0","frame_list.window.saveCompany();");
frame_list.window.saveCompany(inputName,inputTel);
frame_list.window.saveCompany(inputName,inputTel,projectNo);
//as_save(0);
}
if(customerType=="03"){//自然人
frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel);
frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo);
//as_save("myiframe0","frame_list.window.as_save(0);");
}
}

2
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
View File

@ -108,7 +108,7 @@
//alert("手机号不能为空!");
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(tel)){
setErrorTips("tel","");
return true;

14
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
View File

@ -390,7 +390,7 @@
// alert("手机号不能为空!");
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(mobile)){
setErrorTips("mobile","");
return true;
@ -408,7 +408,7 @@
} */
}
function saveRecord(leasfrom,projectSource,inputName,inputTel){//±£´æ
function saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo){//±£´æ
//校验申请人手机号和配偶手机号是否重复
var RepeatReault = "";
var customerType = "03";
@ -528,14 +528,14 @@
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+"')");
as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"','"+leasfrom+"','"+projectSource+"','"+projectNo+"')");
return true;
};
}
function saveCertInfo(inputName,inputTel,leasfrom,projectSource){
function saveCertInfo(inputName,inputTel,leasfrom,projectSource,projectNo){
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCertInfo",'inputName='+inputName+',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()%>');
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCertInfo",'projectNo='+projectNo+',inputName='+inputName+',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()%>');
if(sResult == "SUCCESS"){
parent.reloadSelf();
}
@ -782,7 +782,7 @@
// setErrorTips("EMERGENCY_CONTACT_TEL","电话不能为空!");
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(mobile)){
setErrorTips("EMERGENCY_CONTACT_TEL","");
return true;
@ -798,7 +798,7 @@
// setErrorTips("REMARK","电话不能为空!");
return true;
}
var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
var phone = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
if(phone.test(mobile)){
setErrorTips("REMARK","");
return true;

17
WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/FundIncomeReport.jsp
View File

@ -6,16 +6,25 @@
History Log:
*/
String userid=CurUser.getUserID();
//String username=CurUser.getUserName();
String username = CurUser.getUserName();
BizObject useRole = JBOFactory.createBizObjectQuery("jbo.sys.USER_ROLE", "userid=:userid")
.setParameter("userid", userid).getSingleResult(false);
String roleid = useRole.getAttribute("roleid").toString();
ASObjectModel doTemp = new ASObjectModel("FundIncomeReport");
//099 超级管理员
//299 平台管理员
//399 系统管理员
//800R00000020 资管负责人
if(!("099".equals(roleid) || "299".equals(roleid) || "399".equals(roleid) || "800R00000020".equals(roleid))){
doTemp.appendJboWhere(" and ui.userid='"+userid+"'");
}
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
//doTemp.appendJboWhere(" and ui.USERID='"+userid+"'");
//doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'");
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.ShowSummary="1"; //汇总
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow(userid);
dwTemp.genHTMLObjectWindow("");
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {

9
WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
View File

@ -11,15 +11,18 @@
String userid=CurUser.getUserID();
String username=CurUser.getUserName();
ASObjectModel doTemp = new ASObjectModel("RentCollectionList");
doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'");
if(!"administrator".equals(userid)){
//doTemp.appendJboWhere(" and ui.USERNAME='"+username+"'");
doTemp.appendJboWhere(" and ui.userid='"+userid+"'");
}
//String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
//doTemp.appendJboWhere(sCondtion);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow(userid);
dwTemp.genHTMLObjectWindow("");
//userid
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {
};

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

@ -1495,6 +1495,8 @@
<attribute name="CMB_PAY_LOG" label="支付日志" type="STRING" length="32"/>
<attribute name="EBANK_STATUS" label="回盘状态" type="STRING" length="32"/>
<attribute name="FUND_FEETYPE" label="抵扣资金项" type="STRING" length="100"/>
<attribute name="DISTRIBUTOR_ID" label="经销商ID" type="STRING" length="32"/>
<attribute name="DEDUCTION_ID" label="保证金抵扣编号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -1560,6 +1562,8 @@
<attribute name="CMB_PAY_LOG" label="支付日志" type="STRING" length="32"/>
<attribute name="EBANK_STATUS" label="回盘状态" type="STRING" length="32"/>
<attribute name="FUND_FEETYPE" label="抵扣资金项" type="STRING" length="100"/>
<attribute name="DISTRIBUTOR_ID" label="经销商ID" type="STRING" length="32"/>
<attribute name="DEDUCTION_ID" label="保证金抵扣编号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -3086,7 +3090,8 @@
<attribute name="INTEREST_DAY_TYPE" label="计息日计算方式" type="STRING" length="32"/>
<attribute name="PURCHASE_TAX" label="购置税" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_FINA" label="购置税是否参与融资" type="STRING" length="32"/>
<attribute name="INSURANCE_PREMIUM" label="保险费" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM" label="保险费" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="INSURANCE_PREMIUM_FINA" label="保险费是否参与融资" type="STRING" length="32"/>
<attribute name="INCIDENTAL" label="杂费" type="DOUBLE" length="22" scale="2"/>
<attribute name="INCIDENTAL_FINA" label="杂费是否参与融资" type="STRING" length="32"/>

20
WebContent/WEB-INF/etc/jbo/jbo_customer.xml
View File

@ -943,9 +943,9 @@
<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
<attribute name="DEALER_LEGAL_NAME" label="经销商法定名称" type="STRING" length="32"/>
<attribute name="DEALER_PHONE" label="公司联系电话" type="STRING" length="32"/>
@ -1130,9 +1130,9 @@
<attribute name="SUBMIT_TYPE" label="提交状态" type="STRING" length="32"/>
<attribute name="APPLY_NUMBER" label="申请编号唯一" type="STRING" length="32"/>
<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
<attribute name="district" label="地区" type="STRING" length="64"/>
<attribute name="provinceInfo" label="省份" type="STRING" length="64"/>
<attribute name="open_bank" label="开户银行" type="STRING" length="100"/>
@ -1242,9 +1242,9 @@
<attribute name="DISTRIBUTOR_FORM_ID" label="经销商正式表id" type="STRING" length="32"/>
<attribute name="DISTRIBUTOR_CHANGE_ID" label="经销商变更表id" type="STRING" length="32"/>
<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
<attribute name="DEALER_LEGAL_NAME" label="经销商法定名称" type="STRING" length="32"/>
<attribute name="DEALER_PHONE" label="公司联系电话" type="STRING" length="32"/>
@ -1437,9 +1437,9 @@
<attribute name="DISTRIBUTOR_FORM_ID" label="经销商正式表id" type="STRING" length="32"/>
<attribute name="DISTRIBUTOR_CHANGE_ID" label="经销商变更表的id" type="STRING" length="32"/>
<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
</attributes>
<manager>
<managerProperties>
@ -1541,9 +1541,9 @@
<attribute name="DISTRIBUTOR_FORM_ID" label="经销商正式表id" type="STRING" length="32"/>
<attribute name="DISTRIBUTOR_CHANGE_ID" label="经销商变更表的id" type="STRING" length="32"/>
<attribute name="CREDIT_LIMIT" label="授信额度" type="DOUBLE" length="18" scale="2"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="32"/>
<attribute name="LIMIT_APPROVAL_DATE" label="授信日期" type="STRING" length="100"/>
<attribute name="LIMIT_EFFECTIVE_DATE" label="授信有效期" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="32"/>
<attribute name="LIMIT_END_DATE" label="授信到期日" type="STRING" length="100"/>
</attributes>
<manager>
<managerProperties>

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

@ -4778,6 +4778,7 @@
<attribute name="CONTRACT_NO" label="合同编号" type="STRING"/>
<attribute name="CONTRACT_NUMBER" label="合同号" type="STRING"/>
<attribute name="CUSTOMER_NAME" label="承租人" type="STRING"/>
<attribute name="FRAME_NUMBER" label="车架号" type="STRING"/>
<attribute name="mobile" label="手机号" type="STRING"/>
<attribute name="name" label="共同承租人" type="STRING"/>
<attribute name="VNDR_NAME" label="经销商/SP" type="STRING"/>
@ -4790,6 +4791,7 @@
<attribute name="FLOWNO" label="当前流程号" type="STRING"/>
<attribute name="FLOWNAME" label="当前流程名称" type="STRING"/>
<attribute name="PHASENO" label="当前阶段号" type="STRING"/>
<attribute name="inputTime" label="放款申请时间" type="STRING"/>
</attributes>
<manager>
<managerProperties>

BIN
WebContent/fileTemplate/合同（售后回租）和抵押合同-修订版.docx
View File

Binary file not shown.

24
src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
View File

@ -8,6 +8,8 @@ import java.util.Map;
import jbo.app.tenwa.doc.LB_DOCRELATIVE;
import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
import jbo.com.tenwa.entity.comm.officetempalte.BF_TEMPLATE;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_TEMPLATE;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP;
@ -37,6 +39,7 @@ public class FileTemplateUtil {
public String flowunid;//用于查询已经生成的合同
public String leasform;//用判断租赁方式
public String contractId;
public String contractNo;
public String isNetCar;//用于判断是否是网约车
public String getTemplateCalss() {return templateCalss;}
public void setTemplateCalss(String templateCalss) {this.templateCalss = templateCalss;}
@ -83,6 +86,12 @@ public class FileTemplateUtil {
public void setIsNetCar(String isNetCar) {
this.isNetCar = isNetCar;
}
public String getContractNo() {
return contractNo;
}
public void setContractNo(String contractNo) {
this.contractNo = contractNo;
}
public String getTemplateClass(Transaction Sqlca) throws Exception{
String fileClass=templateCalss.replaceAll("@", ",");
@ -229,6 +238,21 @@ public class FileTemplateUtil {
return docName;
}
public String CheckContractNo(JBOTransaction tx) throws Exception{
BizObjectManager lciManager = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME);
BizObjectManager lciTManager = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO_TEMP.CLASS_NAME);
BizObject lci = lciManager.createQuery("contract_no=:contractNo").setParameter("contractNo", contractNo).getSingleResult(false);
BizObject lcit = lciTManager.createQuery("contract_no=:contractNo").setParameter("contractNo", contractNo).getSingleResult(false);
if(lci==null){
if(lcit!=null&&lcit.getAttribute("id").getString().equals(contractId)){
return "success";
}else{
return "error";
}
}else{
return "error";
}
}
}

12
src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java
View File

@ -604,10 +604,16 @@ public class CreditBodyGuardAction {
msg = "规则描述:"+detailList.get(0).get("description").toString()+"。"
+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。"
+"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。";
}else{
}else if(null==riskItemList.get(i).get("risk_name")&&!"".equals(riskItemList.get(i).get("risk_name").toString())&&riskItemList.get(i).get("risk_name").toString().length()>0){
@SuppressWarnings("rawtypes")
List<HashMap> detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class);
msg = "规则描述:"+detailList.get(0).get("description").toString()+"。"
+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。"
+"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。";
}else{
//continue;
msg ="";
}
msg ="";
}
detailObject.setAttributeValue("risk_detail",msg);
bom2.saveObject(detailObject);
}

5
src_core/com/tenwa/util/SerialNumberUtil.java
View File

@ -330,6 +330,7 @@ public class SerialNumberUtil {
* **/
protected static synchronized String getSerialNumberByDay(String serialNumberPattern,int numberCount,Map<String,String> model,String type,Integer queryYear,Integer queryMonth,Integer queryDay,JBOTransaction tx) throws Exception
{
JBOTransaction newTx=JBOFactory.createJBOTransaction();
String currentDateTime = DateAssistant.getTodayNow();
String currentYear = currentDateTime.substring(0,4);
String monthStr = currentDateTime.substring(5,7);
@ -358,7 +359,7 @@ public class SerialNumberUtil {
paramMap.put("minute", minute+"");
paramMap.put("second", second+"");
int maxOrderNumber = getMaxOrderNumberByDay(type, year,month,day, tx);
int maxOrderNumber = getMaxOrderNumberByDay(type, year,month,day, newTx);
StringBuffer numberFormat = new StringBuffer();
for(int i=0;i<numberCount;i++)
{
@ -373,7 +374,7 @@ public class SerialNumberUtil {
}
String serialNumberString = getSerialNumber(paramMap, serialNumberPattern);
newTx.commit();
return serialNumberString;
}
//考虑并发情况必须采用同步机制

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java
View File

@ -46,7 +46,7 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness {
map.put("FEE_TYPE", FeeType);
//sql= "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2)AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%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.CERTID 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 WHERE LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID AND DATE_FORMAT(LFIT.FACT_DATE,'%Y/%m')=DATE_FORMAT(SYSDATE(),'%Y/%m')";
sql = "SELECT IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'±¾½ð',LCI.INPUTTIME),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'±¾½ð',LCI.INPUTTIME),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%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 LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID ";
sql = "SELECT 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(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%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 LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID ";
// 区分一次性收入和按月分摊--0010=一次性/0020=按月分摊
if("PZ2018071100000014".equals(VOUCHERNO)||"PZ2018080400000079".equals(VOUCHERNO)||"PZ2018072100000035".equals(VOUCHERNO)||"PZ2018080400000111".equals(VOUCHERNO)) {
sql+=" AND LCCT.HANDLING_CHARGE_MONEY_TYPE='0010'";

7
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java
View File

@ -49,6 +49,7 @@ public class CreateVoucherLoanDistributor {
String CUSTOMERTYPE=null;
String BUSINESSTYPE=null;
String ACC_NUMBER=null;
String REQNBR=null;
String TAX_TYPE=null;
String sql="";
String moneyDataSource="";
@ -77,9 +78,9 @@ public class CreateVoucherLoanDistributor {
}
if("PZ2018070900000002".equals(VOUCHERNO)||"PZ2018072400000060".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO)||"PZ2018080300000069".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)||"PZ2018080300000071".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.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(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 FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_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.FLOWUNID = :FLOWUNID ";
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.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(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,LFIT.REQNBR FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR 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 (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_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.FLOWUNID = :FLOWUNID ";
}else {
sql="SELECT 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 FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_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.FLOWUNID = :FLOWUNID ";
sql="SELECT 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 FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_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.FLOWUNID = :FLOWUNID ";
}
// 手续费收入（一次性确认收入）
@ -121,6 +122,7 @@ public class CreateVoucherLoanDistributor {
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);
@ -146,6 +148,7 @@ public class CreateVoucherLoanDistributor {
param.put("CUSTOMERTYPE",CUSTOMERTYPE);
param.put("BUSINESSTYPE",BUSINESSTYPE);
param.put("ACC_NUMBER",ACC_NUMBER);
param.put("REQNBR",REQNBR);
param.put("VOUCHERNO",VOUCHERNO);
// 通过客户名称获取客户编码维护里面的数据, 如果有数据说明是集团内, 如果没有数据说明是集团外

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
View File

@ -15,7 +15,7 @@ public class ContractOnhireVoucher extends BaseBussiness {
CreateVoucherLoanDistributor cvld=new CreateVoucherLoanDistributor();
cvld.CreateVoucher(FlowUnid, "PZ2018073100000061",Sqlca);// 횅훰GPS澗흙 --쀼理
//cvld.CreateVoucher(FlowUnid, "PZ2018080300000068",Sqlca);// 횅훰GPS澗흙 --殮理
cvld.CreateVoucher(FlowUnid, "PZ2018070900000003",Sqlca);// 澗혤看마운-쀼理
//cvld.CreateVoucher(FlowUnid, "PZ2018080200000065",Sqlca);// 澗혤看마운-殮理

8
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
View File

@ -16,7 +16,10 @@ public class IncomeVoucher extends BaseBussiness {
CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome();
cvci.CreateVoucher(FlowUnid, "PZ2018072100000026", "feetype30");//收到的违约金/罚款 --回租
cvci.CreateVoucher(FlowUnid, "PZ2018080400000083", "feetype30");//收到的违约金/罚款--直租
// cvci.CreateVoucher(FlowUnid, "PZ2018080400000083", "feetype30");//收到的违约金/罚款--直租
cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//回款-收到名义货价--回租
//cvci.CreateVoucher(FlowUnid, "PZ2018080400000087", "feetype4");//回款-收到名义货价--直租
//cvci.CreateVoucher(FlowUnid, "PZ2018071100000012", "feetype2");//收到客户保证金 --回租
//cvci.CreateVoucher(FlowUnid, "PZ2018080400000078", "feetype2");//收到客户保证金 --直租
@ -27,9 +30,6 @@ public class IncomeVoucher extends BaseBussiness {
//cvci.CreateVoucher(FlowUnid, "PZ2018071100000014", "feetype1");//确认收到手续费（一次性确认收入）--直租
//cvci.CreateVoucher(FlowUnid, "PZ2018080400000079", "feetype1");//确认收到手续费（一次性确认收入）--直租
//cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//回款-收到名义货价--回租
//cvci.CreateVoucher(FlowUnid, "PZ2018080400000087", "feetype4");//回款-收到名义货价--直租
//cvci.CreateVoucher(FlowUnid, "PZ2018072100000028", "feetype27");//收到的贴息--回租
//cvci.CreateVoucher(FlowUnid, "PZ2018080400000085", "feetype27");//收到的贴息--直租

27
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java
View File

@ -123,33 +123,10 @@ public class CreateVoucherMonthSettlement{
param.put("CUSTNAME",CUSTNAME);
param.put("CUSTOMERTYPE",CUSTOMERTYPE);
param.put("BUSINESSTYPE",BUSINESSTYPE);
param.put("VOUCHERNO",voucherNo);
param.put("F58",F58);
if("1".equals(BUSINESSTYPE)){
param.put("LEASFORMASSET", "04"); // 融资租赁资产
param.put("DEPT", "02"); // 部门
if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务
param.put("LEASINCOMEFORM", "02"); // C端
}else if("01".equals(CUSTOMERTYPE)){
param.put("LEASINCOMEFORM", "01"); // B端
}
}else if("2".equals(BUSINESSTYPE)){
param.put("LEASFORMASSET", "02/03/05/06"); // 融资租赁资产
param.put("DEPT", "01"); // 部门
param.put("LEASINCOMEFORM", "06"); // C端
}else if("3".equals(BUSINESSTYPE)){
param.put("LEASFORMASSET", "04"); // 融资租赁资产
param.put("DEPT", "01"); // 部门
if("PZ2018100900000278".equals(voucherNo) || "PZ2018100900000279".equals(voucherNo)) {
param.put("LEASINCOMEFORM", "04");
}else {
param.put("LEASINCOMEFORM", "05");
}
}
param.put("FUNDTYPE", "02"); // 主营类型
param.put("BUSINESSTYPE", "06");
param.put("BUSINESSTYPE", "0604"); // Ö÷ÓªÀàÐÍ
map.clear();
map.put("PROJ_TYPE", leas_form);

64
src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java
View File

@ -16,11 +16,11 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
public class InsertVoucherRentIncome {
private String sys_date;
private String[] voucher_nos={"PZ2018072100000024","PZ2018080400000081",
"PZ2018072100000025","PZ2018080400000082","PZ2018072100000028","PZ2018080400000085",
"PZ2018082100000142","PZ2018082100000143","PZ2018082100000144","PZ2018082100000145",
"PZ2018092500000203","PZ2018100900000296","PZ2018092500000204","PZ2018100900000297",
"PZ2018092500000171","PZ2018100900000298","PZ2018092500000172","PZ2018100900000299"};
private String[] voucher_nos={"PZ2018072100000024","PZ2018080400000081","PZ2018082100000142","PZ2018082100000143",
"PZ2018072100000025","PZ2018080400000082","PZ2018072100000028","PZ2018080400000085",
"PZ2018082100000144","PZ2018082100000145",
"PZ2018092500000203","PZ2018100900000296","PZ2018092500000204","PZ2018100900000297",
"PZ2018092500000171","PZ2018100900000298","PZ2018092500000172","PZ2018100900000299"};
public String getSys_date() {
return sys_date;
@ -47,10 +47,35 @@ public class InsertVoucherRentIncome {
map.put("VOUCHER_NO", VOUCHERNO);
BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
if(vouch!=null){
//收到的租金--网银
if("PZ2018072100000024".equals(VOUCHERNO)||"PZ2018080400000081".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(),'-','') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION='1' THEN lvri.rent ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION='2' THEN lvri.rent ELSE 0.00 END,'IT管理员',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction='1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction='1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction='2' THEN '02' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018072100000024','PZ2018080400000081')) lv ON lv.proj_type=lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' and f58 is not null) and lvri.rent>0 and lvri.EBANK_NUMBER is not null and lvri.EBANK_NUMBER<>'' ORDER BY lvri.voucher_f3 ";
//收到的租金--网银-未逾期及逾期未过月的--(汽车)
if("PZ2018072100000024".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f2,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest/getTax(lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest-ROUND(lvri.interest/getTax(lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.sort_number = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END,'','已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018072100000024')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
}
//收到的租金--网银-逾期过月--(汽车)
if("PZ2018080400000081".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f2,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67 ) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.sort_number = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,'','','已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018080400000081')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
}
//收到的租金--卡扣-未逾期及逾期未过月的(汽车)
if("PZ2018082100000142".equals(VOUCHERNO)){
// sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(),'-','') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION='1' THEN lvri.rent ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION='2' THEN lvri.rent ELSE 0.00 END,'IT管理员',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,lvri.cust_name AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,lvri.cust_id,CASE WHEN lv.loan_direction='2' THEN '02' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018082100000142','PZ2018082100000143')) lv ON lv.proj_type=lci.LEAS_FORM WHERE lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' and f58 is not null) and lvri.rent>0 and (lvri.EBANK_NUMBER is null or lvri.EBANK_NUMBER='') ORDER BY lvri.voucher_f3 ";
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f2,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,CASE WHEN lv.sort_number='1' THEN (SELECT lsc.subjects_code FROM own_account oa LEFT JOIN lv_stacts_config lsc ON lsc.id=oa.acc_title WHERE oa.FbSdk='Y') ELSE lv.SUBJECTS_CODE END AS f2,lvri.voucher_f3,'收到的租金',CASE WHEN lv.sort_number='1' THEN (SELECT acc_title FROM own_account WHERE FbSdk='Y') ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax(lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax(lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,lvri.cust_name AS cust_name,CASE WHEN lv.sort_number='1' THEN (SELECT acc_title FROM own_account WHERE FbSdk='Y') ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,lvri.cust_id,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END,CASE WHEN lv.sort_number='1' THEN (SELECT acc_number FROM own_account WHERE FbSdk='Y') ELSE '' END ,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000143')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND (lvri.EBANK_NUMBER IS NULL OR lvri.EBANK_NUMBER='') ORDER BY lvri.voucher_f3 ";
}
//收到的租金--卡扣-逾期过月的(汽车)
if("PZ2018082100000143".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,F2,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,CASE WHEN lv.sort_number='1' THEN (SELECT lsc.subjects_code FROM own_account oa LEFT JOIN lv_stacts_config lsc ON lsc.id=oa.acc_title WHERE oa.FbSdk='Y') ELSE lv.SUBJECTS_CODE END AS f2,lvri.voucher_f3,'收到的租金',CASE WHEN lv.sort_number='1' THEN (SELECT acc_title FROM own_account WHERE FbSdk='Y') ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,lvri.cust_name AS cust_name,CASE WHEN lv.sort_number='1' THEN (SELECT acc_title FROM own_account WHERE FbSdk='Y') ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,lvri.cust_id,'',CASE WHEN lv.sort_number='1' THEN lvri.OWN_NUMBER ELSE '' END ,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000143')) lv ON lv.proj_type =lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND (lvri.EBANK_NUMBER IS NULL OR lvri.EBANK_NUMBER='') ORDER BY lvri.voucher_f3 ";
}
//收到的逾期利息--网银
if("PZ2018072100000025".equals(VOUCHERNO)){
// sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '0603' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018072100000025','PZ2018080400000082'))lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f2,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lv.subjects_code AS f2,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '0603' ELSE '' END,'','已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018072100000025')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty>0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
}
//收到的逾期利息--卡扣
if("PZ2018082100000144".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f2,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,CASE WHEN lv.sort_number='1' THEN (SELECT lsc.subjects_code FROM own_account oa LEFT JOIN lv_stacts_config lsc ON lsc.id=oa.acc_title WHERE oa.FbSdk='Y') ELSE lv.SUBJECTS_CODE END AS f2,lvri.voucher_f3,'收到的逾期利息',CASE WHEN lv.sort_number='1' THEN (SELECT acc_title FROM own_account WHERE FbSdk='Y') ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,lvri.cust_name AS cust_name,CASE WHEN lv.sort_number='1' THEN (SELECT acc_title FROM own_account WHERE FbSdk='Y') ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,lvri.cust_id,CASE WHEN lv.loan_direction = '2' THEN '0603' ELSE '' END,CASE WHEN lv.sort_number='1' THEN (SELECT acc_number FROM own_account WHERE FbSdk='Y') ELSE '' END,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018082100000144')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty>0 AND (lvri.EBANK_NUMBER IS NULL OR lvri.EBANK_NUMBER='') ORDER BY lvri.voucher_f3 ";
}
/*//收到的租金--网银(汽车传统)
if("PZ2018092500000203".equals(VOUCHERNO)||"PZ2018100900000296".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION = '1' THEN lvri.rent ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION = '2' THEN lvri.rent ELSE 0.00 END,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018092500000203','PZ2018100900000296')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
@ -59,14 +84,6 @@ public class InsertVoucherRentIncome {
if("PZ2018092500000171".equals(VOUCHERNO)||"PZ2018100900000298".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION = '1' THEN lvri.rent ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION = '2' THEN lvri.rent ELSE 0.00 END,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '06' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018092500000171','PZ2018100900000298')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='2' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
}*/
//收到的租金--卡扣
if("PZ2018082100000142".equals(VOUCHERNO)||"PZ2018082100000143".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(),'-','') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION='1' THEN lvri.rent ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION='2' THEN lvri.rent ELSE 0.00 END,'IT管理员',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,lvri.cust_name AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,lvri.cust_id,CASE WHEN lv.loan_direction='2' THEN '02' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018082100000142','PZ2018082100000143')) lv ON lv.proj_type=lci.LEAS_FORM WHERE lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' and f58 is not null) and lvri.rent>0 and (lvri.EBANK_NUMBER is null or lvri.EBANK_NUMBER='') ORDER BY lvri.voucher_f3 ";
}
//收到的逾期利息--网银
if("PZ2018072100000025".equals(VOUCHERNO)||"PZ2018080400000082".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '0603' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018072100000025','PZ2018080400000082'))lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
}
//收到的逾期利息--网银(汽车传统)
/*if("PZ2018092500000204".equals(VOUCHERNO)||"PZ2018100900000297".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '05' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018092500000204','PZ2018100900000297')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
@ -75,10 +92,6 @@ public class InsertVoucherRentIncome {
if("PZ2018092500000172".equals(VOUCHERNO)||"PZ2018100900000299".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '06' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018092500000172','PZ2018100900000299')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='2' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
}*/
//收到的逾期利息--卡扣
if("PZ2018082100000144".equals(VOUCHERNO)||"PZ2018082100000145".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number='1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number='2' THEN ROUND(lvri.penalty/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number='3' THEN lvri.penalty-(ROUND(lvri.penalty/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,lvri.cust_name AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,lvri.cust_id,CASE WHEN lv.loan_direction='2' THEN '0603' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018082100000144','PZ2018082100000145')) lv ON lv.proj_type=lci.LEAS_FORM WHERE lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty>0 AND (lvri.EBANK_NUMBER IS NULL OR lvri.EBANK_NUMBER='') ORDER BY lvri.voucher_f3";
}
// 收到的贴息
/*if("PZ2018072100000028".equals(VOUCHERNO)||"PZ2018080400000085".equals(VOUCHERNO)){
sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(),'-','') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的贴息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number='1' THEN lvri.rent ELSE 0.00 END as f7,CASE WHEN lv.sort_number='2' THEN round(lvri.rent/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number='3' then lvri.rent-(ROUND(lvri.rent/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END as f8,'IT管理员',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,lvri.cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,lvri.cust_id,CASE WHEN lv.loan_direction='2' THEN '02' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_discount_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018080400000085','PZ2018072100000028')) lv ON lv.proj_type=lci.LEAS_FORM WHERE lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的贴息%' and f58 is not null) and lvri.rent>0 ORDER BY lvri.voucher_f3";
@ -102,18 +115,23 @@ public class InsertVoucherRentIncome {
*f17也会存进表中
*查询sql 用逗号关联的方法，查询乘积条数 where 1=1
*/
public void initLVRentIncome() throws Exception{
Transaction Sqlca =null;
try{
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
String sql="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(),'-',''),CONCAT('k',getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE ,lri.RENT ,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id=lri.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE lri.rent>0 AND lri.id NOT IN (SELECT income_id FROM lv_rent_income))";
// String sql="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(),'-',''),CONCAT('k',getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE ,lri.RENT ,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id=lri.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE lri.rent>0 AND lri.id NOT IN (SELECT income_id FROM lv_rent_income))";
// 未逾期及逾期未过月
String sql="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id = lri.contract_id LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lci.id AND lrp.plan_list=lri.plan_list LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE lri.rent > 0 AND lri.id NOT IN (SELECT income_id FROM lv_rent_income) AND LEFT(lri.hire_date,7)<=LEFT(lrp.plan_date,7))";
// 逾期过月
String sq1="INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id = lri.contract_id LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lci.id AND lrp.plan_list=lri.plan_list LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE lri.rent > 0 AND lri.id NOT IN (SELECT income_id FROM lv_rent_income) AND LEFT(lri.hire_date,7)>LEFT(lrp.plan_date,7))";
String sql1="INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(),'-',''),CONCAT('k',getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE ,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id=lri.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE lri.penalty>0 AND lri.id NOT IN (SELECT income_id FROM lv_penalty_income))";
String sql2="INSERT INTO lv_discount_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,ld.ID,DATE_FORMAT(ld.inputtime, '%Y/%m/%d'),ld.discount_money,0.00,0.00,0.00,oac.acc_bank,oac.acc_name,oac.acc_number FROM lb_discount ld LEFT JOIN lb_contract_info lci ON lci.contract_no = ld.contract_no 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 (SELECT acc_bank,acc_name,acc_number FROM OWN_ACCOUNT WHERE account_type = 'in_account' AND state_ = '0010' LIMIT 0, 1) oac ON 1 = 1 WHERE ld.discount_money > 0 AND ld.id NOT IN (SELECT income_id FROM lv_discount_income)) ";
SqlObject as1 = new SqlObject(sq1);
SqlObject asql = new SqlObject(sql);
SqlObject asql1 = new SqlObject(sql1);
SqlObject asql2 = new SqlObject(sql2);
Sqlca.executeSQL(as1);
Sqlca.executeSQL(asql);
Sqlca.executeSQL(asql1);
Sqlca.executeSQL(asql2);

12
src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
View File

@ -317,7 +317,15 @@ public class CreateVoucherServiceImpl {
dataTemp=psi.getParamBasic(tx, basic, param);
}
subData.put("F5", abs);//ժҪ
/**
* 在放款凭证摘要中添加流程实例号
*/
String REQNBR = param.get("REQNBR");
if("PZ2018070900000002".equals(VOUCHERNO) && REQNBR!=null) {
subData.put("F5", abs+"-"+REQNBR);//摘要
}else {
subData.put("F5", abs);//摘要
}
subData.put("F6",sub.getAttribute("id").getString());//科目编码
subData.put("F1",dataTemp.get("ACCOUNT_DATE"));//会计处理日
@ -348,7 +356,7 @@ public class CreateVoucherServiceImpl {
}else if("PZ2018092500000175".equals(VOUCHERNO)||"PZ2018100900000257".equals(VOUCHERNO) || "PZ2018092500000176".equals(VOUCHERNO) || "PZ2018100900000258".equals(VOUCHERNO) || "PZ2018092500000177".equals(VOUCHERNO) || "PZ2018100900000259".equals(VOUCHERNO) || "PZ2018092500000178".equals(VOUCHERNO) || "PZ2018100900000260".equals(VOUCHERNO)){
subData.put("CUSTID","APZL00000000DC");//虚拟账户
subData.put("CUSTNAME","业务系统待查客户");//虚拟账户
}else if("PZ2018072100000052".equals(VOUCHERNO)){
}else if("PZ2018072100000052".equals(VOUCHERNO)||"PZ2018072100000031".equals(VOUCHERNO)){
subData.put("CUSTID","APZL00000000DC");//虚拟账户
subData.put("CUSTNAME","业务系统待查客户");//虚拟账户
}else {

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

@ -374,6 +374,7 @@ public class FundIncomeMethod {
otherProperty.put("ACC_NUMBER", boOA.getAttribute("ACC_NUMBER").getString());
otherProperty.put("INCOME_ID", bo.getAttribute("ID").getString());
otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "03");
otherProperty.put("FACT_DATE", StringFunction.getToday());
DataOperatorUtil.copySingleJBO(LC_FUND_INCOME.CLASS_NAME, fromCondition,LC_FUND_INCOME_TEMP.CLASS_NAME, null, otherProperty,tx);
}
}

4
src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherDaySettlementMission.java
View File

@ -25,7 +25,7 @@ public class CreateVoucherDaySettlementMission implements Job {
CreateVoucherMonthSettlement vouchermanage=new CreateVoucherMonthSettlement();
vouchermanage.CreateVoucher("PZ2018072100000055");//日结税金--回租
vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租
/*vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租
// 汽车类传统类日结-月结
vouchermanage.CreateVoucher("PZ2018092500000215");//日结-确认未实现利息收入--回租
@ -40,7 +40,7 @@ public class CreateVoucherDaySettlementMission implements Job {
vouchermanage.CreateVoucher("PZ2018092500000184");//日结-确认租金利息税金--回租
vouchermanage.CreateVoucher("PZ2018100900000281");//日结-确认租金利息税金--直租
*/
QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CreateVoucherDaySettlementMission", "success", "成功", curUserId);
} catch (Exception e) {
QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CreateVoucherDaySettlementMission", "error", "失败", curUserId);

10
src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java
View File

@ -32,19 +32,19 @@ public class CreateVoucherMonthSettlementMission implements Job {
CreateVoucherMonthSettlement vouchermanage=new CreateVoucherMonthSettlement();
vouchermanage.CreateVoucher("PZ2018071200000017");//月结手续费(按月分摊)--回租
vouchermanage.CreateVoucher("PZ2018080400000104");//月结手续费(按月分摊)--直租
//vouchermanage.CreateVoucher("PZ2018080400000104");//月结手续费(按月分摊)--直租
vouchermanage.CreateVoucher("PZ2018072100000048");//月结-确认贴息收入--回租
vouchermanage.CreateVoucher("PZ2018080400000103");//月结-确认贴息收入--直租
//vouchermanage.CreateVoucher("PZ2018080400000103");//月结-确认贴息收入--直租
vouchermanage.CreateVoucher("PZ2018071200000016");//月结-确认未实现利息收入--回租
vouchermanage.CreateVoucher("PZ2018080400000102");//月结-确认未实现利息收入--直租
//vouchermanage.CreateVoucher("PZ2018080400000102");//月结-确认未实现利息收入--直租
//vouchermanage.CreateVoucher("PZ2018072100000055");//日结税金--回租
//vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租
// 汽车类传统类日结-月结
vouchermanage.CreateVoucher("PZ2018092500000215");//日结-确认未实现利息收入--回租
/*vouchermanage.CreateVoucher("PZ2018092500000215");//日结-确认未实现利息收入--回租
vouchermanage.CreateVoucher("PZ2018100900000275");//日结-确认未实现利息收入--直租
vouchermanage.CreateVoucher("PZ2018092500000216");//日结-确认租金利息税金--回租
@ -62,7 +62,7 @@ public class CreateVoucherMonthSettlementMission implements Job {
vouchermanage.CreateVoucher("PZ2018100900000282");//月结-确认未实现利息收入--回租
vouchermanage.CreateVoucher("PZ2018100900000283");//月结-确认未实现利息收入--直租
*/
QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CreateVoucherMonthSettlementMission", "success", "成功", curUserId);
} catch (Exception e) {
try {

31
src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java
View File

@ -9,6 +9,8 @@ import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT;
import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
@ -34,6 +36,7 @@ public class CustomerInfoCheck {
private String certtype;
private String certid;
private String id;
private String projectNo;
public String getCerttype() {
return certtype;
@ -358,6 +361,14 @@ public class CustomerInfoCheck {
this.id = id;
}
public String getProjectNo() {
return projectNo;
}
public void setProjectNo(String projectNo) {
this.projectNo = projectNo;
}
public String checkDistributorStatus(JBOTransaction tx)throws Exception{
String mas="false";
Transaction Sqlca=null;
@ -374,4 +385,24 @@ public class CustomerInfoCheck {
}
return mas;
}
public String checkProjectNo(JBOTransaction tx) throws JBOException{//УÑéÐÕÃûÊÇ·ñ´æÔÚLB_PROJECT_INFO_TEMP
BizObjectManager lpitManage = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
BizObjectManager lpiManage = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx);
BizObject lpit = lpitManage.createQuery("PROJECT_NO=:projectNo").setParameter("projectNo", projectNo).getSingleResult(false);
BizObject lpi = lpiManage.createQuery("PROJECT_NO=:projectNo ").setParameter("projectNo", projectNo).getSingleResult(false);
if(lpi!=null&&!(lpi.getAttribute("PROJECT_STATUS").getString().equals("101"))){
return "error";
}else if(lpi!=null&&(lpi.getAttribute("PROJECT_STATUS").getString().equals("101"))) {
return "success";
}else if(lpi==null&&lpit!=null){
if(id.equals(lpit.getAttribute("ID").getString())){
return "success";
}else{
return "error";
}
}
return "success";
}
}

11
src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
View File

@ -49,6 +49,7 @@ public class CustomerInfoManage {
private String inputName;
private String inputTel;
private String distributorCode;
private String projectNo;
public String getDistributorCode() {
return distributorCode;
@ -262,6 +263,14 @@ public class CustomerInfoManage {
public void setInputTel(String inputTel) {
this.inputTel = inputTel;
}
public String getProjectNo() {
return projectNo;
}
public void setProjectNo(String projectNo) {
this.projectNo = projectNo;
}
public String saveCustomerFamilyFormal(JBOTransaction tx){
try{
@ -376,6 +385,7 @@ public class CustomerInfoManage {
proj.setAttributeValue("PROJECT_NAME", projName + "-" + fullname);
proj.setAttributeValue("inputName", inputName);
proj.setAttributeValue("inputTel", inputTel);
proj.setAttributeValue("PROJECT_NO", projectNo);
}
//update ÏîÄ¿Ãû³Æ
if(buss != null){
@ -448,6 +458,7 @@ public class CustomerInfoManage {
if(proj != null){
proj.setAttributeValue("inputName", inputName);
proj.setAttributeValue("inputTel", inputTel);
proj.setAttributeValue("PROJECT_NO", projectNo);
}
bm.saveObject(proj);
tx.commit();