diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 818b1d8c2..452fe574d 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -77,15 +77,8 @@ String sTempletNo = "LoanSimulationBasicInfo";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); - Map> productRates = ProductParamUtil.getProductComponentType(productId, "PRD0350"); - Map productRate = productRates.get("product_rate"); - String termType = productRate.get("TermType")== null ? "" : productRate.get("TermType"); - String termMin = productRate.get("TermScope-MIN"); - String termMax = productRate.get("TermScope-MAX"); - if("02".equals(termType)){ - doTemp.setColumnAttribute("INCOME_NUMBER", "coleditstyle", "1"); - - } + + /*设置字段事件*/ doTemp.setHtmlEvent("SETTLE_METHOD", "onchange", "changeSettleMethod");//租金计算方式 doTemp.setHtmlEvent("RENT_OR_RATE", "onchange", "rentOrRateChange");//租金推算方法 @@ -210,7 +203,6 @@ $(function(){ rentOrRateOption=$("#RENT_OR_RATE").children(); incomeNumberYear=$("#INCOME_NUMBER_YEAR").children(); adjustType=$("#ADJUST_TYPE").children(); - incomeNumber=$("#INCOME_NUMBER").children(); var fundRules=calcRules["fund"]; for(var key in fundRules){ @@ -255,7 +247,6 @@ $(function(){ } // getRatioByMoney(getObj(0, "EQUIP_AMT")); }); - function financingCar(){ var financingCar = getItemValue(0, 0, "EQUIP_AMT")-getItemValue(0, 0, "FIRST_PAYMENT"); setItemValue(0, 0, "financing_car", financingCar); @@ -836,7 +827,7 @@ function changeRateType(){ //根据金额算比例 function getRatioByMoney(e){ - + debugger; if(e.value === "") { setItemValue(0, 0, e.id, "0"); } @@ -888,7 +879,7 @@ function getRatioByMoney(e){ }else{ money=equipAmt; } - + debugger; if(fundRules[key]["ratioType"]=="InputMode03"){//互算 if(e.id==key){ if(Number(equipAmt)!=0){ @@ -1020,21 +1011,6 @@ function saveRecord(sPostEvents){ alert('还租次数需大于0 ！！！'); return ; } - - var termMin = parseInt("<%=termMin%>"); - var termMax = parseInt("<%=termMax%>"); - var incomeNumber = parseInt(getItemValue(0,0,"INCOME_NUMBER")); - if("02"=="<%=termType%>"){ - if(incomeNumbertermMax){ - alert("期数不能大于"+termMax); - return; - } - } - //贷款比例不能大于产品配置 var cleanLeaseMoney=eval(getItemValue(0,0,"CLEAN_LEASE_MONEY"));//融资额 var EQUIP_AMT=eval(getItemValue(0,0,"EQUIP_AMT")); diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp index e0f2b9895..52690358b 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp @@ -29,8 +29,10 @@ if("FundPaymentFlow".equals(flowNo)){ RightType="ReadOnly"; sTempletNo = "LoanSimulationBusiness_Query"; - sParam = contractId; - name = "conditionQuery_plan"; + //sParam = contractId; + sParam = flowunid; + //name = "conditionQuery_plan"; + name = "condition_plan_business"; } String calType = CurPage.getParameter("calType"); /*获取参数*/ diff --git a/WebContent/Accounting/LoanSimulation/RentPlanList.jsp b/WebContent/Accounting/LoanSimulation/RentPlanList.jsp index c8d02a2b3..a22b5a4f1 100644 --- a/WebContent/Accounting/LoanSimulation/RentPlanList.jsp +++ b/WebContent/Accounting/LoanSimulation/RentPlanList.jsp @@ -22,12 +22,12 @@ } */ String Distributor=CurPage.getParameter("isDistributor"); String orgid = CurUser.getOrgID(); - /* if(CurUser.hasRole("401")){ + if(CurUser.hasRole("401")){ doTemp.setVisible("CORPUS", false); doTemp.setVisible("INTEREST", false); doTemp.setVisible("CORPUS_BUSINESS", false); doTemp.setVisible("INTEREST_BUSINESS", false); - } */ + } CurPage.setAttribute("modelno","rent"); doTemp.setJboClass(tcb.getRentPlan_tb()); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); diff --git a/WebContent/Accounting/LoanSimulation_old/RentPlanList.jsp b/WebContent/Accounting/LoanSimulation_old/RentPlanList.jsp index 495d2609a..d3b884b5f 100644 --- a/WebContent/Accounting/LoanSimulation_old/RentPlanList.jsp +++ b/WebContent/Accounting/LoanSimulation_old/RentPlanList.jsp @@ -1,29 +1,22 @@ <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% String paymentnumber = CurPage.getParameter("plannumber"); - String ishistory= CurPage.getParameter("IsHistory"); - String flowunid = CurPage.getParameter("FlowUnid"); - String modelName = "LCRentPlanList"; - String parm = paymentnumber; + ASObjectModel doTemp = new ASObjectModel("LCRentPlanList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + String ishistory=CurPage.getParameter("IsHistory"); + String nodeNo=CurPage.getParameter("NodeNo"); if(null!=ishistory&&ishistory.equals("true")){ //doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");//如果是历史则新显示历史数据 - modelName = "LCRentPlanListHis"; - parm = flowunid; isShowButton=false; }else{ isShowButton=true; } - ASObjectModel doTemp = new ASObjectModel(modelName); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - - String nodeNo=CurPage.getParameter("NodeNo"); - dwTemp.ShowSummary="1"; //汇总 dwTemp.Style="1"; dwTemp.ReadOnly = "1"; dwTemp.setPageSize(100); - dwTemp.genHTMLObjectWindow(parm); + dwTemp.genHTMLObjectWindow(paymentnumber); String sButtons[][] = { }; diff --git a/WebContent/AppConfig/AutoRiskDetect/ScenarioAlarm.jsp b/WebContent/AppConfig/AutoRiskDetect/ScenarioAlarm.jsp index b7cccda90..b57e1b955 100644 --- a/WebContent/AppConfig/AutoRiskDetect/ScenarioAlarm.jsp +++ b/WebContent/AppConfig/AutoRiskDetect/ScenarioAlarm.jsp @@ -24,9 +24,7 @@ if("".equals(gpsVendor)) gpsVendor="null"; sBizArg +=sBizArg+",ProjectNo="+ProjectNo+",gpsVendor="+gpsVendor; - System.out.println("*********************************"); System.out.println(sBizArg); - System.out.println("**********************************"); String sSubTypeNo = CurPage.getParameter("SubTypeNo"); String autoCommit="false"; ARE.getLog().debug("传入业务参数:"+sBizArg); diff --git a/WebContent/AppConfig/FlowManage/FlowUserConfig/flowUserSelect.jsp b/WebContent/AppConfig/FlowManage/FlowUserConfig/flowUserSelect.jsp index 3e7f22951..dc942e991 100644 --- a/WebContent/AppConfig/FlowManage/FlowUserConfig/flowUserSelect.jsp +++ b/WebContent/AppConfig/FlowManage/FlowUserConfig/flowUserSelect.jsp @@ -49,7 +49,7 @@ <%=new Button(" 确 定 ","确定","getSelectData()","","").getHtmlText()%> - <%=new Button(" 返 回 ","返回"," parent.AsDialog.ClosePage('')","","").getHtmlText()%> + <%=new Button(" 返 回 ","返回"," parent.AsDialog.ClosePage('back')","","").getHtmlText()%> <%=new Button(" 清 空 ","清空"," parent.AsDialog.ClosePage('clean')","","").getHtmlText()%> diff --git a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp index 8f6a9b353..765d09d4b 100644 --- a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp +++ b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp @@ -6,7 +6,6 @@ History Log: */ String sFlowUnid = CurPage.getParameter("FlowUnid"); - String phaseNo = CurPage.getParameter("PhaseNo"); String sPrevUrl = CurPage.getParameter("ID"); String ProjectName = CurPage.getParameter("ProjectName"); String DistributorNo = CurPage.getParameter("DistributorNo"); @@ -23,16 +22,11 @@ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 - /* if(!"0010".equals(phaseNo)){ - doTemp.setColInnerBtEvent("SUBJECTNAME", "");//去掉选择对话框 - } */ + dwTemp.genHTMLObjectWindow(sFlowUnid); String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT limit 0,1"); String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT limit 0,1"); String acc = Sqlca.getString("select acc_number from DISTRIBUTOR_ACCOUNT where distributor_id='"+DistributorNo+"' limit 0,1"); - - String subjectid = Sqlca.getString("SELECT cl.itemno AS subjectid FROM OWN_ACCOUNT oa LEFT JOIN CODE_LIBRARY CL ON CL.CODENO='ManySubject' AND CL.ITEMNAME=oa.acc_name WHERE oa.ACC_NUMBER='"+acc_number+"' limit 0,1"); - String subjectname = Sqlca.getString("SELECT cl.itemname AS subjectname FROM OWN_ACCOUNT oa LEFT JOIN CODE_LIBRARY CL ON CL.CODENO='ManySubject' AND CL.ITEMNAME=oa.acc_name WHERE oa.ACC_NUMBER='"+acc_number+"' limit 0,1"); String sButtons[][] = { {"true","All","Button","保存","保存所有修改","save()","","","",""} }; @@ -40,22 +34,8 @@ diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp index 5145453cc..9b3a63be9 100644 --- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp +++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp @@ -6,7 +6,6 @@ History Log: */ String sFlowUnid = CurPage.getParameter("FlowUnid"); - String phaseNo = CurPage.getParameter("PhaseNo"); String sPrevUrl = CurPage.getParameter("id"); String rightType = CurPage.getParameter("RightType"); @@ -29,19 +28,14 @@ dwTemp.Style = "2";//freeform if("ReadOnly".equals(rightType)){ - dwTemp.ReadOnly = "1";//只读模式 - doTemp.setColInnerBtEvent("LOCAL_ACCOUNT,ACCOUNT_INFO", ""); - } - - if(!"0010".equals(phaseNo)){ - doTemp.setColInnerBtEvent("SUBJECTNAME", "");//去掉选择对话框 + dwTemp.ReadOnly = "1";//只读模式 + doTemp.setColInnerBtEvent("LOCAL_ACCOUNT,ACCOUNT_INFO", ""); } String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT limit 0,1"); String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT limit 0,1"); - String acc = Sqlca.getString("select acc_number from DISTRIBUTOR_ACCOUNT where distributor_id="+"'"+DistributorNo+"'"+" limit 0,1"); + String acc = Sqlca.getString("select acc_number from DISTRIBUTOR_ACCOUNT where distributor_id="+"'"+DistributorNo+"'"+" limit 0,1"); String acco = Sqlca.getString("select account from DISTRIBUTOR_ACCOUNT where distributor_id="+"'"+DistributorNo+"'"+" limit 0,1"); - dwTemp.genHTMLObjectWindow(sFlowUnid); dwTemp.getDataObject().setVisible("CAUTION_MONEY", true); String sButtons[][] = { @@ -75,21 +69,6 @@ function returnList(){ parent.selectItem(1); } - - // 获取主体信息 - function selectManySubject(){ - AsDialog.OpenSelector("selectManySubject","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", - function(sReturn){ - if(!sReturn||sReturn=="_CANCEL_"||sReturn==""){ - //alert(getHtmlMessage('1'));//请选择一条信息！ - return; - } - sReturn = sReturn.split("@"); - setItemValue(0,0,"SUBJECTID",sReturn[0]); - setItemValue(0,0,"SUBJECTNAME",sReturn[1]); - },"请选择主体",''); - } - function selectaccount(){ var disno = getItemValue(0, 0, "disno"); // alert(id); @@ -106,7 +85,6 @@ } function selectensure(){ - debugger; AsDialog.OpenSelector("Depositcollection","","dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ //alert(getHtmlMessage('1'));//请选择一条信息！ @@ -115,8 +93,6 @@ sReturn = sReturn.split("@");//"@"表示了向页面添加数据时的连续性 setItemValue(0,getRow(),"LOCAL_ACCOUNT",sReturn[0]);//向页面的框中添加数据 setItemValue(0,getRow(),"LOCAL_BANK",sReturn[1]); - setItemValue(0,getRow(),"SUBJECTID",sReturn[2]); - setItemValue(0,getRow(),"SUBJECTNAME",sReturn[3]); },"请选择名称"); } function initRow() diff --git a/WebContent/FlowTest/FlowArchiveSingle.jsp b/WebContent/FlowTest/FlowArchiveSingle.jsp deleted file mode 100644 index 048a65bd3..000000000 --- a/WebContent/FlowTest/FlowArchiveSingle.jsp +++ /dev/null @@ -1,152 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> -<%@include file="/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf" %> - - - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%> -<% -/* - Author:lzb 2017-05-12 - Tester: - Content: 本方信息 - Input Param: - Output param: - History Log: - */ -%> -<%/*~END~*/%> - - - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%> -<% - String PG_TITLE = "流程实例跟踪"; // 浏览器窗口标题 PG_TITLE -%> -<%/*~END~*/%> - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量，获取参数;]~*/%> - - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%> -<% - String soft = CurPage.getParameter("soft"); - //ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack"); - ASObjectModel doTemp = new ASObjectModel("ArchiveSingle"); - String ros = "true"; - if("放款后督流程".equals(soft)){ - ros = "false"; - doTemp.appendJboWhere(" O.flow_name='放款后督流程' and O.PHASENAME='运营部初审'"); - }; - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(15); - dwTemp.genHTMLObjectWindow(""); -%> -<%/*~END~*/%> - - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%> -<% - - String sButtons[][] = { - {"true","All","Button","重新分配人员","重新分配人员","changeFlowOperator()","","","","btn_icon_resetuser",""}, - {ros,"All","Button","重新路由","重新路由","flowChangeRoute()","","","","btn_icon_resetrouting",""} - }; -%> -<%/*~END~*/%> - - - - -<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%> -<%@include file="/Frame/resources/include/ui/include_list.jspf"%> -<%/*~END~*/%> - - -<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%> - -<%/*~END~*/%> -<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> - -<%/*~END~*/%> -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/FlowTest/MailFilingSingle.jsp b/WebContent/FlowTest/MailFilingSingle.jsp deleted file mode 100644 index de3c0b5a7..000000000 --- a/WebContent/FlowTest/MailFilingSingle.jsp +++ /dev/null @@ -1,152 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> -<%@include file="/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf" %> - - - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%> -<% -/* - Author:lzb 2017-05-12 - Tester: - Content: 本方信息 - Input Param: - Output param: - History Log: - */ -%> -<%/*~END~*/%> - - - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%> -<% - String PG_TITLE = "流程实例跟踪"; // 浏览器窗口标题 PG_TITLE -%> -<%/*~END~*/%> - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量，获取参数;]~*/%> - - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%> -<% - String soft = CurPage.getParameter("soft"); - //ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack"); - ASObjectModel doTemp = new ASObjectModel("MailSingle"); - String ros = "true"; - if("邮寄资料归档".equals(soft)){ - ros = "false"; - doTemp.appendJboWhere(" O.flow_name='邮寄资料归档' and O.PHASENAME='运营部初审'"); - }; - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(15); - dwTemp.genHTMLObjectWindow(""); -%> -<%/*~END~*/%> - - -<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%> -<% - - String sButtons[][] = { - {"true","All","Button","重新分配人员","重新分配人员","changeFlowOperator()","","","","btn_icon_resetuser",""}, - {ros,"All","Button","重新路由","重新路由","flowChangeRoute()","","","","btn_icon_resetrouting",""} - }; -%> -<%/*~END~*/%> - - - - -<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%> -<%@include file="/Frame/resources/include/ui/include_list.jspf"%> -<%/*~END~*/%> - - -<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%> - -<%/*~END~*/%> -<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> - -<%/*~END~*/%> -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Frame/jbpmdesigner/js/tracywindyUtils.js b/WebContent/Frame/jbpmdesigner/js/tracywindyUtils.js index c2b28e69a..f34def490 100644 --- a/WebContent/Frame/jbpmdesigner/js/tracywindyUtils.js +++ b/WebContent/Frame/jbpmdesigner/js/tracywindyUtils.js @@ -8,7 +8,7 @@ function getTracywindyRandomUrl(url){ tempUrl = "tracywindyRandom=" + Math.random(); } /* - * 锟斤拷源URL 锟斤拷颖锟街撅拷锟 + * 资源URL 添加标志符 */ if(url.indexOf('?')>-1){ url += ("&" + tempUrl); @@ -17,19 +17,19 @@ function getTracywindyRandomUrl(url){ } return url; } -//锟斤拷式锟斤拷锟斤拷锟斤拷为千锟斤拷位 +//格式化数字为千分位 function formatNumberThousand(s) { if(isNaN(s)){ return s; } s += ""; s = s.replace(/,/g,""); -var re=/(\d{1,3})(?=(\d{3})+(?:$|\D))/g; //肖遥锟斤拷指锟斤拷 +var re=/(\d{1,3})(?=(\d{3})+(?:$|\D))/g; //肖遥云指点 var n1=s.replace(re,"$1,"); return n1; } -//锟叫讹拷parentObj锟角凤拷锟斤拷obj锟斤拷锟较硷拷元锟斤拷 +//判断parentObj是否是obj的上级元素 function isParent(obj,parentObj){ while (obj != undefined && obj != null && obj.tagName.toUpperCase() != 'BODY'){ if (obj == parentObj){ @@ -60,7 +60,7 @@ function clearForm(form) } } } -//锟斤拷取锟斤拷锟斤拷 +//获取日期 function getCurDateTime(date) { var d = new Date(); @@ -70,13 +70,13 @@ function getCurDateTime(date) } var week; switch (d.getDay()){ - case 1: week="锟斤拷锟斤拷一"; break; - case 2: week="锟斤拷锟节讹拷"; break; - case 3: week="锟斤拷锟斤拷锟斤拷"; break; - case 4: week="锟斤拷锟斤拷锟斤拷"; break; - case 5: week="锟斤拷锟斤拷锟斤拷"; break; - case 6: week="锟斤拷锟斤拷锟斤拷"; break; - default: week="锟斤拷锟斤拷锟斤拷"; + case 1: week="星期一"; break; + case 2: week="星期二"; break; + case 3: week="星期三"; break; + case 4: week="星期四"; break; + case 5: week="星期五"; break; + case 6: week="星期六"; break; + default: week="星期天"; } var years = d.getFullYear(); var month = add_zero(d.getMonth()+1); @@ -100,13 +100,13 @@ function getCurDate(date) var ndate = years+"-"+month+"-"+days; return ndate; } -//锟斤拷锟斤拷锟斤拷位锟斤拷前锟竭诧拷0 +//不足两位的前边补0 function add_zero(temp) { if(temp<10) return "0"+temp; else return temp; } -//锟桔碉拷锟斤拷示锟斤拷锟斤拷 +//折叠显示区域 function fieldsetHidden(e){ var src=getTarget(e); var legend = src.parentNode.parentNode; @@ -121,7 +121,7 @@ function fieldsetHidden(e){ } src.src = src.src.indexOf("Left")!=-1?src.src.replace(/Left/g,"Down"):src.src.replace(/Down/g,"Left"); } -//锟叫断碉拷前使锟斤拷锟斤拷锟斤拷锟斤拷姹撅拷锟 +//判断当前使用浏览器版本类 var userAgent = navigator.userAgent.toLowerCase(); var SysBrowser = { version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1], @@ -131,16 +131,16 @@ var SysBrowser = { chrome: /chrome/.test( userAgent ), opera: /opera/.test( userAgent ), safari: /safari/.test( userAgent ), - trident : userAgent.indexOf('trident') > -1, //IE锟节猴拷 - presto : userAgent.indexOf('presto') > -1, //opera锟节猴拷 - webKit : userAgent.indexOf('applewebkit') > -1, //苹锟斤拷锟斤拷锟饺革拷锟节猴拷 - gecko : userAgent.indexOf('gecko') > -1 && userAgent.indexOf('khtml') == -1, //锟斤拷锟斤拷诤锟 - mobile : !!userAgent.match(/applewebkit.*mobile.*/)|| !!userAgent.match(/applewebkit/), //锟角凤拷为锟狡讹拷锟秸讹拷 - ios : !!userAgent.match(/\(i[^;]+;( u;)? cpu.+mac os x/), //ios锟秸讹拷 - android : userAgent.indexOf('android') > -1 || userAgent.indexOf('linux') > -1, //android锟秸端伙拷锟斤拷uc锟斤拷锟斤拷锟 - iPhone : userAgent.indexOf('iphone') > -1 /*|| userAgent.indexOf('mac') > -1*/, //锟角凤拷为iPhone锟斤拷锟斤拷QQHD锟斤拷锟斤拷锟 - iPad: userAgent.indexOf('ipad') > -1, //锟角凤拷iPad - webApp : userAgent.indexOf('safari') == -1,//锟角凤拷web应锟矫筹拷锟斤拷没锟斤拷头锟斤拷锟斤拷撞锟 + trident : userAgent.indexOf('trident') > -1, //IE内核 + presto : userAgent.indexOf('presto') > -1, //opera内核 + webKit : userAgent.indexOf('applewebkit') > -1, //苹果、谷歌内核 + gecko : userAgent.indexOf('gecko') > -1 && userAgent.indexOf('khtml') == -1, //火狐内核 + mobile : !!userAgent.match(/applewebkit.*mobile.*/)|| !!userAgent.match(/applewebkit/), //是否为移动终端 + ios : !!userAgent.match(/\(i[^;]+;( u;)? cpu.+mac os x/), //ios终端 + android : userAgent.indexOf('android') > -1 || userAgent.indexOf('linux') > -1, //android终端或者uc浏览器 + iPhone : userAgent.indexOf('iphone') > -1 /*|| userAgent.indexOf('mac') > -1*/, //是否为iPhone或者QQHD浏览器 + iPad: userAgent.indexOf('ipad') > -1, //是否iPad + webApp : userAgent.indexOf('safari') == -1,//是否web应该程序，没有头部与底部 google:userAgent.indexOf('chrome')>-1, getBrowser:function(){ if(SysBrowser.msie) return "IE"; @@ -188,7 +188,7 @@ function stopDefault(e){ getEvent(e).returnValue=false; } } -//强锟狡硷拷n锟斤拷小锟斤拷30->30.00 +//强制加n个小数30->30.00 function forcePreciseDecimal(x,scale) { scale = scale||2; @@ -217,9 +217,9 @@ function decimalReal(num,v) var dight =(num*Math.pow(10,v)/Math.pow(10,v)).toFixed(v); return parseFloat(dight); } -//锟斤拷锟斤拷锟斤拷锟斤拷 +//四舍五入 function decimal(num,v) -{ //num锟斤拷示要锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟,v锟斤拷示要锟斤拷锟斤拷锟斤拷小锟斤拷位锟斤拷锟斤拷 +{ //num表示要四舍五入的数,v表示要保留的小数位数。 if(0 == v) { return decimalReal(decimalReal(num,2),0); @@ -231,7 +231,7 @@ function getTracywindyObject(id) { return tracywindyObject[id]; } -//function 锟斤拷锟斤拷css +//function 处理css String.prototype.trim=function(){ return this.replace(/(^\s{1,})|(\s{1,}$)/gim,""); }; @@ -267,14 +267,14 @@ function removeClass(element,classname) } element.className = oldClassArr.join(" "); } -//锟斤拷锟斤拷唯一锟斤拷识 +//生成唯一标识 function Guid(){ return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); } function GenerateGuid(){ return Guid()+Guid()+Guid()+Guid()+Guid()+Guid()+Guid()+Guid(); } -//锟斤拷目锟斤拷路锟斤拷 +//项目根路径 function getRootPath(){ var strFullPath=window.document.location.href; var strPath=window.document.location.pathname; @@ -284,7 +284,7 @@ function getRootPath(){ return (prePath+postPath); } -//锟斤拷锟斤拷锟斤拷锟斤拷 +//复制属性 var tracywindyApplyTo=function(originalObj,targetobj){ for(var p in originalObj) { @@ -294,7 +294,7 @@ var tracywindyApplyTo=function(originalObj,targetobj){ } } }; -//只锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 +//只能输入数字 function validateNumber() { /*var e = window.event; @@ -304,14 +304,14 @@ function validateNumber() { pass = true; } - //小锟斤拷锟斤拷 + //小键盘 if(((keyCode>=96)&&(keyCode<=105))||(keyCode==110)) { pass = true; } e.returnValue = pass;*/ } -//锟斤拷锟斤拷一锟斤拷全锟斤拷锟斤拷锟斤拷 +//弹出一个全屏窗口 function openFullScreenWindow(strURL,attachmentParams,winRef) { if(-1==strURL.indexOf("systemMathRandom")) @@ -381,9 +381,9 @@ function openFullScreenWindow(strURL,attachmentParams,winRef) var winoption ="left=0px,top=0px,height="+sheight+"px,width="+swidth+"px,toolbar=yes,menubar=yes,location=yes,status=yes,scrollbars=yes,resizable=yes"; if(winRef){ window.loc = function(){ - winRef.location.href = strURL;//锟侥憋拷页锟斤拷锟 location + winRef.location.href = strURL;//改变页面的 location }; - setTimeout("window.loc();",800);//锟斤拷锟斤拷却锟斤拷锟斤拷锟揭拷锟斤拷锟斤拷锟斤拷锟饺达拷锟侥伙拷锟斤拷锟睫凤拷实锟斤拷 + setTimeout("window.loc();",800);//这个等待很重要，如果不等待的话将无法实现 }else{ window.open(strURL,'_blank',winoption); } @@ -411,20 +411,20 @@ function openFullScreenWindow(strURL,attachmentParams,winRef) tempSubmitForm.submit();*/ return false; } -function setCookie(name,value)//锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷一锟斤拷锟斤拷cookie锟斤拷锟斤拷锟接ｏ拷一锟斤拷锟斤拷值 +function setCookie(name,value)//两个参数，一个是cookie的名子，一个是值 { - var Days = 30; //锟斤拷 cookie 锟斤拷锟斤拷锟斤拷锟斤拷 30 锟斤拷 + var Days = 30; //此 cookie 将被保存 30 天 var exp = new Date(); //new Date("December 31, 9998"); exp.setTime(exp.getTime() + Days*24*60*60*1000); document.cookie = name + "="+ escape (value) + ";expires=" + exp.toGMTString(); } -function getCookie(name)//取cookies锟斤拷锟斤拷 +function getCookie(name)//取cookies函数 { var arr = document.cookie.match(new RegExp("(^| )"+name+"=([^;]*)(;|$)")); if(arr != null) return unescape(arr[2]); return ""; } -//删锟斤拷锟斤拷锟街讹拷锟斤拷锟0 +//删除数字多余的0 function nullToString(value) { if((typeof(value)=='undefined')||(value==null)) @@ -454,10 +454,10 @@ function empty2Other(sourceStr,replaceStr) { return !sourceStr ? replaceStr : sourceStr; } -//说锟斤拷锟斤拷锟斤拷锟斤拷某锟斤拷table锟叫碉拷锟斤拷锟斤拷锟轿伙拷锟/锟缴编辑 -//锟斤拷锟斤拷1锟斤拷锟斤拷锟斤拷table锟斤拷ID -//锟斤拷锟斤拷2:table锟角革拷锟斤拷锟角诧拷锟斤拷锟斤拷锟斤拷锟皆★拷,锟斤拷锟街革拷 -//锟斤拷锟斤拷3:锟斤拷锟斤拷锟斤拷锟斤拷 0为只锟斤拷 1为锟洁辑 +//说明：设置某个table中的输入框为只读/可编辑 +//参数1：操作table的ID +//参数2:table那个域是不操作的以“,”分隔 +//参数3:操作类型 0为只读 1为编辑 function formJSPInputHideOrShow(id,exceptFfield,stype){ if(document.getElementById(id)){ var inputs=jQuery("#"+id+" input[type='text'],#"+id+" textarea"); @@ -496,12 +496,12 @@ function formJSPInputHideOrShow(id,exceptFfield,stype){ }} } } -//锟斤拷询锟斤拷锟叫控硷拷锟叫憋拷锟斤拷锟斤拷 +//查询多行控件中必填项 function checkTracywindyTableData(talbeid,title){ var sourceTable= getTracywindyObject(talbeid); var sourceData=sourceTable.getRowsJsonData(); if(sourceData.length<=0){ - jQuery.messager.alert('锟斤拷示',"
锟斤拷锟斤拷写"+title+"
",'error'); + jQuery.messager.alert('提示',"
请填写"+title+"
",'error'); return false; } var sourceColumn=sourceTable.columns; @@ -518,7 +518,7 @@ function checkTracywindyTableData(talbeid,title){ columndata=onecolumn[sourceColumn[i].name]; columndata=columndata+""; if(columndata==""|| columndata=="." ||columndata=="undefined" ){ - jQuery.messager.alert('锟斤拷示',"
"+title+"锟斤拷"+sourceColumn[i].header+"锟斤拷锟斤拷为锟斤拷
",'error'); + jQuery.messager.alert('提示',"
"+title+"的"+sourceColumn[i].header+"不能为空
",'error'); return false; } } @@ -527,7 +527,7 @@ function checkTracywindyTableData(talbeid,title){ } -//锟较达拷锟斤拷锟斤拷 +//上传附件 function attachmentUpWithUploadDate(config){ var _inputStyle = "width:215px;height:20px;cursor:pointer;outline:medium none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;"; var _div1Style = "border:1px solid #FFFFFF;float:left;height:20px;margin-left:90px;margin-top:50px;position:absolute;width:215px;z-index:999;"; @@ -542,12 +542,12 @@ function attachmentUpWithUploadDate(config){ _uploadWindowHtml += '
'; _uploadWindowHtml += ' '; _uploadWindowHtml += ' '; - _uploadWindowHtml += ' '; - _uploadWindowHtml += ' '; + _uploadWindowHtml += ' '; + _uploadWindowHtml += ' '; _uploadWindowHtml += ' '; _uploadWindowHtml += ' '; _uploadWindowHtml += ' '; _uploadWindowHtml += '
锟秸匡拷时锟戒：
锟较达拷锟侥硷拷锟斤拷
收款时间：
上传文件：
'; - _uploadWindowHtml += ' 确锟斤拷'; - _uploadWindowHtml += ' 取锟斤拷'; + _uploadWindowHtml += ' 确定'; + _uploadWindowHtml += ' 取消'; _uploadWindowHtml += '
'; @@ -576,10 +576,10 @@ function attachmentUpWithUploadDate(config){ var uploadDate = _formBox.find('#id_uploadDate').val(); var file = _formBox.find('#_hiddenFileName').val(); if(file == false){ - alert("锟斤拷选锟斤拷锟较达拷锟侥硷拷"); + alert("请选择上传文件"); return false; } else if(uploadDate == false){ - alert("锟斤拷锟斤拷锟斤拷锟秸匡拷锟斤拷锟斤拷"); + alert("请输入收款日期"); return false; } config.parames = config.parames ? config.parames : {}; @@ -604,7 +604,7 @@ function attachmentUpWithUploadDate(config){ } -//锟较达拷锟斤拷锟斤拷 +//上传附件 function attachmentUpMini(config){ var openurl = config.url; var param = fileDownLoadParams(config,"url,title,parames","str"); @@ -631,8 +631,8 @@ function attachmentUpMini(config){ uploadAttachmentFileWindow_html += ' '; uploadAttachmentFileWindow_html += ' '; uploadAttachmentFileWindow_html += ' '; - uploadAttachmentFileWindow_html += ' 确锟斤拷'; - uploadAttachmentFileWindow_html += ' 取锟斤拷'; + uploadAttachmentFileWindow_html += ' 确定'; + uploadAttachmentFileWindow_html += ' 取消'; uploadAttachmentFileWindow_html += ' '; uploadAttachmentFileWindow_html += ' '; uploadAttachmentFileWindow_html += ' '; @@ -653,7 +653,7 @@ function attachmentUpMini(config){ // jQuery("#id_downOrLoadFormWindow").window("open"); } -//锟较达拷锟斤拷锟斤拷 +//上传附件 function attachmentUp(config){ var openurl = config.url; @@ -681,8 +681,8 @@ function attachmentUp(config){ uploadAttachmentFileWindow_html += ' '; uploadAttachmentFileWindow_html += ' '; uploadAttachmentFileWindow_html += ' '; - uploadAttachmentFileWindow_html += ' 确锟斤拷'; - uploadAttachmentFileWindow_html += ' 取锟斤拷'; + uploadAttachmentFileWindow_html += ' 确定'; + uploadAttachmentFileWindow_html += ' 取消'; uploadAttachmentFileWindow_html += ' '; uploadAttachmentFileWindow_html += ' '; uploadAttachmentFileWindow_html += ' '; @@ -708,7 +708,7 @@ function attachmentFormSubmit(url){ if(!window.currentImportExcelLoadMask) { - window.currentImportExcelLoadMask = new tracywindyLoadMask(document.body,"锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 锟斤拷锟皆碉拷..."); + window.currentImportExcelLoadMask = new tracywindyLoadMask(document.body,"操作进行中 请稍等..."); } if(window.currentImportExcelLoadMask){ @@ -732,7 +732,7 @@ function attachmentDown(config){ if(!window.currentImportExcelLoadMask) { - window.currentImportExcelLoadMask = new tracywindyLoadMask(document.body,"锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 锟斤拷锟皆碉拷..."); + window.currentImportExcelLoadMask = new tracywindyLoadMask(document.body,"操作进行中 请稍等..."); } var tempurl=config.url; window.currentImportExcelLoadMask.show(); @@ -790,7 +790,7 @@ function attachmentDown(config){ } function fileCreateWordByIds(config,uploadid){ if(!window.currentDeleteFileLoadMask) - {window.currentDeleteFileLoadMask = new tracywindyLoadMask(document.body,"锟斤拷锟节猴拷同 锟斤拷锟皆碉拷..."); } + {window.currentDeleteFileLoadMask = new tracywindyLoadMask(document.body,"正在合同 请稍等..."); } window.currentDeleteFileLoadMask.show(); var url="/leasing/template/CreateFileByTemplate.action"; tempurl=config.url||url; @@ -810,7 +810,7 @@ function fileCreateWordByIds(config,uploadid){ if(vlist.result=="success"){ var list=getTracywindyObject(uploadid); list.AddRows(vlist.message); - alert("锟侥硷拷锟斤拷锟缴成癸拷"); + alert("文件生成成功"); }else{ alert(vlist.message); } @@ -856,29 +856,29 @@ function fileDownLoadParams(config, exectFeild, reType) { function getTaskTypeChineseName(taskType){ var chineseMapping = { - "PENDING":"锟斤拷锟斤拷锟斤拷锟斤拷", - "DELEGATE":"委锟斤拷锟斤拷锟斤拷", - "ASSIGNMENTPENDING":"指锟缴达拷锟斤拷锟斤拷锟斤拷锟斤拷", - "ASSIGNMENTCOMPLETED":"指锟斤拷锟窖达拷锟斤拷锟斤拷锟斤拷", - "READ":"锟斤拷锟斤拷锟斤拷锟斤拷", - "SIGNATURE":"锟斤拷签锟斤拷锟斤拷" + "PENDING":"待办任务", + "DELEGATE":"委托任务", + "ASSIGNMENTPENDING":"指派待处理任务", + "ASSIGNMENTCOMPLETED":"指派已处理任务", + "READ":"传阅任务", + "SIGNATURE":"会签任务" }; return chineseMapping[taskType.toUpperCase()]; } -//锟斤拷锟斤拷模锟斤拷 +//加载模板 function loadTemplate(config){ - //注锟斤拷config锟斤拷锟斤拷 - //templateDiv锟斤拷锟斤拷锟截碉拷模锟斤拷锟斤拷锟轿伙拷锟 - //oneClassify:一锟斤拷锟斤拷锟斤拷 - //twoClassify:锟斤拷锟斤拷锟斤拷锟斤拷 - //threethClassify:锟斤拷锟斤拷锟斤拷锟斤拷 - //fourClassify:锟侥硷拷锟斤拷锟斤拷 - //fiveClassify:锟藉级锟斤拷锟斤拷 + //注：config参数 + //templateDiv：加载的模板放在位置 + //oneClassify:一级分类 + //twoClassify:二级分类 + //threethClassify:三级分类 + //fourClassify:四级分类 + //fiveClassify:五级分类 var params=fileDownLoadParams(config,"","array"); var templateDiv=config.templateDiv; config.changeRowNum = config.changeRowNum || 4; - window.currentDeleteFileLoadMask = new tracywindyLoadMask(document.body,"锟斤拷锟节硷拷锟斤拷模锟斤拷 锟斤拷锟皆碉拷..."); + window.currentDeleteFileLoadMask = new tracywindyLoadMask(document.body,"正在加载模板 请稍等..."); currentDeleteFileLoadMask.show(); ajaxRequest({ url:getRootPath()+'/leasing/template/loadTemplateByClassify.action', @@ -892,13 +892,13 @@ function loadTemplate(config){ async:false, failure:function(res){ currentDeleteFileLoadMask.hide(); - alert("锟斤拷锟斤拷模锟斤拷失锟斤拷!");}, + alert("加载模板失败!");}, params:params }); } function createWordByIds(config){ - //fileListTable:"取锟侥硷拷锟斤拷锟斤拷锟叫碉拷ID" - //modename:'锟斤拷一锟斤拷锟斤拷锟斤拷' + //fileListTable:"取文件件名列的ID" + //modename:'上一级分类' config.fileListTable = config.fileListTable||"table_id_table_word_list_container"; var chk_value=[]; var tempid=""; @@ -912,15 +912,15 @@ function createWordByIds(config){ $('input[name="contract_word_list_check_box"]:checked').each(function(){ chk_value.push($(this).attr("checked",false)); }); - var filelist = getTracywindyObject(config.fileListTable).getRowsJsonData();//锟斤拷同锟藉单 + var filelist = getTracywindyObject(config.fileListTable).getRowsJsonData();//合同清单 if(chk_value.length<=0){ - jQuery.messager.alert('锟斤拷锟斤拷锟斤拷示',"
锟诫勾选模锟藉！
",'error') + jQuery.messager.alert('错误提示',"
请勾选模板！
",'error') return false; }else{ for(var i=0;i锟斤拷锟斤拷锟截革拷锟斤拷锟斤拷"+filelist[j].templatename+"锟斤拷
",'error') + jQuery.messager.alert('错误提示',"
不能重复生成"+filelist[j].templatename+"！
",'error') return false; } } @@ -942,9 +942,9 @@ function showContractFile(value,tableObj,columnName,columnIndex,rowData){ var base = "{1}{2}"; var base2 = "{1}{2}"; var separator = "  "; - var updateFlag="锟洁辑"; + var updateFlag="编辑"; var field=base.replace("{1}",updateFlag).replace("{2}",separator); - field=field+base2.replace("{1}","锟斤拷锟斤拷").replace("{2}",separator); + field=field+base2.replace("{1}","下载").replace("{2}",separator); return field; } function showWORDFile(doc_id){ @@ -954,7 +954,7 @@ function showWORDFile(doc_id){ } function importFinanceExcel(custid,initConfig){ - attachmentUp({url:"/leasing/finance/importFinacne.acl",modelname:'cardupload',custid:custid,title:'锟斤拷锟今报憋拷锟叫达拷',parames:initConfig}); + attachmentUp({url:"/leasing/finance/importFinacne.acl",modelname:'cardupload',custid:custid,title:'财务报表中传',parames:initConfig}); } function DefaultAjaxCallBack(message){ if(window.currentImportExcelLoadMask){ @@ -967,9 +967,9 @@ function getFuncRightManage(userid,deptcolumn,managecolumn){ var params = {}; var datas = []; var conditon = ""; - params["userid"] = userid || "${sessionScope['login_userid']}"; //锟斤拷陆锟斤拷ID - params["deptcolumn"] = deptcolumn; //锟斤拷锟斤拷锟斤拷锟斤拷锟街讹拷锟斤拷锟斤拷锟缴猴拷锟斤拷锟斤拷锟斤拷锟界：'contract_info.proj_dept'锟斤拷 - params["managecolumn"] = managecolumn; //锟斤拷锟斤拷锟斤拷锟斤拷锟街讹拷锟斤拷锟斤拷锟缴猴拷锟斤拷锟斤拷锟斤拷锟界：'contract_info.proj_manage'锟斤拷 + params["userid"] = userid || "${sessionScope['login_userid']}"; //登陆人ID + params["deptcolumn"] = deptcolumn; //部门条件字段名（可含别名，如：'contract_info.proj_dept'） + params["managecolumn"] = managecolumn; //担当条件字段名（可含别名，如：'contract_info.proj_manage'） params["xmlFileName"] = "/eleasing/jsp/base/funcright_manage.xml"; $.ajax({ @@ -977,6 +977,7 @@ function getFuncRightManage(userid,deptcolumn,managecolumn){ async:false, params:params, success:function(res){ + debugger; var jsonData1 = ''; jsonData1=eval("(" + res.responseText + ")"); datas = jsonData1["datas"]; diff --git a/WebContent/Frame/page/ow/ListSearch.jsp b/WebContent/Frame/page/ow/ListSearch.jsp index 719b217cf..25692f965 100644 --- a/WebContent/Frame/page/ow/ListSearch.jsp +++ b/WebContent/Frame/page/ow/ListSearch.jsp @@ -80,9 +80,6 @@ if(request.getParameter("DOFILTER_DF_"+ sColName +"_2_VALUE")!=null){ value2 = URLDecoder.decode(request.getParameter("DOFILTER_DF_"+ sColName +"_2_VALUE").toString(),"UTF-8"); //ARE.getLog().trace("value2 = " + value2); - if(value2==null || "".equals(value2)){ - value2="undefined"; - } } if(null!=customFilter){ if(customFilter.checkFilter(sColName)){ diff --git a/WebContent/Frame/page/resources/ueditor/third-party/video-js/video.dev.js b/WebContent/Frame/page/resources/ueditor/third-party/video-js/video.dev.js index 04c99d2c9..d01ea6008 100644 --- a/WebContent/Frame/page/resources/ueditor/third-party/video-js/video.dev.js +++ b/WebContent/Frame/page/resources/ueditor/third-party/video-js/video.dev.js @@ -4414,10 +4414,12 @@ vjs.SeekBar.prototype.onMouseMove = function(event){ }; vjs.SeekBar.prototype.onMouseUp = function(event){ + debugger vjs.Slider.prototype.onMouseUp.call(this, event); this.player_.scrubbing = false; if (this.videoWasPlaying) { + debugger this.player_.play(); } }; diff --git a/WebContent/Logon.jsp b/WebContent/Logon.jsp index dc2d63968..f98574db6 100644 --- a/WebContent/Logon.jsp +++ b/WebContent/Logon.jsp @@ -164,7 +164,7 @@ public boolean validUserPassword(HttpServletRequest request, Transaction Sqlca,S sql.append(sUserID); sql.append("' and (endtime is null or endtime = '') group by userid"); String num = Sqlca.getString(new SqlObject(sql.toString())); - if(null != num){ + if(null != num && !"80009U00000001".equals(sUserID) && !"administrator".equals(sUserID)){ throw new Exception("false"); } }else if("compulsive".equals(loginType)){ @@ -197,17 +197,17 @@ public boolean validUserPassword(HttpServletRequest request, Transaction Sqlca,S %> <% } catch (Exception e) { diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml index d8711176b..72ea8c453 100644 --- a/WebContent/META-INF/context.xml +++ b/WebContent/META-INF/context.xml @@ -1,20 +1,15 @@ - - - - + diff --git a/WebContent/ProductManage/ComponentConfig/ComponentRule.jsp b/WebContent/ProductManage/ComponentConfig/ComponentRule.jsp index a2486fc23..455bda6cb 100644 --- a/WebContent/ProductManage/ComponentConfig/ComponentRule.jsp +++ b/WebContent/ProductManage/ComponentConfig/ComponentRule.jsp @@ -94,9 +94,6 @@ if("ADJUST_INTEREST".equals(componentID)) { doTemp.setHtmlEvent("VALUE_ISADJUST_INTEREST", "onchange", "checkValueIsadjustInterest"); } - if("product_rate".equals(componentID)) { - doTemp.setHtmlEvent("VALUE_TERMTYPE", "onchange", "checkValueIsFixed"); - } dwTemp.ReadOnly = "0"; //设置是否只读 1:只读 0:可写 dwTemp.genHTMLObjectWindow(""); CurPage.setObjectWindowOutput(dwTemp.CurPage.getObjectWindowOutput()); @@ -135,35 +132,7 @@ if("ADJUST_INTEREST" == "<%=componentID%>") { checkValueIsadjustInterest(); } - if("product_rate" == "<%=componentID%>") { - checkValueIsFixed(); - } }) - function checkValueIsFixed(){ - debugger; - var valueIsFixed = getItemValue(0, 0, "VALUE_TERMTYPE"); - if("01" == valueIsFixed){ - setItemReadOnly(0, 0, "MINIMUMVALUE_TERMSCOPE", true); - setItemReadOnly(0, 0, "MAXIMUMVALUE_TERMSCOPE", true); - setItemRequired(0, "MINIMUMVALUE_TERMSCOPE", false); - setItemRequired(0, "MAXIMUMVALUE_TERMSCOPE", false); - setItemValue(0, 0, "MINIMUMVALUE_TERMSCOPE", ""); - setItemValue(0, 0, "MAXIMUMVALUE_TERMSCOPE", ""); - - setItemReadOnly(0, 0, "OPTIONALVALUE_INCOME_NUMBER", false); - setItemRequired(0, "OPTIONALVALUE_INCOME_NUMBER", true); - }else{ - setItemReadOnly(0, 0, "OPTIONALVALUE_INCOME_NUMBER", true); - setItemRequired(0, "OPTIONALVALUE_INCOME_NUMBER", false); - setItemValue(0, 0, "OPTIONALVALUE_INCOME_NUMBER", ""); - - setItemReadOnly(0, 0, "MINIMUMVALUE_TERMSCOPE", false); - setItemReadOnly(0, 0, "MAXIMUMVALUE_TERMSCOPE", false); - setItemRequired(0, "MINIMUMVALUE_TERMSCOPE", true); - setItemRequired(0, "MAXIMUMVALUE_TERMSCOPE", true); - } - - } //利率类型JS校验 function checkValueIsadjustInterest() { diff --git a/WebContent/ProductManage/ParameterConfig/ParameterInfo.jsp b/WebContent/ProductManage/ParameterConfig/ParameterInfo.jsp index 9d2571af7..bebe2fbb6 100644 --- a/WebContent/ProductManage/ParameterConfig/ParameterInfo.jsp +++ b/WebContent/ProductManage/ParameterConfig/ParameterInfo.jsp @@ -100,7 +100,7 @@ include file="/Frame/resources/include/ui/include_info.jspf"%> $(this).parent().show(); } } - else if("2"==dataType || "5"==dataType || "6"==dataType || "7"==dataType){ + else if("2"==dataType || "5"==dataType || "6"==dataType){ if(this.value=="MINIMUMVALUE" || this.value=="MAXIMUMVALUE" || this.value=="VALUE"){ $(this).parent().show(); } diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp index 0a5550ba8..34dcdadc7 100644 --- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp +++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp @@ -69,7 +69,7 @@ String projectId = flow.getAttribute("proj_id").getString(); //判断是否存在，不存在就从配置表倒到临时表 - DocListInitAction.initDocList(docParam,other,docClassItemno,CurConfig,Sqlca); + DocListInitAction.initDocList(docParam,other,docClassItemno,CurConfig); ASObjectModel doTemp = new ASObjectModel(sTempletNo); String otherWhere=DocListInitAction.getFlowWhere(flow,"","rela"); doTemp.appendJboWhere(otherWhere); diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentUpload.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentUpload.jsp index f2a26fd30..57c2f64b5 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentUpload.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentUpload.jsp @@ -1,30 +1,100 @@ +<%@page import="java.io.File"%> <%@page import="java.net.URLDecoder"%> +<%@page import="org.apache.commons.io.FileUtils"%> <%@page import="com.amarsoft.are.jbo.impl.BizObjectTableMapper"%> <%@page import="com.amarsoft.awe.util.DBKeyHelp"%> <%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %> <%@ page import="com.amarsoft.dict.als.manage.NameManager" %> <%@page import="com.amarsoft.awe.common.attachment.*"%> <%@ page import="com.tenwa.doc.action.DocListInitAction" %> +<%@page import="org.apache.commons.fileupload.FileItem"%> +<%@page import="org.apache.commons.fileupload.servlet.ServletFileUpload"%> +<%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"%> <%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/IncludeBegin.jsp"%><% - AmarsoftUpload myAmarsoftUpload = new AmarsoftUpload(); - myAmarsoftUpload.initialize(pageContext); - myAmarsoftUpload.upload(); - - String oneClassify=(String)myAmarsoftUpload.getRequest().getParameter("ONE_CLASSIFY");//一级分类 +<%@ include file="/IncludeBegin.jsp"%> + +<% +// AmarsoftUpload myAmarsoftUpload = new AmarsoftUpload(); +// myAmarsoftUpload.initialize(pageContext); +// myAmarsoftUpload.upload(); + + //1.创建DiskFileItemFactory对象，配置缓存用 + DiskFileItemFactory diskFileItemFactory = new DiskFileItemFactory(); + + // 2. 创建 ServletFileUpload对象 + ServletFileUpload servletFileUpload = new ServletFileUpload(diskFileItemFactory); + + // 3. 设置文件名称编码 +// servletFileUpload.setHeaderEncoding("UTF-8"); + + List items = servletFileUpload.parseRequest(request); + +// String libraryId = "";//附件业务数据表编号 + String inputTime = StringFunction.getTodayNow(); //附件编号上传时间 + long fileSize = 0l; //文件大小 + String contentType = ""; //文件类型 + String sFileName = ""; //文件名称 + String fileId = ""; + String objectType = ""; + + String oneClassify = ""; + String docId = ""; + String Remark = ""; + String cust_id = ""; + String flowunid = ""; + String ObjectType = ""; + + InputStream is = null; + + for (FileItem fileItem : items) { + if (fileItem.isFormField()) { // >> 普通数据 + String fieldValue = fileItem.getString("GB18030"); + String fieldName = fileItem.getFieldName(); + + if("ONE_CLASSIFY".equals(fieldName)) { + oneClassify = fieldValue; + } else if("DOC_NAME".equals(fieldName)) { + docId = fieldValue; + } else if("REMARK".equals(fieldName)) { + Remark = fieldValue; + } else if("CUST_ID".equals(fieldName)) { + cust_id = fieldValue; + } else if("FLOWUNID".equals(fieldName)) { + flowunid = flowunid != null && !"".equals(flowunid) ? flowunid : fieldValue; + } else if("OBJECTTYPE".equals(fieldName)) { + ObjectType = fieldValue; + } + ARE.getLog().info(fieldName + ": " + fieldValue); + } else { + //获取文件的实际内容 + is = fileItem.getInputStream(); + contentType = fileItem.getContentType(); + sFileName = fileItem.getName(); + fileSize = fileItem.getSize(); + } + } + + +// String oneClassify=(String)myAmarsoftUpload.getRequest().getParameter("ONE_CLASSIFY");//一级分类 oneClassify = oneClassify==null?"004001":oneClassify; - String docId=(String)myAmarsoftUpload.getRequest().getParameter("DOC_NAME"); //二级分类 - String sFileName = myAmarsoftUpload.getFiles().getFile(0).getFileName(); //文件名称 - String Remark= (String)myAmarsoftUpload.getRequest().getParameter("REMARK"); //备注 - String cust_id=(String)myAmarsoftUpload.getRequest().getParameter("CUST_ID"); //客户ID +// String docId=(String)myAmarsoftUpload.getRequest().getParameter("DOC_NAME"); //二级分类 +// String sFileName = fileName; //myAmarsoftUpload.getFiles().getFile(0).getFileName(); //文件名称 +// System.out.println("文件名UTF-8：" + new String(sFileName.getBytes(), "UTF-8")); +// System.out.println("文件名GBK：" + new String(sFileName.getBytes(), "GBK")); +// System.out.println("文件名GB18030：" + new String(sFileName.getBytes(), "GB18030")); +// String Remark= (String)myAmarsoftUpload.getRequest().getParameter("REMARK"); //备注 +// System.out.println("备注UTF-8：" + new String(Remark.getBytes(), "UTF-8")); +// System.out.println("备注GBK：" + new String(Remark.getBytes(), "GBK")); +// System.out.println("备注GB18030：" + new String(Remark.getBytes(), "GB18030")); +// String cust_id=(String)myAmarsoftUpload.getRequest().getParameter("CUST_ID"); //客户ID BizObject docconfig=JBOFactory.createBizObjectQuery("jbo.app.tenwa.doc.LB_DOCCONFIG","id=:id").setParameter("id", docId).getSingleResult(false); String docName=docconfig.getAttribute("DOC_NAME").getString(); String docType=docconfig.getAttribute("DOC_TYPE").getString();//资料类型 String doc_Class_Itemno=docconfig.getAttribute("DOC_CLASS_ITEMNO").getString();//资料类型 String libraryId=""; //附件编号 String InputTime= StringFunction.getTodayNow(); //附件上传时间 - String flowunid= (String)myAmarsoftUpload.getRequest().getParameter("FLOWUNID"); //流程号 - String ObjectType=(String)myAmarsoftUpload.getRequest().getParameter("OBJECTTYPE");//流程类型 +// String flowunid= (String)myAmarsoftUpload.getRequest().getParameter("FLOWUNID"); //流程号 +// String ObjectType=(String)myAmarsoftUpload.getRequest().getParameter("OBJECTTYPE");//流程类型 String otherParamWhere=""; if(oneClassify==null){oneClassify="";}else if(oneClassify.length()>1){otherParamWhere=otherParamWhere+" and One_Classify=:oneClassify";} @@ -109,8 +179,8 @@ attr.setAttributeValue("FlowUnid", flowunid); //得到不带路径的文件名 - sFileName = StringFunction.getFileName(sFileName); - sFileName = URLDecoder.decode(URLDecoder.decode(sFileName,"utf-8"),"utf-8"); +// sFileName = StringFunction.getFileName(sFileName); +// sFileName = URLDecoder.decode(URLDecoder.decode(sFileName,"utf-8"),"utf-8"); //定义数据库操作变量 SqlObject so = null; String sNewSql = ""; @@ -121,26 +191,30 @@ String trueTable = ((BizObjectTableMapper)attrBm).getTable(); //取得真实的表名 String sAttachmentNo = DBKeyHelp.getSerialNo(trueTable,"Id"); - if (!myAmarsoftUpload.getFiles().getFile(0).isMissing()){ +// if (!myAmarsoftUpload.getFiles().getFile(0).isMissing()){ try { String uuid=java.util.UUID.randomUUID().toString().replaceAll("-", ""); String sFullPath =com.tenwa.officetempalte.util.FileOperatorUtil.getuploadFileDir(sFileSavePath) +uuid+"_"+sFileName; //com.amarsoft.awe.common.attachment.FileNameHelper.getFullPath(libraryId, sAttachmentNo,sFileName, sFileSavePath, sFileNameType, application); - myAmarsoftUpload.getFiles().getFile(0).saveAs(sFullPath); +// myAmarsoftUpload.getFiles().getFile(0).saveAs(sFullPath); + //保存文件 + File targetFile = new File(sFullPath); + ; + FileUtils.copyInputStreamToFile(is, new File(sFullPath)); //得到带相对路径的文件名 String sFilePath = sFullPath.replace(sFileSavePath, ""); attr.setAttributeValue("FilePath",sFilePath); attr.setAttributeValue("FullPath",sFullPath); - attr.setAttributeValue("Content_Type",DataConvert.toString(myAmarsoftUpload.getFiles().getFile(0).getContentType())); - attr.setAttributeValue("FileSize",DataConvert.toString(String.valueOf(myAmarsoftUpload.getFiles().getFile(0).getSize()))); + attr.setAttributeValue("Content_Type",contentType); + attr.setAttributeValue("FileSize",fileSize); attrBm.saveObject(attr); - myAmarsoftUpload = null; +// myAmarsoftUpload = null; }catch(Exception e){ e.printStackTrace(); out.println("An error occurs : " + e.toString()); attrBm.deleteObject(attr); - myAmarsoftUpload = null; +// myAmarsoftUpload = null; %> <% } - } +// } %> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandataList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandataList.jsp index 9d326f8d2..28331c9c1 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandataList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/BigdataPengyuan/query_report/pengyuandataList.jsp @@ -7,7 +7,6 @@ */ String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String ProjectId = CurPage.getParameter("ProjectId");//流程编号 - String SubjectId = CurPage.getParameter("SubjectId");//主体编号 String flag = "true"; /* String flowunid = CurPage.getParameter("ObjectNo"); String projectNo = CurPage.getParameter("ProjectNo"); @@ -43,7 +42,7 @@ var fullcertId = getItemValue(0,getRow(0),'certId'); var fullrelation = getItemValue(0,getRow(0),'relation'); var fullphone = getItemValue(0,getRow(0),'phone'); - var params = 'ProjectId='+'<%=ProjectId%>'+'&fullName='+fullName+'&fullcertId='+fullcertId+'&fullrelation='+fullrelation+'&fullphone='+fullphone+'&GetType='+getType+'&SubjectId='+'<%=SubjectId%>'; + var params = 'ProjectId='+'<%=ProjectId%>'+'&fullName='+fullName+'&fullcertId='+fullcertId+'&fullrelation='+fullrelation+'&fullphone='+fullphone+'&GetType='+getType; AsControl.OpenView(sUrl,params,'_self',''); } function newRecord(){ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LDeductionsWayInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LDeductionsWayInfo.jsp deleted file mode 100644 index b2059edb9..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LDeductionsWayInfo.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%@page import="com.itextpdf.text.log.SysoCounter"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@include file="/Frame/resources/include/include_begin_info.jspf"%><% - - - String sPrevUrl = CurPage.getParameter("PrevUrl"); - if(sPrevUrl == null) sPrevUrl = "Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LDeductionsWayList.jsp"; - String sTempletNo = "DeductionsWayInfo";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - dwTemp.ReadOnly = "0";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); - - String sButtons[][] = { - {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""}, - }; -%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LDeductionsWayList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LDeductionsWayList.jsp deleted file mode 100644 index 395b33b32..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LDeductionsWayList.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - - String PG_TITLE = "扣款方式"; // 浏览器窗口标题 PG_TITLE - - ASObjectModel doTemp = new ASObjectModel("DeductionsWayList"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - //dwTemp.MultiSelect = true; //多选 - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(30); - dwTemp.genHTMLObjectWindow(""); - String sButtons[][] = { - {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, - {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LSendTextMmessageInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LSendTextMmessageInfo.jsp deleted file mode 100644 index f4ef2ef67..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LSendTextMmessageInfo.jsp +++ /dev/null @@ -1,44 +0,0 @@ -<%@page import="com.itextpdf.text.log.SysoCounter"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@include file="/Frame/resources/include/include_begin_info.jspf"%><% - - - String sPrevUrl = CurPage.getParameter("PrevUrl"); - if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LSendTextMmessageList.jsp"; - String sTempletNo = "SendTextMmessageInfo";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - dwTemp.ReadOnly = "0";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); - - String sButtons[][] = { - {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""}, - }; -%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LSendTextMmessageList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LSendTextMmessageList.jsp deleted file mode 100644 index 297fff569..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LSendTextMmessageList.jsp +++ /dev/null @@ -1,46 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - - String PG_TITLE = "短信发送"; // 浏览器窗口标题 PG_TITLE - - ASObjectModel doTemp = new ASObjectModel("SendTextMmessageList"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - //dwTemp.MultiSelect = true; //多选 - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(30); - dwTemp.genHTMLObjectWindow(""); - String sButtons[][] = { - {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, - {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/MoreThemeMaintenanceInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/MoreThemeMaintenanceInfo.jsp deleted file mode 100644 index 8a7b5fb79..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/MoreThemeMaintenanceInfo.jsp +++ /dev/null @@ -1,58 +0,0 @@ -<%@page import="com.itextpdf.text.log.SysoCounter"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@include file="/Frame/resources/include/include_begin_info.jspf"%><% - - - String sPrevUrl = CurPage.getParameter("PrevUrl"); - if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/MoreThemeMaintenanceList.jsp"; - String sTempletNo = "LB_MANY_SUBJECT_INFO";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - //dwTemp.ReadOnly = "0";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); - - String sButtons[][] = { - {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""}, - }; -%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/MoreThemeMaintenanceList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/MoreThemeMaintenanceList.jsp deleted file mode 100644 index 5f74f85d2..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/MoreThemeMaintenanceList.jsp +++ /dev/null @@ -1,46 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - - String PG_TITLE = "多主体维护"; // 浏览器窗口标题 PG_TITLE - - ASObjectModel doTemp = new ASObjectModel("LB_MANY_SUBJECT_LIST"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - //dwTemp.MultiSelect = true; //多选 - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(30); - dwTemp.genHTMLObjectWindow(""); - String sButtons[][] = { - {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, - {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp deleted file mode 100644 index e619bf66e..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp +++ /dev/null @@ -1,82 +0,0 @@ -<%@page import="com.itextpdf.text.log.SysoCounter"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@include file="/Frame/resources/include/include_begin_info.jspf"%><% - - String Id = CurPage.getParameter("ID"); - String sPrevUrl = CurPage.getParameter("PrevUrl"); - if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceList.jsp"; - String sTempletNo = "LPoundageMaintenanceInfo";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - doTemp.setHtmlEvent("charge_channel", "onchange", "getChargeWay"); - doTemp.setHtmlEvent("expiry_date", "onchange", "isEndTime"); - doTemp.setHtmlEvent("start_date", "onchange", "isStartTime"); - if(Id!=null){ - String sql = "SELECT id FROM LPOUNDAGE_MAINTENANCE WHERE charge_channel='"+CurPage.getParameter("chargeChannel")+"' AND charge_way='"+CurPage.getParameter("chargeWay")+"' AND DATE_FORMAT("+CurPage.getParameter("startDate")+",'%Y/%m/%d')<%@ include file="/Frame/resources/include/ui/include_info.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceList.jsp deleted file mode 100644 index 1b4b18a50..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceList.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - - String PG_TITLE = "扣款渠道手续费率维护"; // 浏览器窗口标题 PG_TITLE - - ASObjectModel doTemp = new ASObjectModel("LPoundageMaintenanceList"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - //dwTemp.MultiSelect = true; //多选 - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(30); - dwTemp.genHTMLObjectWindow(""); - String sButtons[][] = { - {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, - {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp index 34e3c54ee..dbc2353f4 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp @@ -40,9 +40,7 @@ }else{ product_id=flow.getAttribute("productId").toString(); } - String businesstype = Sqlca.getString("select businesstype from LB_CONTRACT_INFO_TEMP where flowunid = '"+sFlowUnid+"'"); - String SUBJECTID = Sqlca.getString("select SUBJECTID from LB_CONTRACT_INFO_TEMP where flowunid='"+sFlowUnid+"'"); - String subject = Sqlca.getString("select subject_name from LB_MANY_SUBJECT where id='"+SUBJECTID+"'"); + String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 String FlowNo=CurPage.getParameter("FlowNo");//流程名称 String NodeNo=CurPage.getParameter("NodeNo");//流程名称 @@ -56,7 +54,6 @@ if(("0030".equals(sPhaseNo)&&("ContractApprovalFlow".equals(FlowNo)||"ContractChangeFlow".equals(FlowNo)))){ sTempletNo="LBContractInfoAtMakeTemp"; } - String orgid = CurUser.getOrgID();//当前用户部门id String orgidname = CurUser.getOrgName();//当前用户部门 String userid = CurUser.getUserID();//用户id @@ -83,18 +80,6 @@ }else{ doTemp.setColInnerBtEvent("PROJECT_ASSIST_NAME", ""); } - - /* - "2"传统 - "3"汽车类传统 - 主题名称为"2","3"状态时字段必填，否则字段为只读并且对话框隐藏掉 - */ - if("2".equals(businesstype) || "3".equals(businesstype)){ - doTemp.setRequired("subject_name",true); - }else{ - doTemp.setRequired("subject_name",false); - doTemp.setColInnerBtEvent("subject_name", ""); - } doTemp.setDefaultValue("FlowUnid", sFlowUnid);//赋值流程编号 if("TAssetsDisposalFeeFlow".equals(FlowNo)){ doTemp.setReadOnly("CONTRACT_NUMBER", true); @@ -110,7 +95,6 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ dwTemp.ReadOnly = "-2";//只读模式 } - dwTemp.genHTMLObjectWindow(sFlowUnid + "," + sContractId + "," + businesstype + "," + SUBJECTID + "," + subject); if(isShowForaml.equals("true")){ dwTemp.genHTMLObjectWindow(sContractId); }else{ @@ -183,17 +167,6 @@ setItemValue(0,getRow(),"PROJECT_ASSIST",sReturn[0]); },"请选项目协办"); } - //请选择主题名称 - function selectaaaa(){ - AsDialog.OpenSelector("SelectAAAA","","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; - } - sReturn = sReturn.split("@");//"@"表示了向页面添加数据时的连续性 - setItemValue(0,getRow(),"subject_name",sReturn[0]);//向页面的框中添加数据 - },"请选择主题"); - } <%/*~END~*/%> @@ -287,20 +260,6 @@ init(); - - function selectManySubject(){ - AsDialog.OpenSelector("selectManySubject","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", - function(sReturn){ - if(!sReturn||sReturn=="_CANCEL_"||sReturn=="") - { - //alert(getHtmlMessage('1'));//请选择一条信息！ - return; - } - sReturn = sReturn.split("@"); - setItemValue(0,0,"subjectid",sReturn[0]); - setItemValue(0,0,"subjectname",sReturn[1]); - },"请选择客户",''); - } <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index 385090537..9443cb74b 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -13,8 +13,6 @@ String productId = CurPage.getParameter("ProductId"); String flowunid = CurPage.getParameter("FlowUnid"); String action = CurPage.getParameter("action"); - String SubjectId=CurPage.getParameter("SubjectId");//获取主体ID - ASObjectModel doTemp = new ASObjectModel("LBContractPrintList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- @@ -123,7 +121,7 @@ } //自然人电子签约 - var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>,,SubjectId=<%=SubjectId%>"); + var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>"); var sReturns = sReturn.split("@"); if("success"==sReturns[0]){ AsDebug.showMessage("提示","电子签约发起成功!","","",true,"","","",function(){ @@ -167,7 +165,7 @@ AsDebug.showMessage("提示","没有发起电子签约,无法获取签约状态！","","",true); return; } - var sParams="ProjectId=<%=projectId%>,customerType=<%=custtype%>,FlowUnid=<%=flowunid%>,CurUserID=<%=CurUser.getUserID()%>,SubjectId=<%=SubjectId%>"; + var sParams="ProjectId=<%=projectId%>,customerType=<%=custtype%>,FlowUnid=<%=flowunid%>,CurUserID=<%=CurUser.getUserID()%>"; var sReturn=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","contractSignStatus",sParams); AsDebug.showMessage("提示",sReturn,"","",true,'','','',function(){ <%-- var sReturns = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDoc","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>"); --%> @@ -315,7 +313,7 @@ AsDebug.showMessage("提示","没有发起电子签约,无法发送短信！","","",true); return; } - var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","sendMessageAgain","ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>"); + var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","sendMessageAgain","ProjectId=<%=projectId%>"); if("success"==sReturn){ AsDebug.showMessage("提示","短信发送成功！","","",true); }else{ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index e07fcea22..670b18bdf 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -26,8 +26,6 @@ String flowName=CurPage.getParameter("FlowName");//获取合同名称 String contractid=CurPage.getParameter("ContractId");//获取合同id String isnetcar=CurPage.getParameter("isNetCar");//获取是否是网约车 - String SubjectId=CurPage.getParameter("SubjectId");//获取主体ID - if(null==contractNo ||"null".equals(contractNo) ){ contractNo=FlowKey; } @@ -174,7 +172,7 @@ $('#A_Group_0010').css('display','none'); $('#A_Group_0020').css('display','none'); } - var sReturn = RunJavaMethodSqlca("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","getContractClass","leasform="+"<%=leasform%>"+",isNetCar="+"<%=CurPage.getParameter("isNetCar")%>"+",operationType="+operationType+",SubjectId=<%=SubjectId%>"); + var sReturn = RunJavaMethodSqlca("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","getContractClass","leasform="+"<%=leasform%>"+",isNetCar="+"<%=CurPage.getParameter("isNetCar")%>"+",operationType="+operationType); var jsonData=eval("("+sReturn+")"); initFileTemplate(eval("("+jsonData[0].fileTemplate+")")); // initOneClass(); @@ -353,7 +351,7 @@ return; } if(("01"=="<%=customertype%>"&&"Auto" == "<%=sealType%>" )||("Auto" == "<%=sealType%>" && "Hand" == "<%=signType%>" )){ - var falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>"); + var falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>"); if("success"!= falg ){ RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","companyUpdateDocContractStatus","FlowUnid=<%=flowunid%>"+",ProjectId=<%=projectId%>"); alert("生成失败！！！"); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp deleted file mode 100644 index 1ca2ef0fe..000000000 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp +++ /dev/null @@ -1,139 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@page import="jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%> -<% - /* - Author: undefined 2017-07-10 - Content: 示例详情页面 - History Log: - */ - String projectId = CurPage.getParameter("ProjectId"); - String RightType=CurPage.getParameter("RightType"); - String ishistory=CurPage.getParameter("IsHistory"); - String ApplyType=CurPage.getParameter("ApplyType"); - String CustomerType=CurPage.getParameter("CustomerType"); - String customerId = CurPage.getParameter("customerId"); - String FlowUnid=CurPage.getParameter("FlowUnid"); - String contractId = CurPage.getParameter("ContractId"); - - String sTempletNo = "DebitCardInfoMcontract";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - doTemp.setHtmlEvent("acc_number", "onchange", "getNameOfBank"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - - if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ - dwTemp.ReadOnly = "-2";//只读模式 - RightType="ReadOnly"; - isShowButton=false; - }else{ - isShowButton=true; - } - dwTemp.genHTMLObjectWindow(projectId); - - String sButtons[][] = { - {"true","","Button","保存","保存所有修改","save()","","","",""} - } ; - - sButtonPosition = "north"; -%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/Change.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/Change.jsp index 12776d142..eba65b9e9 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/Change.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/Change.jsp @@ -8,7 +8,7 @@ %><%@include file="/Resources/CodeParts/Frame02.jsp"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp index 83dd4e62c..a9bf722d3 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp @@ -9,7 +9,6 @@ String flowunid = CurPage.getParameter("FlowUnid"); String contractid = CurPage.getParameter("ContractId"); String customerType = CurPage.getParameter("CustomerType"); - String projectId = CurPage.getParameter("ProjectId"); String falg = "false"; if("03".equals(customerType)){ falg = "true"; @@ -34,12 +33,6 @@ %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp index fdaa86cd5..2d71dfef2 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp @@ -6,7 +6,6 @@ History Log: */ String PhaseNo = CurPage.getParameter("PhaseNo"); - String SubjectId = CurPage.getParameter("SubjectId"); String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 ASObjectModel doTemp = new ASObjectModel("LbCarCreditTempList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); @@ -32,7 +31,7 @@ return; } var result = - RunJavaMethodTrans("com.tenwa.comm.credit.CreditBodyGuardAction","doCreditVerification","flowunid="+sFlowUnid+",phaseno="+PhaseNo+",certids="+certids+",SubjectId="+"<%=SubjectId%>"); + RunJavaMethodTrans("com.tenwa.comm.credit.CreditBodyGuardAction","doCreditVerification","flowunid="+sFlowUnid+",phaseno="+PhaseNo+",certids="+certids); if(result == 'ERROR'){ alert("调用数据失败"); reloadSelf(); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp index fffeb95d2..668f43469 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp @@ -193,20 +193,6 @@ function init(){ init(); - function selectManySubject(){ - AsDialog.OpenSelector("selectManySubject","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", - function(sReturn){ - if(!sReturn||sReturn=="_CANCEL_"||sReturn=="") - { - //alert(getHtmlMessage('1'));//请选择一条信息！ - return; - } - sReturn = sReturn.split("@"); - setItemValue(0,0,"subjectid",sReturn[0]); - setItemValue(0,0,"subjectname",sReturn[1]); - },"请选择客户",''); - } - <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp index aba228b5e..e52704c05 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp @@ -10,8 +10,6 @@ String ProjectId = CurPage.getParameter("ProjectId"); String flowunid = CurPage.getParameter("ObjectNo"); ASObjectModel doTemp = new ASObjectModel("LbTelOnlinList"); - String SubjectId = CurPage.getParameter("SubjectId");//主体编号 - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 @@ -33,7 +31,7 @@ alert("请先选择数据！！！"); return; } - var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.validate.OnlineClient","getTelOnLine","flowunid=<%=flowunid%>,projectId=<%=ProjectId%>,userId=<%=userId%>,SubjectId=<%=SubjectId%>,certids="+certids); + var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.validate.OnlineClient","getTelOnLine","flowunid=<%=flowunid%>,projectId=<%=ProjectId%>,userId=<%=userId%>,certids="+certids); if(result=="true"){ window.location.reload(); }else{ @@ -41,6 +39,7 @@ } } function retry(){ + debugger; // var onLineId = getItemValue(0,getRow(0),'online_id'); // var certids=getItemValueArray(0,"certid"); var online_ids=getItemValueArray(0,"online_id"); @@ -55,9 +54,8 @@ }; } for(var i=0;i"); --%> - var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.validate.OnlineClient","getTelOnLineReTry","onLineId="+onLineId+",userId=<%=userId%>,SubjectId=<%=SubjectId%>"); +<%-- var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.validate.OnlineClient","getTelOnLineReTry","onLineId="+online_ids[i]+",userId=<%=userId%>"); --%> + var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.validate.OnlineClient","getTelOnLineReTry","onLineId="+1111+",userId=<%=userId%>"); if(result=="true"){ number++; }else{ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/QuotationList/QuotationList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/QuotationList/QuotationList.jsp index 40b1fd7c2..6e8ac152e 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/QuotationList/QuotationList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/QuotationList/QuotationList.jsp @@ -10,17 +10,17 @@ Content: History Log: */ - String flowunid=CurPage.getParameter("FlowUnid"); - BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid); - String product_id=flow.getAttribute("productId").toString(); - String planinformation=ProductParamUtil.getProductParameterValue(product_id,"PRD0314","planinformation");//方案类型 - BizObject lc_calc_condition=JBOFactory.getBizObjectManager(LC_CALC_CONDITION_TEMP.CLASS_NAME).createQuery("FlowUnid=:FlowUnid").setParameter("FlowUnid", flowunid).getSingleResult(false); - String PROJECT_PLAN_NUMBER=""; - String CONTRACT_PLAN_NUMBER=""; - if(lc_calc_condition!=null){ - PROJECT_PLAN_NUMBER=lc_calc_condition.getAttribute("project_plan_number").getString(); - CONTRACT_PLAN_NUMBER=lc_calc_condition.getAttribute("contract_plan_number").getString(); - } + String flowunid=CurPage.getParameter("FlowUnid"); +BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid); +String product_id=flow.getAttribute("productId").toString(); +String planinformation=ProductParamUtil.getProductParameterValue(product_id,"PRD0314","planinformation");//方案类型 +BizObject lc_calc_condition=JBOFactory.getBizObjectManager(LC_CALC_CONDITION_TEMP.CLASS_NAME).createQuery("FlowUnid=:FlowUnid").setParameter("FlowUnid", flowunid).getSingleResult(false); +String PROJECT_PLAN_NUMBER=""; +String CONTRACT_PLAN_NUMBER=""; +if(lc_calc_condition!=null){ + PROJECT_PLAN_NUMBER=lc_calc_condition.getAttribute("project_plan_number").getString(); + CONTRACT_PLAN_NUMBER=lc_calc_condition.getAttribute("contract_plan_number").getString(); +} String plan_number=""; if("".equals(PROJECT_PLAN_NUMBER)||PROJECT_PLAN_NUMBER.length()==0){ plan_number=CONTRACT_PLAN_NUMBER; diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index c1a364b66..fa86b174f 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -61,8 +61,7 @@ var isNetCar = sReturn[7]; var signType = sReturn[9]; var sealType = sReturn[10]; - - if(flowno=="BContractApproveApply"&&"03" == customertype){ + if("03" == customertype){ if(""== signType||null == signType||"undefined" == signType){ alert("请在产品中配置签约方式！！！"); return ; @@ -72,22 +71,13 @@ return ; } } - var gpsVendor = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.GpsVendorCheck","getGpsVendor","productId="+product_id); var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor; sParams =sParams+",signType="+signType+",sealType="+sealType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",ProductId="+product_id+",ProjectId="+id+",ProjectNo="+project_id+",customertype="+customertype+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; if(flowno=="BContractApproveApply"){ - sParams =sParams+",operationType="+sReturn[8]+",SubjectId="+sReturn[11]+",SubjectName="+sReturn[12]; - }else{ - var SubjectName = ""; - var messages = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","selectTitleName","SubjectId="+sReturn[5]); - message = messages.split("@"); - if("error"!=message[0]){ - SubjectName = message[1]; - } - sParams =sParams+",SubjectId="+sReturn[5]+",SubjectName="+SubjectName; - } + sParams =sParams+",operationType="+sReturn[8]; + } var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.contractapproval.ContractApprovalStartAction","initFLow",sParams); diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp index 0dba4546e..891952d37 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp @@ -34,9 +34,6 @@ var signType = sReturn[12]; var sealType = sReturn[11]; - var SubjectId = sReturn[13]; - var SubjectName = sReturn[14]; - if("03" == customertype){ if(""== signType||null == signType||"undefined" == signType){ alert("请在产品中配置签约方式！！！"); @@ -47,13 +44,10 @@ return ; } } - if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){ - alert("该数据没有对应的主体，请联系管理员！"); - return ; - } + var gpsVendor = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.GpsVendorCheck","getGpsVendor","productId="+product_id); var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor; - sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",signType="+signType+",sealType="+sealType+",operationType="+operationType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",signType="+signType+",sealType="+sealType+",operationType="+operationType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); @@ -65,7 +59,7 @@ else { var mes=sReturnInfos[1]; - alert(sReturnInfos); + alert(mes); } reloadSelf(); },"请选择发起编号"); diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/BCpayInfoLog.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/BCpayInfoLog.jsp index 7749add10..37493e65b 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/BCpayInfoLog.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/BCpayInfoLog.jsp @@ -46,6 +46,7 @@ Ids += "@"+getItemValue(0,rows[i],"ID"); } Ids = Ids.substring(1); + debugger; var result = RunJavaMethodTrans("paymentInfoUpdate.UpdatePaymentInfo","requestAndAction","Ids="+Ids); if("SUCCESS" == result){ AsDebug.showMessage("提示","操作成功！","","",true); diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlanList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlanList.jsp deleted file mode 100644 index dc73663a0..000000000 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/VIActualFundPlanList.jsp +++ /dev/null @@ -1,45 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - /* - Author: undefined 2017-12-28 - Content: - History Log: - */ - - String ishistory = CurPage.getAttribute("IsHistory"); - ASObjectModel doTemp = new ASObjectModel("VIActualFundPlan"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - /*if(!ishistory.equals("true")&&"0010".equals(phaseNo)){ - dwTemp.MultiSelect = true; //多选 - }*/ - dwTemp.ShowSummary="1"; //汇总 - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(pageSize == null ? 30 : Integer.parseInt(pageSize)); - dwTemp.genHTMLObjectWindow(""); - - String[][] sButtons = new String[][]{ - {"true","All","Button","退回经销商","退回经销商","paymentReturn()","","","","btn_icon_add",""} - }; - - -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp index 405206c64..46f5b293e 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp @@ -6,19 +6,16 @@ /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ function newApply(){ var orgId="<%=CurUser.getOrgID()%>".substring(0,7); - var twoParam = ""; var businessType=""; if(orgId=="8009010"){ businessType="传统"; - twoParam = "空白"; }else if(orgId=="8009011"){ businessType="汽车"; - twoParam = "汽车类传统"; }else{ alert("当前用户不能发起申请！"); return; } - AsDialog.OpenSelector("SelectEbankData","businessType,"+businessType+",twoParam,"+twoParam,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + AsDialog.OpenSelector("SelectEbankData","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ return; } diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/LCEbankTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/LCEbankTempInfo.jsp index e70093dee..350c62438 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/LCEbankTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/LCEbankTempInfo.jsp @@ -1,5 +1,4 @@ <%@ page contentType="text/html; charset=GBK"%> -<%@ page import="com.tenwa.flow.lease.check.contract.IsNullCheck" %> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% /* Author: undefined 2017-06-02 @@ -8,82 +7,26 @@ */ String sPrevUrl = CurPage.getParameter("PrevUrl"); String ishistory = CurPage.getParameter("IsHistory"); - String flowUnid = CurPage.getParameter("FlowUnid"); - String flowNo = CurPage.getParameter("FlowNo"); - //FlowKey中存的是EBANK_SN网银流水号 - String ebankSn = CurPage.getParameter("FlowKey"); if(sPrevUrl == null) sPrevUrl = ""; String sTempletNo = "LCEbankTempInfo";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); - if("TFundCollectionFlow".equals(flowNo)){ - doTemp.setColumnAttribute("CUSTOMER_NAME", "colvisible", "0"); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 } - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - dwTemp.ReadOnly = "1";//只读模式 + dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(flowUnid); - IsNullCheck inc = new IsNullCheck(); - inc.setEBANK_SN(ebankSn); - inc.setFlowUnid(flowUnid); - String result = inc.CustomerIdIsNullCheck(); - String resultTemp = inc.CustomerIdIsNullCheckTemp(); - String customerId=""; - String customerName=""; - if(!"N".equals(inc.getCustomerId())){ - String [] customer = inc.getCustomerId().split("@"); - customerId = customer[0]; - customerName = customer[1]; - } + dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); - String flag; - if(result=="Y"){ - flag="true"; - }else{ - flag="false"; - } String sButtons[][] = { - {flag,"All","Button","保存","保存所有修改","saveRecord()","","","",""}, }; 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/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp index 2fbbf0484..797705dca 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp @@ -30,13 +30,6 @@ var proj_name = sReturn[4]; var contract_no = sReturn[5]; var customername = sReturn[6]; - //校验经销商额度是否充足 - var checkTotal = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","checkTotal","contractId="+contract_id); - if("true" !=checkTotal ){ - alert(checkTotal); - return ; - } - var gpsVendor = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.GpsVendorCheck","getGpsVendor","productId="+productId); var sParams = "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+(contract_no+"-"+customername)+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfoSelect.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfoSelect.jsp deleted file mode 100644 index f6072053a..000000000 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/LCFundPaymentTempInfoSelect.jsp +++ /dev/null @@ -1,41 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - /* - Author: undefined 2019-01-25 - Content: 示例详情页面 - History Log: - */ - String sPrevUrl = CurPage.getParameter("PrevUrl"); - if(sPrevUrl == null) sPrevUrl = ""; - 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"); - System.out.print(contractId); - String sTempletNo = "LCFundPaymentTempInfoSelect";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - //doTemp.setColTips("", "测试"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - //dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(contractId); - - String sButtons[][] = { - //{"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"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index a3c62d22f..13b98a676 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -46,12 +46,6 @@ }else{ isShowButton=true; } - if("业务申请流程".equals(flowName)&&("0030".equals(phaseNo)||"0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo)||"0070".equals(phaseNo))){ - dwTemp.getDataObject().setVisible("subjectname", true); - }else { - dwTemp.getDataObject().setVisible("subjectname", false); - } - if("0010".equals(phaseNo)){//经销商 dwTemp.setGroupHidden("0020,0030,0040,0050"); }else if("0030".equals(phaseNo)){//初审 diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp index d75801deb..a4ac6fd7b 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp @@ -33,7 +33,7 @@ } else { - var mes=sReturnInfos[0]; + var mes=sReturnInfos[1]; alert(mes); } reloadSelf(); @@ -54,7 +54,7 @@ } else { - var mes=sReturnInfos[1]; + var mes=sReturnInfos[0]; alert(mes); } reloadSelf(); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp index 8f6cafa62..e9ef557d6 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp @@ -13,7 +13,7 @@ return; } sReturn = sReturn.split("@"); - var id=sReturn[0]; + var id=sReturn[0] var product_id=sReturn[1]; var project_id = sReturn[2]; var project_name = sReturn[3]; @@ -22,14 +22,8 @@ var leasehold = sReturn[6]; var operationType = sReturn[7]; var certtype = sReturn[8]; - var SubjectId = sReturn[9]; - var SubjectName = sReturn[10]; - if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){ - alert("该数据没有对应的主体，请联系管理员！"); - return ; - } var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp index 21a6c3202..ce6469332 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp @@ -256,7 +256,6 @@ if(name.length > 0){ if(certid.length > 0){ - // 因港澳台居民通行证， 临时去除配偶身份证校验 /* if(certid.length!=18){ // parent.parent.openDWDialog(); setErrorTips("certid","身份证必须是18位！"); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 30b2d1d9c..7258d15f4 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -13,12 +13,8 @@ String flowunid = CurPage.getParameter("FlowUnid"); String FlowName = CurPage.getParameter("FlowName");//获取流程名称 String IsHistory = CurPage.getParameter("IsHistory");//获取流程名称 - String FlowNo=CurPage.getParameter("FlowNo");//流程名称 String projectId = CurPage.getParameter("ProjectId"); String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'"); - String businesstype = Sqlca.getString("select businesstype from LB_PROJECT_INFO_TEMP where FlowUnid='"+flowunid+"'"); - String SUBJECTID = Sqlca.getString("select SUBJECTID from LB_PROJECT_INFO_TEMP where FlowUnid='"+flowunid+"'"); - String subject = Sqlca.getString("select subject_name from LB_MANY_SUBJECT where id='"+SUBJECTID+"'"); String sTempletNo = "";//--模板号-- String sexChange=""; if("合同制作流程".equals(FlowName)||"合同变更流程".equals(FlowName)){ @@ -39,10 +35,6 @@ }else{ doTemp.setReadOnly("SEX", true); } - //数据状态为“汽车”字段为只读状态，不可修改 - if("1".equals(businesstype)){ - doTemp.setColInnerBtEvent("subject_name", "");//去掉选择对话框 - } doTemp.setHtmlEvent("MARRIAGE","onChange","changeChildrensNumber"); doTemp.setHtmlEvent("IS_NETCAR","onChange","changeNetCarInfo"); doTemp.setHtmlEvent("sex","onChange","changeSex"); @@ -58,7 +50,7 @@ doTemp.setColInnerBtEvent("fulladdress", "");//设置地址按钮 } dwTemp.Style = "2";//freeform - dwTemp.genHTMLObjectWindow(flowunid + "," + customerid + "," + businesstype + "," + SUBJECTID + "," + subject); + dwTemp.genHTMLObjectWindow(flowunid + "," + customerid); CurPage.getCurComp().setAttribute("RightType", rightType); if(rightType.equals("ReadOnly")||FlowName.equals("合同制作流程")){ dwTemp.ReadOnly = "-1";//只读模式 @@ -129,13 +121,10 @@ function changeFamilyRequired(){//已婚时设置配偶信息必填,并将婚姻状况参数传递到子页面 var marriage = getItemValue(0,getRow(0),"MARRIAGE"); if("01" == marriage){ - $("#frame_list")[0].contentWindow.changeFamilyRequiredTrue(marriage); - - //frame_list.window.changeFamilyRequiredTrue(marriage); + frame_list.window.changeFamilyRequiredTrue(marriage); //as_save("myiframe0","frame_list.window.as_save(0);"); }else{ - $("#frame_list")[0].contentWindow.changeFamilyRequiredFalse(marriage); - //frame_list.window.changeFamilyRequiredFalse(marriage); + frame_list.window.changeFamilyRequiredFalse(marriage); } } @@ -227,18 +216,7 @@ return; } } - //请选择主题名称 - function selectaaaa(){ - AsDialog.OpenSelector("SelectAAAA","","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; - } - sReturn = sReturn.split("@");//"@"表示了向页面添加数据时的连续性 - //setItemValue(0,getRow(),"titleName",sReturn[0]);//向页面的框中添加数据 - setItemValue(0,getRow(),"subject_name",sReturn[0]);//向页面的框中添加数据 - },"请选择主题"); - } + // function checkRepeat(mobile,emergencyTel,remark){ // var result = ""; // var mobile = getItemValue(0,getRow(),"mobile"); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index f7fb6cd90..9368f5c31 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -78,8 +78,7 @@ $("#A_div_0150").attr("style","display:none;"); }) var operationType=''; - var SubjectId=''; - function changeProductName(){//清空产品名称 + function changeProductName(){//清空产品名称 setItemValue(0,getRow(0),"productName",""); } @@ -158,15 +157,9 @@ return; } - var messages = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","selectTitleName","SubjectId="+SubjectId); - message = messages.split("@"); - if("error"==message[0]){ - alert(message[1]); - return; - } - 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; + sParams =sParams+",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; + // if("BAIC_MOTOR"==operationType){ sParams = sParams+",distributorNo="+getItemValue(0,getRow(),"distributorNo")+",distributorName="+getItemValue(0,getRow(),"distributorName"); } @@ -348,7 +341,6 @@ MyOjbect.modelid = sReturn[7];//车型ID MyOjbect.modelname = sReturn[8];//车型名称 operationType = sReturn[11]; - SubjectId = sReturn[12]; setItemValue(0,0,"productName",sReturn[2]); setItemValue(0,0,"productId",sReturn[3]); @@ -504,7 +496,6 @@ showItem(0,"product_id");//字段显示 } } - //initRow(); <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCEbankTemp.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCEbankTemp.jsp deleted file mode 100644 index 1d7527fa5..000000000 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCEbankTemp.jsp +++ /dev/null @@ -1,76 +0,0 @@ -<%@page import="jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP"%> -<%@page import="jbo.app.tenwa.calc.LC_EBANK_PROCESS"%> -<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - - String flowunid = CurPage.getParameter("FlowUnid"); - String phaseNo = CurPage.getParameter("PhaseNo"); - String rightType = CurPage.getParameter("RightType"); - String ishistory = CurPage.getParameter("IsHistory"); - String sTempletNo = CurPage.getParameter("TempletNo");//模板号 - ASObjectModel doTemp = new ASObjectModel("LCEbankListRebackTemp"); - if(null!=ishistory&&ishistory.equals("true")){ - doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory"); - } - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - - dwTemp.Style="1"; - dwTemp.ShowSummary = "1"; - dwTemp.ReadOnly = "1"; - if("0040".equals(phaseNo)){ - dwTemp.ReadOnly = "0"; - } - if(!"ReadOnly".equals(rightType)){ - dwTemp.MultiSelect = true; - } - - dwTemp.setPageSize(50); - ASDataObject ado = dwTemp.getDataObject(); - - dwTemp.genHTMLObjectWindow(flowunid); - - //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - String[][] sButtons = null; - if("ReadOnly".equals(rightType)){ - sButtons = new String[][]{ - }; - }else if("0010".equals(phaseNo)){ - sButtons = new String[][]{ - {"true","","Button","保存","保存","as_save(0)","","","","btn_icon_save",""}, - {"true","","Button","撤销","撤销","deleteProcess()","","","","btn_icon_delete",""} - }; - }else if("0040".equals(phaseNo)){ - sButtons = new String[][]{ - {"true","","Button","保存","保存","as_save(0)","","","","btn_icon_save",""}, - }; - } -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp deleted file mode 100644 index 69c4988d7..000000000 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp +++ /dev/null @@ -1,75 +0,0 @@ -<%@page import="jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP"%> -<%@page import="jbo.app.tenwa.calc.LC_EBANK_PROCESS"%> -<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - - String flowunid = CurPage.getParameter("FlowUnid"); - String phaseNo = CurPage.getParameter("PhaseNo"); - String rightType = CurPage.getParameter("RightType"); - String ishistory = CurPage.getParameter("IsHistory"); - String sTempletNo = CurPage.getParameter("TempletNo");//模板号 - ASObjectModel doTemp = new ASObjectModel("LCSplittingPayTempList"); - if(null!=ishistory&&ishistory.equals("true")){ - doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory"); - } - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - - dwTemp.Style="1"; - dwTemp.ShowSummary = "1"; - if(!"ReadOnly".equals(rightType)){ - dwTemp.MultiSelect = true; - } - dwTemp.ReadOnly = "1"; - if("0040".equals(phaseNo)){ - dwTemp.ReadOnly = "0"; - } - dwTemp.setPageSize(50); - ASDataObject ado = dwTemp.getDataObject(); - - dwTemp.genHTMLObjectWindow(flowunid); - - //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - String[][] sButtons = null; - if("ReadOnly".equals(rightType)){ - sButtons = new String[][]{ - }; - }else if("0010".equals(phaseNo)){ - sButtons = new String[][]{ - {"true","","Button","保存","保存","as_save(0)","","","","btn_icon_save",""}, - {"true","","Button","撤销","撤销","deleteProcess()","","","","btn_icon_delete",""} - }; - }else{ - sButtons = new String[][]{ - {"true","","Button","保存","保存","as_save(0)","","","","btn_icon_save",""}, - }; - } -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/OtherPayCarApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/OtherPayCarApplyList.jsp deleted file mode 100644 index 6a07f92e8..000000000 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/OtherPayCarApplyList.jsp +++ /dev/null @@ -1,27 +0,0 @@ -<%@page import="com.tenwa.util.SerialNumberUtil"%> -<%@ page contentType="text/html; charset=GBK"%> - <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf"%> -<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=自定义函数;]~*/%> - - <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/Splitting.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/Splitting.jsp deleted file mode 100644 index 30539b358..000000000 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/Splitting.jsp +++ /dev/null @@ -1,38 +0,0 @@ -<%@page import="com.amarsoft.are.util.json.JSONEncoder"%> -<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/IncludeBegin.jsp"%> -<% - //dwTemp.MultiSelect = true; //多选 - String flowunid = CurPage.getAttribute("FlowUnid"); - String PhaseNo = CurPage.getParameter("PhaseNo"); - String temp = "false"; - if("0010".equals(PhaseNo)){ - temp = "true"; - }; - //参数：0.是否显示, 1.标题, 2.JS事件字符串表示(TabContentFrame会替换为真实名称), 3. 是否缓存(默认是), 4. 是否有关闭按钮(默认无), 5. Strip高度(默认600px) - String sTabStrip[][] = { - {temp, "分润计划", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')","false"}, - {"true", "分润支付数据", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')", "false"}, - // {"true", "分润支付汇总数据", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')", "false"}, - }; - - //参数：0.是否显示, 1.权限, 2.类型, 3.按钮文字, 4.说明文字, 5.事件, 6.快捷键, 7.资源路径, 8.资源路径参数, 9.图标, 10.风格 - String sButtons[][] = { - }; - - // BeforeTabStripHtml-html - CurPage.setAttribute("BeforeTabStripHtml", Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig)); - - // TabStrip-JSON - CurPage.setAttribute("TabStrip", JSONEncoder.encode(sTabStrip)); - - // TabStripType-tab/strip 默认为tab - //CurPage.setAttribute("TabStripType", "strip"); - - // First-num 默认为0 - CurPage.setAttribute("First", "0"); - -%> -<%@ include file="/Frame/resources/include/ui/include_tabstrip.jspf"%> -<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp deleted file mode 100644 index e8c10a189..000000000 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp +++ /dev/null @@ -1,60 +0,0 @@ -<%@page import="jbo.app.tenwa.calc.LC_EBANK_PROCESS"%> -<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - - String flowunid = CurPage.getParameter("FlowUnid"); - String rightType = CurPage.getParameter("RightType"); - String applytype = CurPage.getParameter("ApplyType"); - - ASObjectModel doTemp = new ASObjectModel("SplittingList"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "1"; //只读模式 - if(!"ReadOnly".equals(rightType)){ - dwTemp.MultiSelect = true; - } - dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(flowunid); - - //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - String sButtons[][] = { - {"ReadOnly".equals(rightType)?"false":"true","","Button","生成分润支付数据","生成分润支付数据","createSplittingPay()","","","","btn_icon_add",""} - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SurplusReback.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SurplusReback.jsp deleted file mode 100644 index 22ec89d27..000000000 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SurplusReback.jsp +++ /dev/null @@ -1,37 +0,0 @@ -<%@page import="com.amarsoft.are.util.json.JSONEncoder"%> -<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/IncludeBegin.jsp"%> -<% - //dwTemp.MultiSelect = true; //多选 - String flowunid = CurPage.getAttribute("FlowUnid"); - String PhaseNo = CurPage.getParameter("PhaseNo"); - String temp = "false"; - if("0010".equals(PhaseNo)){ - temp = "true"; - }; - //参数：0.是否显示, 1.标题, 2.JS事件字符串表示(TabContentFrame会替换为真实名称), 3. 是否缓存(默认是), 4. 是否有关闭按钮(默认无), 5. Strip高度(默认600px) - String sTabStrip[][] = { - {temp, "网银数据", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/SurplusRebackList.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')","false"}, - {"true", "多余退回计划", "AsControl.OpenComp('/Tenwa/Lease/Flow/Rent/RentReback/LCEbankTemp.jsp', 'FlowUnid="+flowunid+"', 'TabContentFrame')", "false"}, - }; - - //参数：0.是否显示, 1.权限, 2.类型, 3.按钮文字, 4.说明文字, 5.事件, 6.快捷键, 7.资源路径, 8.资源路径参数, 9.图标, 10.风格 - String sButtons[][] = { - }; - - // BeforeTabStripHtml-html - CurPage.setAttribute("BeforeTabStripHtml", Button.getHtmlText(sButtons, CurUser, CurPage, CurConfig)); - - // TabStrip-JSON - CurPage.setAttribute("TabStrip", JSONEncoder.encode(sTabStrip)); - - // TabStripType-tab/strip 默认为tab - //CurPage.setAttribute("TabStripType", "strip"); - - // First-num 默认为0 - CurPage.setAttribute("First", "0"); - -%> -<%@ include file="/Frame/resources/include/ui/include_tabstrip.jspf"%> -<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SurplusRebackList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SurplusRebackList.jsp deleted file mode 100644 index 873f03865..000000000 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SurplusRebackList.jsp +++ /dev/null @@ -1,63 +0,0 @@ -<%@page import="jbo.app.tenwa.calc.LC_EBANK_PROCESS"%> -<%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - - String flowunid = CurPage.getParameter("FlowUnid"); - String rightType = CurPage.getParameter("RightType"); - String applytype = CurPage.getParameter("ApplyType"); - - ASObjectModel doTemp = new ASObjectModel("LCEbankListReback"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "1"; //只读模式 - if(!"ReadOnly".equals(rightType)){ - dwTemp.MultiSelect = true; - } - dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(flowunid); - - //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - String sButtons[][] = { - {"ReadOnly".equals(rightType)?"false":"true","","Button","生成多余退回计划","生成多余退回计划","createReback()","","","","btn_icon_add",""} - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp index 2c8c561f4..087823363 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp @@ -9,7 +9,6 @@ History Log: */ String userid=CurUser.getUserID(); - String belongorg=CurUser.getBelongOrg().getOrgID(); ASObjectModel doTemp = new ASObjectModel("OverdueDunningList"); //String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract"); //doTemp.appendJboWhere(sCondtion); @@ -38,28 +37,6 @@ } String useridStr = StringUtils.join(useridList.toArray(), ","); doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); - }else if(roleList.contains("800R00000048")){//800R00000048为凯捷催收角色==========8006014为凯捷经销商 - String userid_kj=""; - BizObjectManager userInfoBOM = JBOFactory.getBizObjectManager("jbo.awe.USER_INFO"); - List userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006002").getResultList(false); - List useridList_kj = new ArrayList(); - for(BizObject bo : userListObject){ - userid_kj = bo.getAttribute("userid").toString(); - useridList_kj.add("'"+userid_kj+"'"); - } - String useridStr = StringUtils.join(useridList_kj.toArray(), ","); - doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); - /* }else if(roleList.contains("8006U00000033")){//8006U00000033大通催收角色=========8006023大通经销商 - String userid_dt=""; - BizObjectManager userInfoBOM = JBOFactory.getBizObjectManager("jbo.awe.USER_INFO"); - List userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006023").getResultList(false); - List useridList_dt = new ArrayList(); - for(BizObject bo : userListObject){ - userid_dt = bo.getAttribute("userid").toString(); - useridList_dt.add("'"+userid_dt+"'"); */ - } - String useridStr = StringUtils.join(useridList_dt.toArray(), ","); - doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); } //登录人属于经销商角色 401：经销商roleid if(roleList.contains("401")){ @@ -74,17 +51,12 @@ //dwTemp.setPageSize(10); dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); - - //凯捷催收自动分派暂时没有催款员，判断登录为凯捷催收时隐藏修改、批量修改按钮 - String temp = "true"; - if("8006002".equals(belongorg)){ - temp = "false"; - }; + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { - {temp,"","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""}, + {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""}, //{"true","","Button","批量修改","批量修改","viewAndEditAll()","","","","btn_icon_edit",""}, - {temp,"","Button","批量修改","批量修改","selectPartDept()","","","","btn_icon_edit",""}, + {"true","","Button","批量修改","批量修改","selectPartDept()","","","","btn_icon_edit",""}, }; String orgCompany=CurUser.getOrgID(); if(orgCompany.length()>13){ diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/DistributorInformation.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/DistributorInformation.jsp deleted file mode 100644 index 7b9af307d..000000000 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/DistributorInformation.jsp +++ /dev/null @@ -1,47 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> -<%@ page import="org.apache.commons.lang.StringUtils" %> -<% - /* - Author: undefined 2019-11-18 - Content: 经销商信息页签 - History Log: - */ - String userid=CurUser.getUserID(); - String flowunid = CurPage.getParameter("FlowUnid"); - //String ObjectNo = CurPage.getParameter("ObjectNo"); - ASObjectModel doTemp = new ASObjectModel("DistributorInformation"); - //加权限 - BizObjectManager manager = JBOFactory.getBizObjectManager("jbo.awe.USER_ROLE"); - List roleListObject = manager.createQuery("userid=:userid").setParameter("userid", userid).getResultList(false); - List roleList = new ArrayList(); - String roleid = ""; - for(BizObject bo : roleListObject){ - roleid = bo.getAttribute("roleid").toString(); - roleList.add(roleid); - } - - String belongorg = Sqlca.getString("select belongorg from user_info where userid='"+userid+"'"); - String distributor_no = Sqlca.getString("select distributor_no from distributor_info where orgid='"+belongorg+"'"); - - - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.ShowSummary="1"; //汇总 - dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(flowunid); - - //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - String sButtons[][] = { - //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, - //{"true","","Button","导出excel","导出excel","exportExcel()","","","","btn_icon_up",""}, - //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/wechat/WechatAdvanceSettleInfo.jsp b/WebContent/Tenwa/wechat/WechatAdvanceSettleInfo.jsp deleted file mode 100644 index 339455805..000000000 --- a/WebContent/Tenwa/wechat/WechatAdvanceSettleInfo.jsp +++ /dev/null @@ -1,84 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - /* - Author: undefined 2019-11-04 - Content: 示例详情页面 - History Log: - */ - String sTempletNo = "WechatAdvanceSettle";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - //dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("AdvanceSettleId")); - - String sButtons[][] = { - {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, - {"true","","Button","通过","通过","saveRecord()","","","","btn_icon_submit"}, - {"true","All","Button","否决","否决","returnList()","","","","btn_icon_close"}, - - }; - sButtonPosition = "north"; -%><%@ 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/wechat/WechatBankNumberDocList.jsp b/WebContent/Tenwa/wechat/WechatBankNumberDocList.jsp deleted file mode 100644 index 9c0f259e7..000000000 --- a/WebContent/Tenwa/wechat/WechatBankNumberDocList.jsp +++ /dev/null @@ -1,168 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%> -<%@ page import="com.tenwa.doc.action.DocListInitAction" %> -<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %> -<% - /* - 带出业务申请时附件的专用页面 - Author: undefined 2016-09-01 - Content: - History Log: - */ - - String bankInfoId = CurPage.getParameter("bankinfoid"); - String RightType =""; - String sObjectType = ""; - String username = ""; - String sTempletNo="WechatBankNumberDocList"; - if(sTempletNo==null){ - sTempletNo="FlowPayDocList"; - } - - String compClientID = request.getParameter("bankInfoId"); - - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - //doTemp.appendJboWhere(" and rela.proj_id='"+ProjectId+"' and rela.objecttype='BusinessApplyFlow'"); - - doTemp.setLockCount(2); - - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "0"; - dwTemp.setPageSize(50); - dwTemp.genHTMLObjectWindow(bankInfoId); - //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - String sButtons[][] =null; - - sButtons=new String[][]{ - {"false","","Button","保存","保存所有修改","saveRecord()","","","",""}, - }; - -%> - -<%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/wechat/WechatBanknumberChangeInfo.jsp b/WebContent/Tenwa/wechat/WechatBanknumberChangeInfo.jsp deleted file mode 100644 index 592f29502..000000000 --- a/WebContent/Tenwa/wechat/WechatBanknumberChangeInfo.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - /* - Author: undefined 2019-11-02 - Content: 示例详情页面 - History Log: - */ - String bankInfoId = CurPage.getParameter("bankinfoid"); - String compClientID = request.getParameter("CompClientID"); - String sTempletNo = "WechatBanknumberChange";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - dwTemp.genHTMLObjectWindow(bankInfoId); - System.out.println(sWebRootPath); - dwTemp.replaceColumn("docFile", "", CurPage.getObjectWindowOutput()); - - String sButtons[][] = { - {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, - {"true","All","Button","否决","否决","returnList()","","","","btn_icon_close"}, - }; - sButtonPosition = "north"; -%><%@ 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/wechat/WechatBasicChange.jsp b/WebContent/Tenwa/wechat/WechatBasicChange.jsp deleted file mode 100644 index 9742c4f8d..000000000 --- a/WebContent/Tenwa/wechat/WechatBasicChange.jsp +++ /dev/null @@ -1,72 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - /* - Author: undefined 2019-11-01 - Content: 示例详情页面 - History Log: - */ - String sPrevUrl = CurPage.getParameter("PrevUrl"); - if(sPrevUrl == null) sPrevUrl = ""; - - String sTempletNo = "WechatBasicChange";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - dwTemp.genHTMLObjectWindow(CurPage.getParameter("changeId")); - - String sButtons[][] = { - {"true","","Button","保存","审批意见","saveRecord('save')","","","","btn_icon_save"}, - {"true","","Button","通过","通过","saveRecord('via')","","","","btn_icon_submit"}, - {"true","","Button","否决","否决","saveRecord('refuse')","","","","btn_icon_close"} - }; - sButtonPosition = "north"; -%><%@ 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/wechat/WechatProblemGuideInfo.jsp b/WebContent/Tenwa/wechat/WechatProblemGuideInfo.jsp deleted file mode 100644 index 0eb0476a0..000000000 --- a/WebContent/Tenwa/wechat/WechatProblemGuideInfo.jsp +++ /dev/null @@ -1,34 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - /* - Author: undefined 2019-10-31 - Content: 示例详情页面 - History Log: - */ - String sPrevUrl = CurPage.getParameter("PrevUrl"); - if(sPrevUrl == null) sPrevUrl = "/Tenwa/wechat/WechatProblemGuideList.jsp"; - - String sTempletNo = "WECHAT_PROBLEM_GUIDE_INFO";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - //doTemp.setColTips("", "测试"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - //dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); - - String sButtons[][] = { - {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"}, - {"true","","Button","返回","返回列表页面","parent.AsDialog.ClosePage()","","","","btn_icon_return"} - }; - 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/wechat/WechatProblemGuideList.jsp b/WebContent/Tenwa/wechat/WechatProblemGuideList.jsp deleted file mode 100644 index c91af186d..000000000 --- a/WebContent/Tenwa/wechat/WechatProblemGuideList.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% - /* - Author: undefined 2019-10-31 - Content: - History Log: - */ - ASObjectModel doTemp = new ASObjectModel("WECHAT_PROBLEM_GUIDE_LIST"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(""); - - //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - String sButtons[][] = { - {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""}, - {"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete",""}, - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/a3web.xml b/WebContent/WEB-INF/etc/a3web.xml index b22f63f78..fbb734d30 100644 --- a/WebContent/WEB-INF/etc/a3web.xml +++ b/WebContent/WEB-INF/etc/a3web.xml @@ -28,36 +28,37 @@ Disk - d:/tmp/als/Upload + /data/files/Upload + > + /data/sftp/caiwu/upload - d:/tmp/als/OneDimensionalCode/ + /data/files/Upload/TFT/OneDimensionalCode/ - d:/tmp/als/BQcontract/ - - d:/tmp/InterFace + /data/files/Upload/TFT/BQcontract/ + + /data/files/tmp/InterFace fileTemplate - /tmp/als/WorkDoc + /data/files/als/WorkDoc Disk - /tmp/als/offlineworkdoc - + /data/files/als/offlineworkdoc - /tmp/DownLoad + /data/files/tmp/DownLoad true - d:/tmp/DW + /data/files/tmp/DW SRC true - /home/amarsoft/als/Download + /data/files/als/Download true @@ -83,8 +84,8 @@ BusinessDueBill - http://47.93.34.101/report - http://47.93.34.101/report + https://ret.ap-leasing.com/report + https://ret.ap-leasing.com/report true @@ -94,22 +95,18 @@ - + a6b83424b55410c36415178002f8415e http://api.che300.com/service/getCarBrandList - http://api.che300.com/service/getCarSeriesList - - http://api.che300.com/service/getCarModelList - - http://api.che300.com/service/getNewCarPrice - - http://api.che300.com/service/getUsedCarPrice - + http://api.che300.com/service/getCarSeriesList + http://api.che300.com/service/getCarModelList + http://api.che300.com/service/getNewCarPrice + http://api.che300.com/service/getUsedCarPrice - - http://111.205.51.131:27203/clms_proxy/remoting/api - + http://172.28.1.59/skeleton/remoting/api + @@ -119,13 +116,21 @@ /etc/app_config.properties - http://172.16.20.242:65188 - 30000 + http://172.28.1.59:8086 + 30000 安鹏经办 http://fpfw2.aiee.fun:8899/fpfw2/api/kpbusiness 6797763f-e55a-421c-9fe1-07a9fbd1d87a 3060109010000000000 - D:\\pdf - D:/liuzhaoPDF/ - D:/liuzhaoCopyPDF/ + /data/files/apzl_leasing/tmp/MO + /data/files/apzl_leasing/tmp/LZ + /data/files/apzl_leasing/tmp/LIUZ + + /soft/files/pengyuan/apgjs.jks + 123456 + + /soft/files/pengyuan/apgjs.jks + 123456 + + http://finance.baicfc.com:7999/UpdateStatusService/NFS.Business.UpdateStatusService.ServicesImpl.UpdateStatus.svc \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 3acf65a7a..04cdf8a0c 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -27,7 +27,7 @@ - + diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml index 53fa2b2e1..18890578a 100644 --- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml @@ -196,4 +196,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/app_config.properties b/WebContent/WEB-INF/etc/app_config.properties index b1406c5b9..1fa3fb749 100644 --- a/WebContent/WEB-INF/etc/app_config.properties +++ b/WebContent/WEB-INF/etc/app_config.properties @@ -1,75 +1,74 @@ -############################################################################### -# APP_CONFIG properties -############################################################################### - -############################################################################### -# APP_BASE_CONFIG -############################################################################### -# base.data. -base.data.source=als -base.data.encoding=UTF-8 -base.data.fource.encoding=true - -# base.param.key. -base.param.key.hold.time=TokenHoldTime -base.param.key.encoding=encoding -base.param.key.no.check.uri=NoCheckURI - -# session check. -base.session.check.token=token -base.session.check.user.id=userid -base.session.check.dev.id=devid -base.session.check.dev.os=devos -base.session.check.expire=expire - -# session. -base.session.web.api.page=WebApiPage -base.session.req.uri=ReqURI - -# base.return. -base.return.code.500=500 -base.return.msg.500=\u540e\u53f0\u670d\u52a1\u51fa\u73b0\u5f02\u5e38! -base.return.code.404=404 -base.return.code.406=406 -base.return.msg.406=\u8bbf\u95ee\u670d\u52a1\u540e\u53f0\u6743\u9650\u65e0\u6548! -base.return.result.success.code=SUCCESS -base.return.result.fail.code=FAIL -base.return.msg.save.fail=\u4fdd\u5b58\u5931\u8d25 -base.return.msg.save.success=\u4fdd\u5b58\u6210\u529f -base.return.msg.edit.fail=\u7f16\u8f91\u5931\u8d25 -base.return.msg.edit.success=\u7f16\u8f91\u6210\u529f -base.return.msg.del.fail=\u5220\u9664\u5931\u8d25 -base.return.msg.del.success=\u5220\u9664\u6210\u529f -base.return.msg.init.display.fail=\u521d\u59cb\u5316\u9875\u9762\u5931\u8d25 -base.return.msg.init.display.success=\u521d\u59cb\u5316\u9875\u9762\u6210\u529f - -base.return.type.void=void -base.return.type.app.att=AppAtt - -# base pwd encryption des. -base.pwd.encryption.des.one=0123456789abc -base.pwd.encryption.des.two=1234567890abc -base.pwd.encryption.des.three=1234567890!@# - -# customer type -base.customer.type.company=01 -base.customer.type.person=03 - - -############################################################################### -# APP_PUSH_MESSAGE_CONFIG -############################################################################### -push.message.switch=true -push.message.secret.key.android=xpStkADS2IUJk10PejtJvQ== -push.message.secret.key.ios=WZ5jwvsdAFzo+sDY7wrZgA== -push.message.package.name=com.tenwa.test - - -#base.filter.user.role.id='800090001R00000004','800090001R00000005','099','299','399','800090001R00000010','800090002R00000001','800090002R00000003','800090002R00000045','800090001R00000006','800090001R00000007','800090001R00000008','800090001R00000009','800090001R00000013','800090001R00000014','800090001R00000022','800090001R00000019','800090001R00000020','800090001R00000015','800090001R00000025' -base.filter.user.role.id=none - -base.business.type=1 -base.company.doc.name=\u7533\u8bf7\u4eba\u8425\u4e1a\u6267\u7167\uff08\u6b63\u672c\u6216\u526f\u672c\uff09@\u7533\u8bf7\u4eba\u8425\u4e1a\u6267\u7167\uff08\u6b63\u672c\u6216\u526f\u672c\uff09,\u7533\u8bf7\u4eba\u516c\u53f8\u7ae0\u7a0b\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u7533\u8bf7\u4eba\u516c\u53f8\u7ae0\u7a0b\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u7533\u8bf7\u4eba\u9a8c\u8d44\u62a5\u544a\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u7533\u8bf7\u4eba\u9a8c\u8d44\u62a5\u544a\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u6cd5\u4eba\u4ee3\u8868\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u6cd5\u4eba\u4ee3\u8868\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u8d22\u52a1\u8d1f\u8d23\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u8d22\u52a1\u8d1f\u8d23\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u80a1\u4e1c\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u80a1\u4e1c\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09@\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09,\u7ecf\u8425\u573a\u6240\u79df\u8d41\u534f\u8bae@\u7ecf\u8425\u573a\u6240\u79df\u8d41\u534f\u8bae,\u4e0a\u5e74\u5ea6\u53ca\u8fd11\u4e2a\u6708\u7684\u8d22\u52a1\u62a5\u8868\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u4e0a\u5e74\u5ea6\u53ca\u8fd11\u4e2a\u6708\u7684\u8d22\u52a1\u62a5\u8868\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u516c\u53f8\u94f6\u884c\u6d41\u6c34\uff08\u6216\u80a1\u4e1c\u540d\u4e0b\u94f6\u884c\u6d41\u6c34\uff09@\u516c\u53f8\u94f6\u884c\u6d41\u6c34\uff08\u6216\u80a1\u4e1c\u540d\u4e0b\u94f6\u884c\u6d41\u6c34\uff09,\u4e1a\u52a1\u5f80\u6765\u5408\u540c@\u4e1a\u52a1\u5f80\u6765\u5408\u540c,\u80a1\u4e1c\u7b80\u5386@\u80a1\u4e1c\u7b80\u5386,\u540c\u610f\u7533\u8bf7\u878d\u8d44\u79df\u8d41\u4e1a\u52a1\u7684\u80a1\u4e1c\u4f1a\u51b3\u8bae@\u540c\u610f\u7533\u8bf7\u878d\u8d44\u79df\u8d41\u4e1a\u52a1\u7684\u80a1\u4e1c\u4f1a\u51b3\u8bae,\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868@\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868,\u7ecf\u8425\u8bb8\u53ef\u8bc1\uff08\u7279\u6b8a\u884c\u4e1a\u5982\u6709\u63d0\u4f9b\uff09@\u7ecf\u8425\u8bb8\u53ef\u8bc1\uff08\u7279\u6b8a\u884c\u4e1a\u5982\u6709\u63d0\u4f9b\uff09,\u4e2a\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u4e66@\u4e2a\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u4e66,\u4f01\u4e1a\u5f81\u4fe1\u67e5\u8be2@\u4f01\u4e1a\u5f81\u4fe1\u67e5\u8be2 -base.person.doc.name=\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868@\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868,\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09@\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09,\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09@\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09,\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e@\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e,\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e@\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e,\u6536\u5165\u8bc1\u660e@\u6536\u5165\u8bc1\u660e,\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355@\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355,\u7a0e\u5355@\u7a0e\u5355,\u8425\u4e1a\u6267\u7167@\u8425\u4e1a\u6267\u7167,\u7ecf\u8425\u6750\u6599@\u7ecf\u8425\u6750\u6599,\u8d44\u683c\u8bc1\u4e66@\u8d44\u683c\u8bc1\u4e66,\u623f\u4ea7\u8bc1\u660e@\u623f\u4ea7\u8bc1\u660e,\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u8f66\u8f86\u7167\u7247@\u8f66\u8f86\u7167\u7247,\u8f66\u8f86\u89c6\u9891@\u8f66\u8f86\u89c6\u9891,\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a,\u5176\u4ed6@\u5176\u4ed6 - +############################################################################### +# APP_CONFIG properties +############################################################################### + +############################################################################### +# APP_BASE_CONFIG +############################################################################### +# base.data. +base.data.source=als +base.data.encoding=UTF-8 +base.data.fource.encoding=true + +# base.param.key. +base.param.key.hold.time=TokenHoldTime +base.param.key.encoding=encoding +base.param.key.no.check.uri=NoCheckURI + +# session check. +base.session.check.token=token +base.session.check.user.id=userid +base.session.check.dev.id=devid +base.session.check.dev.os=devos +base.session.check.expire=expire + +# session. +base.session.web.api.page=WebApiPage +base.session.req.uri=ReqURI + +# base.return. +base.return.code.500=500 +base.return.msg.500=\u540e\u53f0\u670d\u52a1\u51fa\u73b0\u5f02\u5e38! +base.return.code.404=404 +base.return.code.406=406 +base.return.msg.406=\u8bbf\u95ee\u670d\u52a1\u540e\u53f0\u6743\u9650\u65e0\u6548! +base.return.result.success.code=SUCCESS +base.return.result.fail.code=FAIL +base.return.msg.save.fail=\u4fdd\u5b58\u5931\u8d25 +base.return.msg.save.success=\u4fdd\u5b58\u6210\u529f +base.return.msg.edit.fail=\u7f16\u8f91\u5931\u8d25 +base.return.msg.edit.success=\u7f16\u8f91\u6210\u529f +base.return.msg.del.fail=\u5220\u9664\u5931\u8d25 +base.return.msg.del.success=\u5220\u9664\u6210\u529f +base.return.msg.init.display.fail=\u521d\u59cb\u5316\u9875\u9762\u5931\u8d25 +base.return.msg.init.display.success=\u521d\u59cb\u5316\u9875\u9762\u6210\u529f + +base.return.type.void=void +base.return.type.app.att=AppAtt + +# base pwd encryption des. +base.pwd.encryption.des.one=0123456789abc +base.pwd.encryption.des.two=1234567890abc +base.pwd.encryption.des.three=1234567890!@# + +# customer type +base.customer.type.company=01 +base.customer.type.person=03 + + +############################################################################### +# APP_PUSH_MESSAGE_CONFIG +############################################################################### +push.message.switch=true +push.message.secret.key.android=xpStkADS2IUJk10PejtJvQ== +push.message.secret.key.ios=WZ5jwvsdAFzo+sDY7wrZgA== +push.message.package.name=com.tenwa.test + + +#base.filter.user.role.id='800090001R00000004','800090001R00000005','099','299','399','800090001R00000010','800090002R00000001','800090002R00000003','800090002R00000045','800090001R00000006','800090001R00000007','800090001R00000008','800090001R00000009','800090001R00000013','800090001R00000014','800090001R00000022','800090001R00000019','800090001R00000020','800090001R00000015','800090001R00000025' +base.filter.user.role.id=none + +base.business.type=1 +base.company.doc.name=\u7533\u8bf7\u4eba\u8425\u4e1a\u6267\u7167\uff08\u6b63\u672c\u6216\u526f\u672c\uff09@\u7533\u8bf7\u4eba\u8425\u4e1a\u6267\u7167\uff08\u6b63\u672c\u6216\u526f\u672c\uff09,\u7533\u8bf7\u4eba\u516c\u53f8\u7ae0\u7a0b\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u7533\u8bf7\u4eba\u516c\u53f8\u7ae0\u7a0b\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u7533\u8bf7\u4eba\u9a8c\u8d44\u62a5\u544a\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u7533\u8bf7\u4eba\u9a8c\u8d44\u62a5\u544a\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u8d22\u52a1\u8d1f\u8d23\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u8d22\u52a1\u8d1f\u8d23\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u7533\u8bf7\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u80a1\u4e1c\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u80a1\u4e1c\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09@\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09,\u7ecf\u8425\u573a\u6240\u79df\u8d41\u534f\u8bae@\u7ecf\u8425\u573a\u6240\u79df\u8d41\u534f\u8bae,\u4e0a\u5e74\u5ea6\u53ca\u8fd11\u4e2a\u6708\u7684\u8d22\u52a1\u62a5\u8868\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09@\u4e0a\u5e74\u5ea6\u53ca\u8fd11\u4e2a\u6708\u7684\u8d22\u52a1\u62a5\u8868\uff08\u878d\u8d44\u989d50\u4e07\u4ee5\u4e0a\u63d0\u4f9b\uff09,\u516c\u53f8\u94f6\u884c\u6d41\u6c34\uff08\u6216\u80a1\u4e1c\u540d\u4e0b\u94f6\u884c\u6d41\u6c34\uff09@\u516c\u53f8\u94f6\u884c\u6d41\u6c34\uff08\u6216\u80a1\u4e1c\u540d\u4e0b\u94f6\u884c\u6d41\u6c34\uff09,\u4e1a\u52a1\u5f80\u6765\u5408\u540c@\u4e1a\u52a1\u5f80\u6765\u5408\u540c,\u80a1\u4e1c\u7b80\u5386@\u80a1\u4e1c\u7b80\u5386,\u540c\u610f\u7533\u8bf7\u878d\u8d44\u79df\u8d41\u4e1a\u52a1\u7684\u80a1\u4e1c\u4f1a\u51b3\u8bae@\u540c\u610f\u7533\u8bf7\u878d\u8d44\u79df\u8d41\u4e1a\u52a1\u7684\u80a1\u4e1c\u4f1a\u51b3\u8bae,\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868@\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868,\u7ecf\u8425\u8bb8\u53ef\u8bc1\uff08\u7279\u6b8a\u884c\u4e1a\u5982\u6709\u63d0\u4f9b\uff09@\u7ecf\u8425\u8bb8\u53ef\u8bc1\uff08\u7279\u6b8a\u884c\u4e1a\u5982\u6709\u63d0\u4f9b\uff09,\u4e2a\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u4e66@\u4e2a\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u4e66,\u4f01\u4e1a\u5f81\u4fe1\u67e5\u8be2@\u4f01\u4e1a\u5f81\u4fe1\u67e5\u8be2,\u6cd5\u4eba\u4ee3\u8868\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u6cd5\u4eba\u4ee3\u8868\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09 +base.person.doc.name=\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868@\u878d\u8d44\u79df\u8d41\u7533\u8bf7\u8868,\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09@\u8fd8\u6b3e\u5361\uff08\u6b63\u53cd\u9762\uff09,\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09@\u9a7e\u9a76\u8bc1\uff08\u6b63\u526f\u672c\uff09,\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u5171\u540c\u627f\u79df\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09@\u62c5\u4fdd\u4eba\u8eab\u4efd\u8bc1\uff08\u6b63\u53cd\u9762\uff09,\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e@\u6237\u53e3\u672c\u53ca\u6237\u7c4d\u8bc1\u660e,\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e@\u5a5a\u59fb\u5173\u7cfb\u8bc1\u660e,\u6536\u5165\u8bc1\u660e@\u6536\u5165\u8bc1\u660e,\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355@\u94f6\u884c\u6d41\u6c34\u5bf9\u8d26\u5355,\u7a0e\u5355@\u7a0e\u5355,\u8425\u4e1a\u6267\u7167@\u8425\u4e1a\u6267\u7167,\u7ecf\u8425\u6750\u6599@\u7ecf\u8425\u6750\u6599,\u8d44\u683c\u8bc1\u4e66@\u8d44\u683c\u8bc1\u4e66,\u623f\u4ea7\u8bc1\u660e@\u623f\u4ea7\u8bc1\u660e,\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u67e5\u8be2\u6388\u6743\u59d4\u6258\u4e66,\u8f66\u8f86\u7167\u7247@\u8f66\u8f86\u7167\u7247,\u8f66\u8f86\u89c6\u9891@\u8f66\u8f86\u89c6\u9891,\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a@\u5171\u540c\u627f\u79df\u4eba\u5f81\u4fe1\u62a5\u544a,\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a@\u62c5\u4fdd\u4eba\u5f81\u4fe1\u62a5\u544a,\u5176\u4ed6@\u5176\u4ed6 base.calculation.tool.flow.unid=TENWA123 \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml index 41c14a364..2f1d5a6b5 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml @@ -3859,10 +3859,10 @@ - - - - + + + + @@ -3881,7 +3881,7 @@ - + @@ -4005,7 +4005,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4272,10 +4303,6 @@ - - - - @@ -4777,128 +4804,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index c3cb359dd..5b497a11b 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -39,7 +39,7 @@ - + @@ -67,7 +67,6 @@ - @@ -244,8 +243,6 @@ - - @@ -530,8 +527,6 @@ - - @@ -766,8 +761,7 @@ - - + @@ -1059,8 +1053,6 @@ - - @@ -1392,8 +1384,6 @@ - - @@ -1516,8 +1506,6 @@ - - @@ -2493,8 +2481,6 @@ - - @@ -2708,8 +2694,7 @@ - - + @@ -3283,8 +3268,7 @@ - - + @@ -4095,27 +4079,5 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 3a0ba8c08..b7c1e1525 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -740,8 +740,6 @@ - - @@ -750,7 +748,7 @@ - + @@ -803,8 +801,6 @@ - - @@ -1371,41 +1367,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1599,5 +1560,4 @@ - diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index d7a758152..59869bf25 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -3284,90 +3284,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 93b8ed6cd..f0731226c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -134,8 +134,6 @@ - - @@ -280,9 +278,6 @@ - - - @@ -791,8 +786,6 @@ - - @@ -1059,8 +1052,6 @@ - - @@ -2406,7 +2397,6 @@ - @@ -2743,8 +2733,6 @@ - - @@ -4696,9 +4684,6 @@ - - - @@ -5124,11 +5109,6 @@ - - - - - @@ -5142,6 +5122,7 @@ + @@ -5174,104 +5155,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml index 7e2b1755c..d02072f29 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml @@ -86,7 +86,6 @@ - diff --git a/WebContent/WEB-INF/etc/simplelog.properties b/WebContent/WEB-INF/etc/simplelog.properties index 59ef9f6b9..952260e40 100644 --- a/WebContent/WEB-INF/etc/simplelog.properties +++ b/WebContent/WEB-INF/etc/simplelog.properties @@ -7,18 +7,17 @@ com.amarsoft.are.log.SimpleLog.handlers=com.amarsoft.are.log.impl.ConsoleHandler com.amarsoft.are.log.impl.simple.WarnFileHandler.level = error; -com.amarsoft.are.log.impl.simple.WarnFileHandler.pattern = /tmp/log/a3web_warn_%g.log +com.amarsoft.are.log.impl.simple.WarnFileHandler.pattern = /data/files/apzl_leasing/tmp/log/a3web_warn_%g.log com.amarsoft.are.log.impl.simple.WarnFileHandler.limit = 1024000 -com.amarsoft.are.log.impl.FileHandler.level = info -#com.amarsoft.are.log.impl.FileHandler.pattern = {$ARE.APP_HOME}/log/a3web_%D_%g.log +com.amarsoft.are.log.impl.FileHandler.level = info#com.amarsoft.are.log.impl.FileHandler.pattern = {$ARE.APP_HOME}/log/a3web_%D_%g.log -com.amarsoft.are.log.impl.FileHandler.pattern = /tmp/log/a3web_%D_%g.log +com.amarsoft.are.log.impl.FileHandler.pattern = /data/files/apzl_leasing/tmp/log/a3web_%D_%g.log com.amarsoft.are.log.impl.FileHandler.limit = 10240000 com.amarsoft.are.log.impl.FileHandler.count = 10 com.amarsoft.are.log.impl.FileHandler.append = true com.amarsoft.are.log.impl.FileHandler.formatter = com.amarsoft.are.log.impl.simple.SimpleFormatter -com.amarsoft.are.log.impl.ConsoleHandler.level = info +com.amarsoft.are.log.impl.ConsoleHandler.level = info \ No newline at end of file diff --git a/WebContent/WEB-INF/lib/javassist-3.18.2-GA.jar b/WebContent/WEB-INF/lib/javassist-3.18.2-GA.jar new file mode 100644 index 000000000..c8761c8ef Binary files /dev/null and b/WebContent/WEB-INF/lib/javassist-3.18.2-GA.jar differ diff --git a/WebContent/WEB-INF/lib/mysql-connector-java-5.1.44-bin.jar b/WebContent/WEB-INF/lib/mysql-connector-java-5.1.44-bin.jar new file mode 100644 index 000000000..2f2e32d51 Binary files /dev/null and b/WebContent/WEB-INF/lib/mysql-connector-java-5.1.44-bin.jar differ diff --git a/WebContent/WEB-INF/tlds/web.xml b/WebContent/WEB-INF/tlds/web.xml new file mode 100644 index 000000000..68ad32b80 --- /dev/null +++ b/WebContent/WEB-INF/tlds/web.xml @@ -0,0 +1,557 @@ + + + A3Web + + + JSPConfiguration + *.jsp + GBK + + + JSPConfiguration + *.jspf + GBK + + + + RunFilter + com.amarsoft.awe.control.RunFilter + + RunTimeDebug + true + + + ShowFramePage + true + + + DbLog + false + + + encoding + GBK + + + DataSource + als + + + ExcludedURLs + ^/.*Logon.jsp,^/.*SaveGraphAjax.jsp,^/.*appDownload.jsp + + + + RunFilter + *.jsp + REQUEST + FORWARD + + + RunFilter + /servlet/view/* + + + InitAREServlet + com.amarsoft.are.InitAREServlet + + ConfigFile + /WEB-INF/etc/are.xml + + + AppHome + /WEB-INF + + 1 + + + InitAWEServlet + com.amarsoft.awe.control.InitAWEServlet + + ConfigFile + /WEB-INF/etc/a3web.xml + + + CacheFile + /WEB-INF/etc/cache.xml + + + SkinConfig + /WEB-INF/etc/skin.xml + + + ButtonConfig + /WEB-INF/etc/button.xml + + + DataSource + als + + 2 + + + RedirectorServlet + com.amarsoft.awe.control.RedirectorServlet + + encoding + GBK + + + + + InitSecondHandCarConfig + com.amarsoft.app.awe.config.InitSecondHandCarConfig + + shutdown-on-unload + true + + 1 + + + + InitCollectConfig + com.amarsoft.app.awe.config.InitCollectConfig + + shutdown-on-unload + true + + 1 + + + + RewriteRunJavaMethodServlet + com.tenwa.workflow.RewriteRunJavaMethodServlet + + DataSource + als + + + + + RedirectorDialogServlet + com.amarsoft.awe.control.RedirectorDialogServlet + + encoding + GBK + + + + ForwardServlet + com.amarsoft.awe.control.ForwardServlet + + encoding + GBK + + + + RunJavaMethodServlet + com.amarsoft.awe.control.RunJavaMethodServlet + + DataSource + als + + + + DisplayChart + org.jfree.chart.servlet.DisplayChart + + + MessageServlet + com.amarsoft.awe.message.MessageServlet + + + WorkDocFileServlet + com.amarsoft.awe.common.attachment.WorkDocFileServlet + + + AttachmentViewServlet + com.amarsoft.awe.common.attachment.AttachmentViewServlet + + + EditOfficeServlet + com.tenwa.onlineoperation.servlet.EditOfficeServlet + + + FileTemplateViewServlet + com.amarsoft.filetemplate.servlet.FileTemplateViewServlet + + + DocDownloadServlet + com.tenwa.doc.servlet.DocDownloadServlet + + + DocDownloadZipServlet + com.tenwa.doc.servlet.DocDownloadZipServlet + + + DocFlowDownloadZipServlet + com.tenwa.doc.servlet.DocFlowDownloadZipServlet + + + DownloadZipServlet + com.tenwa.officetempalte.controller.DownloadZipServlet + + + FileViewServlet + com.amarsoft.awe.common.attachment.FileViewServlet + + + ShowImageServlet + com.tenwa.doc.servlet.ShowImageServlet + + + ShowPDFServlet + com.tenwa.doc.servlet.ShowPDFServlet + + + StreamViewServlet + com.amarsoft.awe.common.attachment.StreamViewServlet + + + CheckCodeServlet + com.amarsoft.awe.control.CheckCodeServlet + + CodeLength + 5 + + + + MonitorSOAPServlet + com.amarsoft.awe.common.monitor.MonitorSOAPServlet + + + RedirectorServlet + /Redirector + + + RedirectorDialogServlet + /RedirectorDialog + + + RunJavaMethodServlet + /servlet/run + + + ForwardServlet + /ao + + + DisplayChart + /chartview + + + MessageServlet + /servlet/message + + + WorkDocFileServlet + /servlet/workdocfile/* + + + AttachmentViewServlet + /servlet/view/attachment + + + EditOfficeServlet + /servlet/view/editOffice + + + FileTemplateViewServlet + /servlet/view/fileTemplateView + + + DocDownloadServlet + /servlet/view/docDownloadServlet + + + + RewriteRunJavaMethodServlet + /servlet/runflow + + + + DocDownloadZipServlet + /servlet/view/docDownloadZipServlet + + + DocFlowDownloadZipServlet + /servlet/view/docFlowDownloadZipServlet + + + DownloadZipServlet + /servlet/view/DownloadZipServlet + + + AttachmentViewServlet + /servlet/pdf/* + + + FileViewServlet + /servlet/view/file + + + ShowImageServlet + /servlet/view/image + + + ShowPDFServlet + /servlet/view/pdf + + + FileViewServlet + /servlet/viewpic + + + StreamViewServlet + /servlet/view/stream + + + CheckCodeServlet + /servlet/checkcode + + + MonitorSOAPServlet + /servlet/monitor + + + QueryResultServlet + com.amarsoft.asquery.servlet.QueryResultServlet + + threadCount + 5 + + + + QueryResultServlet + /SynchResultQuery + + + InfoPageExportServlet + com.amarsoft.awe.dw.export.servlet.InfoExportServlet + + + ListPageExportServlet + com.amarsoft.awe.dw.export.servlet.ListExportServlet + + + InfoPageExportServlet + /EAS/PageExport/info + + + ListPageExportServlet + /EAS/PageExport/list + + + workflow_GetProcess + com.amarsoft.biz.workflow.graph.web.GetProcess + + + workflow_UpdateProcess + com.amarsoft.biz.workflow.graph.web.UpdateProcess + + + workflow_AddProcess + com.amarsoft.biz.workflow.graph.web.AddProcess + + + workflow_DeleteProcess + com.amarsoft.biz.workflow.graph.web.DeleteProcess + + + workflow_ListProcess + com.amarsoft.biz.workflow.graph.web.ListProcess + + + workflow_GetProcess + /getprocess.wf + + + workflow_UpdateProcess + /updateprocess.wf + + + workflow_AddProcess + /addprocess.wf + + + workflow_DeleteProcess + /deleteprocess.wf + + + workflow_ListProcess + /listprocess.wf + + + index.html + + + 404 + /Frame/page/sys/NoPageInfo.jsp + + + jdbc/als + javax.sql.DataSource + Application + Shareable + + + jdbc/report + javax.sql.DataSource + Application + Shareable + + + 240 + + + InitDBType + com.amarsoft.app.awe.config.InitDBType + + shutdown-on-unload + true + + 1 + + + QuartzInitializer + com.tenwa.quartz.MyQuartzInitializerServlet + + config-file + quartz.properties + + + shutdown-on-unload + true + + 5 + + + webAppRootKey + webapp.port + + + javax.servlet.jsp.jstl.fmt.localizationContext + ApplicationResources + + + log4jConfigLocation + /WEB-INF/classes/log4j.xml + + + 閰嶇疆鏂囦欢浣嶇疆 + contextConfigLocation + classpath:applicationContext*.xml + + + org.springframework.web.context.ContextLoaderListener + + + + + + + + Restfull澶勭悊Servlet + RestfullServlet + RestfullServlet + cn.coyoteam.aweresf.web.servlet.RestfullServiceServlet + cn.servlet.RestfullServiceServlet + + 1 + + + RestfullServlet + /webapi/resf/* + + + restfull鑷姩鎵弿璺緞璁剧疆 + RestfullScanPackage + + apx.com.amarsoft.als.user.logon.controller, + apx.com.amarsoft.als.user.pwd.controller, + apx.com.amarsoft.als.user.sys.controller, + apx.com.amarsoft.als.doc.controller, + apx.com.amarsoft.als.currency.select.controller, + apx.com.amarsoft.als.currency.select.contract.controller, + 鎴戠殑宸ヤ綔 + 鐢宠鍒楄〃 锛 applytype phasetype ObjectNo + apx.com.amarsoft.als.apzl.apply.business.query.controller, + 涓氬姟鐢宠鍙戣捣 + apx.com.amarsoft.als.apzl.apply.business.start.controller, + 姹借溅閫夋嫨妗 + apx.com.amarsoft.als.currency.select.apzl.car.controller, + 浜у搧閫夋嫨妗 + apx.com.amarsoft.als.currency.select.apzl.product.controller, + + 鎰忚 + 绛剧讲鎰忚 + apx.com.amarsoft.als.business.opinion.sign.controller, + 娴佺▼鍘嗗彶鎰忚 + apx.com.amarsoft.als.business.opinion.history.controller, + + 娴佺▼闄勪欢涓瑙 + apx.com.amarsoft.als.business.attachment.controller, + + 娴佺▼鍔ㄤ綔 + apx.com.amarsoft.als.business.action.ready.controller, + apx.com.amarsoft.als.business.action.submit.controller, + apx.com.amarsoft.als.business.action.back.controller, + apx.com.amarsoft.als.business.comm.action.controller, + + 閫氱敤 鍒楄〃/琛ㄥ崟 鏌ヨ 淇濆瓨 澶勭悊 + 閫氱敤妯℃澘鏌ヨ 淇濆瓨 鍒楄〃 鍒犻櫎 澶勭悊 + apx.com.amarsoft.als.base.awe.controller, + 鎵ｆ鍗′俊鎭彉鏇 + apx.com.amarsoft.als.business.change.controller, + 淇℃伅鏍￠獙 + apx.com.amarsoft.als.business.verification.controller, + + + 瀵规暣涓獁ebapi杩涜涓浜涢氱敤澶勭悊鐨勮繃婊ゅ櫒 + + SessionAndContextFilter + SessionAndContextFilter + cn.coyoteam.aweresf.web.filter.SessionAndContextFilter + cn.filter.SessionAndContextFilter + + NoCheckURI + + 鐢ㄦ埛 鐧诲綍/娉ㄩ攢 + /resf/logon/manager/logon, + /resf/logon/manager/logout, + 鍏抽棴鎵嬪娍瀵嗙爜 鏌ヨ鎵嬪娍瀵嗙爜鐘舵 + /resf/user/center/manager/acquisition/gesture, + /resf/user/center/manager/close/gesture, + 妫娴嬬郴缁 鐗堟湰 + /resf/user/center/manager/detection/version, + 涓嬭浇 + /resf/files/down/docById, + /resf/files/downloadPlist, + /resf/files/downloadApp, + /resf/files/downloadAppById, + + + + TokenHoldTime + 315360003600*24*365=31536000 + + + dataSource + als + + + encoding + GBK + + + + SessionAndContextFilter + /webapi/* + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index f7bfa3e24..3f20081db 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -54,16 +54,6 @@ RunFilter /servlet/view/* - - - WebServiceFilter - com.tenwa.makeContract.WebServiceFilter - - - WebServiceFilter - /services/* - - InitAREServlet com.amarsoft.are.InitAREServlet @@ -110,7 +100,7 @@ GBK - + InitSecondHandCarConfig com.amarsoft.app.awe.config.InitSecondHandCarConfig @@ -120,7 +110,7 @@ 1 - + InitCollectConfig com.amarsoft.app.awe.config.InitCollectConfig @@ -130,7 +120,7 @@ 1 - + RewriteRunJavaMethodServlet com.tenwa.workflow.RewriteRunJavaMethodServlet @@ -192,14 +182,6 @@ FileTemplateViewServlet com.amarsoft.filetemplate.servlet.FileTemplateViewServlet - - InvoiceDownloadServlet - com.tenwa.app.invoice.servlet.InvoiceDownloadServlet - - - InvoiceLotDownloadServlet - com.tenwa.app.invoice.servlet.InvoiceLotDownloadServlet - DocDownloadServlet com.tenwa.doc.servlet.DocDownloadServlet @@ -292,14 +274,6 @@ FileTemplateViewServlet /servlet/view/fileTemplateView - - InvoiceDownloadServlet - /servlet/view/invoiceDownloadServlet - - - InvoiceLotDownloadServlet - /servlet/view/invoiceLotDownloadServlet - DocDownloadServlet /servlet/view/docDownloadServlet @@ -330,10 +304,6 @@ FileViewServlet /servlet/view/file - - FileViewServlet1 - /servlet/view/file1 - ShowImageServlet /servlet/view/image @@ -446,7 +416,7 @@ Shareable - 480 + 240 InitDBType @@ -470,6 +440,7 @@ 5 + @@ -477,6 +448,7 @@ singleSignon false + webAppRootKey webapp.port @@ -515,19 +487,6 @@ RestfullServlet /webapi/resf/* - - - XFireServlet - - org.codehaus.xfire.transport.http.XFireConfigurableServlet - - - - XFireServlet - /services/* - - - restfull鑷姩鎵弿璺緞璁剧疆 RestfullScanPackage @@ -543,7 +502,7 @@ apx.com.amarsoft.als.apzl.apply.business.query.controller, apx.com.amarsoft.als.apzl.apply.business.start.controller, - + apx.com.amarsoft.als.apzl.apply.business.doc.detail.controller, apx.com.amarsoft.als.apzl.apply.business.doc.upload.controller, apx.com.amarsoft.als.apzl.apply.business.doc.delete.controller, @@ -555,24 +514,24 @@ apx.com.amarsoft.als.currency.select.apzl.product.controller, apx.com.amarsoft.als.currency.select.apzl.contract.controller, - - + + apx.com.amarsoft.als.business.opinion.sign.controller, apx.com.amarsoft.als.business.opinion.history.controller, - + apx.com.amarsoft.als.business.attachment.controller, apx.com.amarsoft.als.doc.attribute.controller, - + apx.com.amarsoft.als.business.action.ready.controller, apx.com.amarsoft.als.business.action.submit.controller, apx.com.amarsoft.als.business.action.back.controller, apx.com.amarsoft.als.business.comm.action.controller, - + apx.com.amarsoft.als.base.awe.controller, @@ -592,19 +551,18 @@ NoCheckURI - /resf/logon/manager/logon, + /resf/logon/manager/logon, /resf/logon/manager/logout, - /resf/user/center/manager/acquisition/gesture, + /resf/user/center/manager/acquisition/gesture, /resf/user/center/manager/close/gesture, /resf/user/center/manager/detection/version, - + /resf/files/down/docById, /resf/files/downloadPlist, /resf/files/downloadApp, /resf/files/downloadAppById, - /servlet/view/file1, @@ -627,4 +585,4 @@ - + \ No newline at end of file diff --git a/WebContent/WebContent/ProductManage/ParameterConfig/ParameterInfo.jsp b/WebContent/WebContent/ProductManage/ParameterConfig/ParameterInfo.jsp new file mode 100644 index 000000000..9d2571af7 --- /dev/null +++ b/WebContent/WebContent/ProductManage/ParameterConfig/ParameterInfo.jsp @@ -0,0 +1,129 @@ +<%@page import="com.amarsoft.app.base.util.SystemHelper"%> +<%@page import="com.amarsoft.app.base.util.ObjectWindowHelper"%> +<%@page import="com.amarsoft.app.base.businessobject.*"%> +<%@ page contentType="text/html; charset=GBK"%><%@ + include file="/Frame/resources/include/include_begin_info.jspf"%> + + <% + /* + 页面说明: 示例列表页面 + */ + String PG_TITLE = "产品参数详情"; + String parameterID = CurPage.getParameter("ParameterID"); //参数编号 + if(parameterID==null) parameterID=""; + String rightType = CurPage.getParameter("RightType"); + BusinessObject inputParameter=SystemHelper.getPageComponentParameters(CurPage); + ASObjectWindow dwTemp =ObjectWindowHelper.createObjectWindow_Info("PRD_ParameterInfo", inputParameter, CurPage, request); + ASDataObject doTemp=dwTemp.getDataObject(); + doTemp.setBusinessProcess("com.amarsoft.app.als.businessobject.web.XMLBusinessObjectProcessor"); + //将ParaID作为参数传给显示模板 + dwTemp.genHTMLObjectWindow(""); + + + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","save()","","","",""} + }; + +%><%@ +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/config/bigdata.properties b/WebContent/config/bigdata.properties new file mode 100644 index 000000000..f57a7f289 --- /dev/null +++ b/WebContent/config/bigdata.properties @@ -0,0 +1,22 @@ +#bigdata config +count = 3 +keyword1 = ProjectId +keyword2 = CustId +keyword3 = +keyword4 = +keyword5 =fullcardNo + +#pengyuan +pengyuanUrl=https://47.93.227.86:8094 +pengyuanServer=/services/WebServiceSingleQuery?wsdl +userId = apwsqueryn +password = {MD5}fZ5p+Gnj7FWvmdrBRWy+oQ== +methodType = queryReport + + + + + + + + diff --git a/WebContent/fileTemplate/C绔敭鍚庡洖绉熷悎鍚岋紙缃戠害杞︼級.docx b/WebContent/fileTemplate/C绔敭鍚庡洖绉熷悎鍚岋紙缃戠害杞︼級.docx new file mode 100644 index 000000000..adfc498d4 Binary files /dev/null and b/WebContent/fileTemplate/C绔敭鍚庡洖绉熷悎鍚岋紙缃戠害杞︼級.docx differ diff --git a/WebContent/fileTemplate/涔樼敤杞﹁溅鍨嬪鍏.xlsx b/WebContent/fileTemplate/涔樼敤杞﹁溅鍨嬪鍏.xlsx new file mode 100644 index 000000000..11efb0aa1 Binary files /dev/null and b/WebContent/fileTemplate/涔樼敤杞﹁溅鍨嬪鍏.xlsx differ diff --git a/WebContent/fileTemplate/淇濆肩璧.docx b/WebContent/fileTemplate/淇濆肩璧.docx new file mode 100644 index 000000000..7ba554a31 Binary files /dev/null and b/WebContent/fileTemplate/淇濆肩璧.docx differ diff --git a/WebContent/fileTemplate/鍌敹鍑.docx b/WebContent/fileTemplate/鍌敹鍑.docx index 03e63de5e..fdf0d01ee 100644 Binary files a/WebContent/fileTemplate/鍌敹鍑.docx and b/WebContent/fileTemplate/鍌敹鍑.docx differ diff --git a/WebContent/fileTemplate/鍑瘉瀵煎嚭.xlsx b/WebContent/fileTemplate/鍑瘉瀵煎嚭.xlsx index b52a79dfe..642cfa956 100644 Binary files a/WebContent/fileTemplate/鍑瘉瀵煎嚭.xlsx and b/WebContent/fileTemplate/鍑瘉瀵煎嚭.xlsx differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_C绔.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_C绔.docx index b1d3b4128..337df6568 100644 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_C绔.docx and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_C绔.docx differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_S绔.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_S绔.docx deleted file mode 100644 index 3f2db9f3c..000000000 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_S绔.docx and /dev/null differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_涓撶敤杞.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_涓撶敤杞.docx new file mode 100644 index 000000000..8340a5df2 Binary files /dev/null and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_涓撶敤杞.docx differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯I.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯I.docx deleted file mode 100644 index af844d772..000000000 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯I.docx and /dev/null differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯S.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯S.docx deleted file mode 100644 index 823b2dd93..000000000 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_鍖楁苯S.docx and /dev/null differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_澶ч.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_澶ч.docx index 0081312a2..df4d2b66e 100644 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_澶ч.docx and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_澶ч.docx differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_绗竴杞﹁捶.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_绗竴杞﹁捶.docx index 74c2fe743..0921425fc 100644 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_绗竴杞﹁捶.docx and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級_绗竴杞﹁捶.docx differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚-淇鐗.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚-淇鐗.docx deleted file mode 100644 index b11602a1d..000000000 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚-淇鐗.docx and /dev/null differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚宊鍑嵎.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚宊鍑嵎.docx index aa3ba8204..14dfd6aca 100644 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚宊鍑嵎.docx and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚宊鍑嵎.docx differ diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚宊缃戠害杞.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚宊缃戠害杞.docx deleted file mode 100644 index 72974ee93..000000000 Binary files a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚宊缃戠害杞.docx and /dev/null differ diff --git a/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx b/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx deleted file mode 100644 index 824ed5f1f..000000000 Binary files a/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx and /dev/null differ diff --git a/WebContent/fileTemplate/鏀炬淇℃伅{CONTRACT_NUMBER}.xlsx b/WebContent/fileTemplate/鏀炬淇℃伅{CONTRACT_NUMBER}.xlsx deleted file mode 100644 index de2ea2237..000000000 Binary files a/WebContent/fileTemplate/鏀炬淇℃伅{CONTRACT_NUMBER}.xlsx and /dev/null differ diff --git a/WebContent/fileTemplate/鏀炬閫氱煡涔﹀強鏀炬鍒拌处纭涔.docx b/WebContent/fileTemplate/鏀炬閫氱煡涔﹀強鏀炬鍒拌处纭涔.docx index 7fb8d12a4..65a81ec4c 100644 Binary files a/WebContent/fileTemplate/鏀炬閫氱煡涔﹀強鏀炬鍒拌处纭涔.docx and b/WebContent/fileTemplate/鏀炬閫氱煡涔﹀強鏀炬鍒拌处纭涔.docx differ diff --git a/WebContent/fileTemplate/娓犻亾鍟嗗偓鏀舵姤琛.xlsx b/WebContent/fileTemplate/娓犻亾鍟嗗偓鏀舵姤琛.xlsx deleted file mode 100644 index 50cf2c03e..000000000 Binary files a/WebContent/fileTemplate/娓犻亾鍟嗗偓鏀舵姤琛.xlsx and /dev/null differ diff --git a/WebContent/fileTemplate/娓犻亾鍟嗙閲戣鍒掓姤琛.xlsx b/WebContent/fileTemplate/娓犻亾鍟嗙閲戣鍒掓姤琛.xlsx deleted file mode 100644 index bcf4f2c22..000000000 Binary files a/WebContent/fileTemplate/娓犻亾鍟嗙閲戣鍒掓姤琛.xlsx and /dev/null differ diff --git a/WebContent/fileTemplate/娓犻亾鍟嗙粨娓呮暟鎹姤琛.xlsx b/WebContent/fileTemplate/娓犻亾鍟嗙粨娓呮暟鎹姤琛.xlsx deleted file mode 100644 index 07edfaaba..000000000 Binary files a/WebContent/fileTemplate/娓犻亾鍟嗙粨娓呮暟鎹姤琛.xlsx and /dev/null differ diff --git a/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NO} .xlsx b/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NO} .xlsx deleted file mode 100644 index 1a20dbd79..000000000 Binary files a/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NO} .xlsx and /dev/null differ diff --git a/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NUMBER}.xlsx b/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NUMBER}.xlsx deleted file mode 100644 index e616c5a49..000000000 Binary files a/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NUMBER}.xlsx and /dev/null differ diff --git a/WebContent/fileTemplate/缃戦摱妯℃澘.xlsx b/WebContent/fileTemplate/缃戦摱妯℃澘.xlsx index c6639ad32..b73ae1279 100644 Binary files a/WebContent/fileTemplate/缃戦摱妯℃澘.xlsx and b/WebContent/fileTemplate/缃戦摱妯℃澘.xlsx differ diff --git a/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洖绉 .docx b/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洖绉 .docx new file mode 100644 index 000000000..ebb35fa31 Binary files /dev/null and b/WebContent/fileTemplate/铻嶈祫绉熻祦鍚堝悓-C绔洖绉 .docx differ diff --git a/WebContent/fileTemplate/璁℃彁鍒嗘憡椤甸潰.xlsx b/WebContent/fileTemplate/璁℃彁鍒嗘憡椤甸潰.xlsx index d53c3ee1f..96e867a3e 100644 Binary files a/WebContent/fileTemplate/璁℃彁鍒嗘憡椤甸潰.xlsx and b/WebContent/fileTemplate/璁℃彁鍒嗘憡椤甸潰.xlsx differ diff --git a/WebContent/fileTemplate/璐㈠姟鎶ヨ〃瀵煎嚭妯℃澘.xlsx b/WebContent/fileTemplate/璐㈠姟鎶ヨ〃瀵煎嚭妯℃澘.xlsx index ed08bae96..bad9ff54e 100644 Binary files a/WebContent/fileTemplate/璐㈠姟鎶ヨ〃瀵煎嚭妯℃澘.xlsx and b/WebContent/fileTemplate/璐㈠姟鎶ヨ〃瀵煎嚭妯℃澘.xlsx differ diff --git a/WebContent/fileTemplate/璐存伅瀵煎叆.xlsx b/WebContent/fileTemplate/璐存伅瀵煎叆.xlsx index 60e7cf27e..077efde07 100644 Binary files a/WebContent/fileTemplate/璐存伅瀵煎叆.xlsx and b/WebContent/fileTemplate/璐存伅瀵煎叆.xlsx differ diff --git a/WebContent/fileTemplate/璧勯噾瀹炴敹鎶ヨ〃瀵煎嚭.xlsx b/WebContent/fileTemplate/璧勯噾瀹炴敹鎶ヨ〃瀵煎嚭.xlsx index 94860eafe..a33745c96 100644 Binary files a/WebContent/fileTemplate/璧勯噾瀹炴敹鎶ヨ〃瀵煎嚭.xlsx and b/WebContent/fileTemplate/璧勯噾瀹炴敹鎶ヨ〃瀵煎嚭.xlsx differ diff --git a/WebContent/js/tracywindy/tracywindyUtils.js b/WebContent/js/tracywindy/tracywindyUtils.js index 424d0557d..5044b6c66 100644 --- a/WebContent/js/tracywindy/tracywindyUtils.js +++ b/WebContent/js/tracywindy/tracywindyUtils.js @@ -763,6 +763,7 @@ function attachmentDown(config){ url:getRootPath()+tempurl, method:'POST', success:function(rs){ + debugger; var tempreturnType=returnType; var updatetable=config.uploadid; var contractlist= rs.responseText; @@ -977,6 +978,7 @@ function getFuncRightManage(userid,deptcolumn,managecolumn){ async:false, params:params, success:function(res){ + debugger; var jsonData1 = ''; jsonData1=eval("(" + res.responseText + ")"); datas = jsonData1["datas"]; diff --git a/WebContent/vouchers.properties b/WebContent/vouchers.properties new file mode 100644 index 000000000..f425ea55b --- /dev/null +++ b/WebContent/vouchers.properties @@ -0,0 +1,130 @@ +#凭证信息 +#账套 +voucher_account=8 +#单据类型 +voucher_billtype=vouchergl +#集团编码 +voucher_groupcode=06 +#系统参数 +voucher_isexchange=Y +#接收方 +voucher_receiver=807001002001 +#外系统编码 +voucher_sender=GL +#系统参数 +voucher_replace=Y +#凭证类别 +voucher_pk_vouchertype=01 +#来源系统 +voucher_pk_system=GL +#凭证类型值 +voucher_voucherkind=0 +#核算账簿 +voucher_pk_accountingbook=807001002001-0001 +#制单人 +voucher_pk_prepared=807yewuxitong +#所属组织 +voucher_pk_org=807001002001 +#所属集团 +voucher_pk_group=06 +#币种 +voucher_pk_currtype=CNY + + + +#客户信息 +#账套 +customer_account=8 +#单据类型 +customer_billtype=customer +#集团编码 +customer_groupcode=06 +#系统参数 +customer_isexchange=Y +#接收方 +customer_receiver=807001002001 +#外系统编码 +customer_sender=kh01 +#系统参数 +customer_replace=Y +#所属集团 +customer_pk_group=06 +#所属组织 +customer_pk_org=06 +#客户基本分类 +customer_pk_custclass=0202 +#国家地区 +customer_pk_country=CN +#时区 +customer_pk_timezone=P0800 +#数据格式 +customer_pk_format=ZH-CN + + + +#经销商信息 +#账套 +distributor_account=8 +#单据类型 +distributor_billtype=supplier +#集团编码 +distributor_groupcode=06 +#系统参数 +distributor_isexchange=Y +#接收方 +distributor_receiver=Y +#外系统编码 +distributor_sender=gys01 +#系统参数 +distributor_replace=Y +#所属集团 +distributor_pk_group=06 +#所属组织 +distributor_pk_org=06 +#供应商基本分类 +distributor_pk_supplierclass=0202 +#国家地区 +distributor_pk_country=CN +#时区 +distributor_pk_timezone=P0800 +#账数据格式 +distributor_pk_format=ZH-CN + + + +#合同信息 +#账套 +contract_account=8 +#单据类型 +contract_billtype=defdoc +#集团编码 +contract_groupcode=06 +#系统参数 +contract_isexchange=Y +#接收方 +contract_receiver=06 +#外系统编码 +contract_sender=ht +#系统参数 +contract_replace=Y +#所属集团 +contract_pk_group=06 +#所属组织 +contract_pk_org=06 + + + +#用友连接配置-测试:http://172.16.0.88:9990/service/XChangeServlet?account=8&groupcode=06 +#用友连接配置-正式:http://sk.baicgroup.com.cn:80/service/XChangeServlet?account=8&groupcode=06 +#IP地址及端口 +NC_URL=http://sk.baicgroup.com.cn:80 +#账套 +account=8 +#集团编码 +groupcode=06 +#传输xml文件存放路径 +LOCALHOST_URL=//data//files//apzl_leasing//tmp//XZW// +#回执信息存放路径 +RECEIVE_URL=//data//files//apzl_leasing//tmp//WEN// + + diff --git a/calc/com/tenwa/flow/ChangeWechatSubmitFlow.java b/calc/com/tenwa/flow/ChangeWechatSubmitFlow.java deleted file mode 100644 index c6f42abbd..000000000 --- a/calc/com/tenwa/flow/ChangeWechatSubmitFlow.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.tenwa.flow; - -import jbo.app.WECHAT_ADVANCE_SETTLE; -import jbo.app.WECHAT_BANKNUMBER_CHANGE; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.util.Transaction; -import com.tenwa.flow.baseBussion.BaseBussiness; - -/* - * 修改微信公众号提交修改信息状态 - */ -public class ChangeWechatSubmitFlow extends BaseBussiness{ - - @Override - public Object run(Transaction Sqlca) throws Exception { - this.initBussinessParam(Sqlca); - String flowunid = this.getAttribute("ObjectNo").toString(); - String flowName = this.getAttribute("FlowName").toString(); - String ContractId = this.getAttribute("ContractId").toString(); - BizObjectManager lciMange = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,Sqlca); - BizObject lci = lciMange.createQuery("id=:id").setParameter("id", ContractId).getSingleResult(false); - String contractNo = lci.getAttribute("contract_no").toString(); - if("扣款信息变更审核".equals(flowName)){ - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BANKNUMBER_CHANGE.CLASS_NAME,Sqlca); - BizObject wbc = wbcMange.createQuery("contract_no=:contractNo and STATUS='处理中' " ).setParameter("contractNo", contractNo).getSingleResult(true); - if(wbc != null){ - wbc.setAttributeValue("flowUnid", flowunid); - wbc.setAttributeValue("flowStatus", "已提交"); - wbcMange.saveObject(wbc); - } - }else if ("提前结清".equals(flowName)){ - BizObjectManager wasMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME,Sqlca); - BizObject wbc = wasMange.createQuery("contract_no=:contractNo and (STATUS='处理中' or STATUS='已受理' ) " ).setParameter("contractNo", contractNo).getSingleResult(true); - if(wbc != null){ - wbc.setAttributeValue("flowUnid", flowunid); - wbc.setAttributeValue("flowStatus", "已提交"); - wasMange.saveObject(wbc); - } - } - return "true"; - } -} diff --git a/calc/com/tenwa/flow/ChangeWechatSubmitStatus.java b/calc/com/tenwa/flow/ChangeWechatSubmitStatus.java deleted file mode 100644 index 9a9e50bc8..000000000 --- a/calc/com/tenwa/flow/ChangeWechatSubmitStatus.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.tenwa.flow; - -import java.text.SimpleDateFormat; -import java.util.Date; - -import jbo.app.WECHAT_ADVANCE_SETTLE; -import jbo.app.WECHAT_BANKNUMBER_CHANGE; -import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; -import jbo.sys.FLOW_OPINION; -import jbo.sys.FLOW_TASK; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.util.Transaction; -import com.tenwa.flow.baseBussion.BaseBussiness; - -/* - * 修改微信公众号提交修改信息状态 - */ -public class ChangeWechatSubmitStatus extends BaseBussiness{ - - @Override - public Object run(Transaction Sqlca) throws Exception { - this.initBussinessParam(Sqlca); - String flowunid = this.getAttribute("ObjectNo").toString(); - String flowName = this.getAttribute("FlowName").toString(); - BizObjectManager ftManage = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,Sqlca); - BizObjectManager foManager = JBOFactory.getBizObjectManager(FLOW_OPINION.CLASS_NAME,Sqlca); - BizObjectManager bumManager = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME,Sqlca); - - Date date1 = new Date() ; //获取系统时间 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); //日期格式 - String date = sdf.format(date1); //将系统时间转换成上方指定类型 - if("扣款信息变更审核".equals(flowName)){ - BizObject ft = ftManage.createQuery(" objectno=:flowunid and phaseno='0010' ").setParameter("flowunid", flowunid).getSingleResult(false); - BizObject fo = foManager.createQuery(" SerialNo=:SerialNo ").setParameter("SerialNo", ft == null ? "" : ft.getAttribute("SerialNo").toString()).getSingleResult(false); - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BANKNUMBER_CHANGE.CLASS_NAME,Sqlca); - BizObject wbc = wbcMange.createQuery("flowUnid=:flowUnid " ).setParameter("flowUnid", flowunid).getSingleResult(true); - if(wbc != null){ - wbc.setAttributeValue("STATUS", "通过"); - wbc.setAttributeValue("flowStatus", "通过"); - wbc.setAttributeValue("UPDATETIME", date); - - wbc.setAttributeValue("opinions", fo == null ? "" : fo.getAttribute("phaseopinion")); - wbcMange.saveObject(wbc); - BizObject bum = bumManager.createQuery(" id=:id").setParameter("id", wbc.getAttribute("messgeId").toString()).getSingleResult(true); - if(bum != null ){ - bum.setAttributeValue("message_status", "has_process"); - bum.setAttributeValue("is_read", "has_read"); - bum.setAttributeValue("finish_time", date); - bum.setAttributeValue("read_time", date); - bumManager.saveObject(bum); - - } - - } - }else if ("提前结清".equals(flowName)){ - BizObject ft = ftManage.createQuery(" objectno=:flowunid and phaseno='0030' ").setParameter("flowunid", flowunid).getSingleResult(false); - BizObject fo = foManager.createQuery(" SerialNo=:SerialNo ").setParameter("SerialNo", ft == null ? "" : ft.getAttribute("SerialNo").toString()).getSingleResult(false); - - BizObjectManager wasMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME,Sqlca); - BizObject was = wasMange.createQuery(" flowUnid=:flowUnid " ).setParameter("flowUnid", flowunid).getSingleResult(true); - if(was != null){ - was.setAttributeValue("STATUS", "通过"); - was.setAttributeValue("flowStatus", "通过"); - was.setAttributeValue("opinions", fo == null ? "" : fo.getAttribute("phaseopinion")); - was.setAttributeValue("UPDATETIME", date); - - wasMange.saveObject(was); - BizObject bum = bumManager.createQuery(" id=:id").setParameter("id", was.getAttribute("messgeId").toString()).getSingleResult(true); - if(bum != null ){ - bum.setAttributeValue("message_status", "has_process"); - bum.setAttributeValue("is_read", "has_read"); - bum.setAttributeValue("finish_time", date); - bum.setAttributeValue("read_time", date); - bumManager.saveObject(bum); - - } - } - } - return "true"; - } -} diff --git a/calc/com/tenwa/flow/ChangeWechatSubmitStatusVeto.java b/calc/com/tenwa/flow/ChangeWechatSubmitStatusVeto.java deleted file mode 100644 index 9a64dfa9c..000000000 --- a/calc/com/tenwa/flow/ChangeWechatSubmitStatusVeto.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.tenwa.flow; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import jbo.app.WECHAT_ADVANCE_SETTLE; -import jbo.app.WECHAT_BANKNUMBER_CHANGE; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_HIS; -import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; -import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; -import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; -import jbo.sys.FLOW_OPINION; -import jbo.sys.FLOW_TASK; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.util.Transaction; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.flow.baseBussion.BaseBussiness; - -/* - * 修改微信公众号提交修改信息状态 - */ -public class ChangeWechatSubmitStatusVeto extends BaseBussiness{ - - @Override - public Object run(Transaction Sqlca) throws Exception { - this.initBussinessParam(Sqlca); - String flowunid = this.getAttribute("ObjectNo").toString(); - String flowName = this.getAttribute("FlowName").toString(); - String ProjectId = this.getAttribute("ProjectId").toString(); - BizObjectManager ftManage = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,Sqlca); - BizObjectManager foManager = JBOFactory.getBizObjectManager(FLOW_OPINION.CLASS_NAME,Sqlca); - BizObjectManager bumManager = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME,Sqlca); - - Date date1 = new Date() ; //获取系统时间 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); //日期格式 - String date = sdf.format(date1); //将系统时间转换成上方指定类型 - - if("扣款信息变更审核".equals(flowName)){ - BizObject ft = ftManage.createQuery(" objectno=:flowunid and phaseno='0010' ").setParameter("flowunid", flowunid).getSingleResult(false); - BizObject fo = foManager.createQuery(" SerialNo=:SerialNo ").setParameter("SerialNo", ft == null ? "" : ft.getAttribute("SerialNo").toString()).getSingleResult(false); - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BANKNUMBER_CHANGE.CLASS_NAME,Sqlca); - BizObject wbc = wbcMange.createQuery("flowUnid=:flowUnid " ).setParameter("flowUnid", flowunid).getSingleResult(true); - if(wbc != null){ - wbc.setAttributeValue("STATUS", "否决"); - wbc.setAttributeValue("flowStatus", "否决"); - wbc.setAttributeValue("opinions", fo == null ? "" : fo.getAttribute("phaseopinion")); - wbc.setAttributeValue("UPDATETIME", date); - wbcMange.saveObject(wbc); - BizObject bum = bumManager.createQuery(" id=:id").setParameter("id", wbc.getAttribute("messgeId").toString()).getSingleResult(true); - if(bum != null ){ - bum.setAttributeValue("message_status", "has_process"); - bum.setAttributeValue("is_read", "has_read"); - bum.setAttributeValue("finish_time", date); - bum.setAttributeValue("read_time", date); - bumManager.saveObject(bum); - } - } - - MapfromCondtion=new HashMap(); - fromCondtion.put("flowunid", flowunid); - Map otherProperty = new HashMap(); - otherProperty.put("Project_Id", ProjectId); - DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT_HIS.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT.CLASS_NAME, otherProperty, null, Sqlca); - }else if ("提前结清".equals(flowName)){ - BizObject ft = ftManage.createQuery(" objectno=:flowunid and phaseno='0030' ").setParameter("flowunid", flowunid).getSingleResult(false); - BizObject fo = foManager.createQuery(" SerialNo=:SerialNo ").setParameter("SerialNo", ft == null ? "" : ft.getAttribute("SerialNo").toString()).getSingleResult(false); - - - BizObjectManager wasMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME,Sqlca); - BizObject was = wasMange.createQuery(" flowUnid=:flowUnid " ).setParameter("flowUnid", flowunid).getSingleResult(true); - if(was != null){ - was.setAttributeValue("STATUS", "否决"); - was.setAttributeValue("flowStatus", "否决"); - was.setAttributeValue("opinions", fo == null ? "" : fo.getAttribute("phaseopinion")); - was.setAttributeValue("UPDATETIME", date); - wasMange.saveObject(was); - BizObject bum = bumManager.createQuery(" id=:id").setParameter("id", was.getAttribute("messgeId").toString()).getSingleResult(true); - if(bum != null ){ - bum.setAttributeValue("message_status", "has_process"); - bum.setAttributeValue("is_read", "has_read"); - bum.setAttributeValue("finish_time", date); - bum.setAttributeValue("read_time", date); - bumManager.saveObject(bum); - } - } - } - return "true"; - } -} diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java index 7361222d2..090ee619b 100644 --- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java +++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java @@ -19,7 +19,6 @@ public class CalcRentCompare implements BizObjectCompare{ private String ownName; private String ownNumber; private String accNumber; - private String ownId; @Override public boolean ObjectCompare(BizObject cObject, BizObject toObject) @@ -83,17 +82,10 @@ public class CalcRentCompare implements BizObjectCompare{ this.accNumber = accNumber; } - public String getOwnId() { - return ownId; - } - - public void setOwnId(String ownId) { - this.ownId = ownId; - } public String compare(JBOTransaction tx) throws JBOException{ - String sql ="select id from O where O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account') and own_id=:ownId "; - BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).setParameter("ownId", ownId).getSingleResult(false); + String sql ="select id from O where O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account')"; + BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).getSingleResult(false); if(bo==null||"".equals(bo)){ return "null"; } diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 9a602fe9d..d3345ebfc 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -12,27 +12,8 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; - -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 jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; -import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP; -import jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST; -import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION_TEMP; -import jbo.sys.CODE_LIBRARY; +import java.util.Set; import com.amarsoft.app.util.ProductParamUtil; import com.amarsoft.are.jbo.BizObject; @@ -43,7 +24,6 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.util.json.JSONEncoder; import com.amarsoft.are.util.json.JSONObject; import com.amarsoft.awe.util.SqlObject; -import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.comm.exception.BusinessException; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; @@ -69,6 +49,24 @@ 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 jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; +import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP; +import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION_TEMP; +import jbo.sys.CODE_LIBRARY; + /** * * @author chuang 租金测算主入口 @@ -1135,22 +1133,12 @@ public class CreateTransactionExecutor implements Transaction { BizObjectManager letManage = JBOFactory.getBizObjectManager(LB_EQUIPMENT_TEMP.CLASS_NAME); List lccts = lcctManage.createQuery(" project_id=:projectid and flowunid<>:flowunid and contract_plan_number<>'' ").setParameter("projectid", projectId).setParameter("flowunid", flowunid).getResultList(false); for (BizObject lcct : lccts) { - double equip_money=0; - if(lcct.getAttribute("EQUIP_AMT")!=null&&!"".endsWith(lcct.getAttribute("EQUIP_AMT").getString())){ - equip_money = new Double(lcct.getAttribute("EQUIP_AMT").getString()); - }; + lcct.getAttribute("EQUIP_AMT").getString(); + double equip_money = new Double(lcct.getAttribute("EQUIP_AMT").getString()); sumMoney = sumMoney+equip_money; } - com.amarsoft.awe.util.Transaction Sqlca =null; - Sqlca = com.amarsoft.awe.util.Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - String sql = "select sum(EQUIP_PRICE) as EQUIP_PRICE from LB_EQUIPMENT_TEMP O where O.flowunid='"+flowunid+"'"; - SqlObject sqlobj = new SqlObject(sql); - String money = Sqlca.getString(sqlobj); - if(money==null||"".equals(money)){ - money="0"; - } - double equip_money = new Double(money); - Sqlca.commit(); + BizObject letm = letManage.createQuery("flowunid=:flowunid").setParameter("flowunid", this.flowunid).getSingleResult(false); + double equip_money = new Double(letm.getAttribute("EQUIP_PRICE").getString()).doubleValue(); return (equip_money-sumMoney)+""; } diff --git a/calc/com/tenwa/reckon/executor/EvenInterestExecutor.java b/calc/com/tenwa/reckon/executor/EvenInterestExecutor.java index 6144cecbd..4c3042ff4 100644 --- a/calc/com/tenwa/reckon/executor/EvenInterestExecutor.java +++ b/calc/com/tenwa/reckon/executor/EvenInterestExecutor.java @@ -86,16 +86,8 @@ public class EvenInterestExecutor extends FundRentPlanExecutor { public void calFina(ConditionBean cb, TabCalBean tcb, int startList, FundRentPlanBean frpb) throws Exception { - // 加载利息列表 - InterestCalServiceImpl icsi = new InterestCalServiceImpl(); - List interests = icsi.getInterestList(frpb.getRentList(), cb.getCleanLeaseMoney(), cb.getYearRate(), cb.getPeriodType(), cb.getGrace(), cb.getIncomeNumberYear(), cb.getEquipEndValue(),cb.getRateAdjustType()); - // frpb.setInterestBusinessList(frpb.getColumn_2()); - frpb.setInterestBusinessList(interests); - // 加载本金列表 - CorpusServiceImpl csi = new CorpusServiceImpl(); - List corpusList = csi.getCorpusList(frpb.getRentList(), frpb.getInterestBusinessList()); - // frpb.setCorpusBusinessList(frpb.getColumn_1()); - frpb.setCorpusBusinessList(corpusList); + frpb.setInterestBusinessList(frpb.getColumn_2()); + frpb.setCorpusBusinessList(frpb.getColumn_1()); // 加载调整信息列表 RentPlanServiceImpl rpsi = new RentPlanServiceImpl(); diff --git a/calc/com/tenwa/reckon/executor/Transaction.java b/calc/com/tenwa/reckon/executor/Transaction.java index 731c10de2..71fe6eecc 100644 --- a/calc/com/tenwa/reckon/executor/Transaction.java +++ b/calc/com/tenwa/reckon/executor/Transaction.java @@ -6,7 +6,6 @@ import java.util.Map; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.util.json.JSONObject; -import com.tenwa.reckon.bean.AdjustBean; import com.tenwa.reckon.bean.ConditionBean; import com.tenwa.reckon.bean.FundRentPlanBean; import com.tenwa.reckon.bean.TabCalBean; @@ -18,6 +17,7 @@ public interface Transaction { */ public String run(); public void runTrans( JBOTransaction tx ) throws Exception; + public FundRentPlanBean createRentPlan(TabCalBean bean,JBOTransaction tx) throws Exception; public void createFundPlan(FundRentPlanBean rentPlan, TabCalBean bean,JBOTransaction tx) throws Exception; public String createCashFlow(TabCalBean bean,JBOTransaction tx) throws Exception; diff --git a/calc/com/tenwa/reckon/help/CalcConditionCopyService.java b/calc/com/tenwa/reckon/help/CalcConditionCopyService.java index 816afb842..310ebb24f 100644 --- a/calc/com/tenwa/reckon/help/CalcConditionCopyService.java +++ b/calc/com/tenwa/reckon/help/CalcConditionCopyService.java @@ -117,8 +117,7 @@ public class CalcConditionCopyService { DataOperatorUtil.copyJBOSet(LC_CALC_RULES_TEMP.CLASS_NAME, fromCondition,LC_PROJ_RULES.CLASS_NAME, toCondition, otherProperty, null, tx); //租金计划 DataOperatorUtil.copyJBOSet(LC_RENT_PLAN_TEMP.CLASS_NAME, fromCondition,LC_PROJ_RENT_PLAN.CLASS_NAME, toCondition, otherProperty, null, tx); - //资金计划 - DataOperatorUtil.copyJBOSet(LC_FUND_PLAN_TEMP.CLASS_NAME, fromCondition,LC_PROJ_FUND_PLAN.CLASS_NAME, toCondition, otherProperty, null, tx); + DataOperatorUtil.copyJBOSet(LC_FUND_PLAN_TEMP.CLASS_NAME, fromCondition, LC_PROJ_FUND_PLAN.CLASS_NAME, toCondition, otherProperty, null, tx); //现金流 DataOperatorUtil.copyJBOSet(LC_CASH_FLOW_TEMP.CLASS_NAME, fromCondition, LC_PROJ_CASH_FLOW.CLASS_NAME, toCondition, otherProperty, null, tx); //已知表 @@ -391,8 +390,6 @@ public class CalcConditionCopyService { DataOperatorUtil.copyJBOSet(LC_CALC_CONDITION_TEMP.CLASS_NAME, fromCondition,LC_CALC_CONDITION.CLASS_NAME, toCondition, otherProperty, null, tx); //租金计划 DataOperatorUtil.copyJBOSet(LC_RENT_PLAN_TEMP.CLASS_NAME, fromCondition,LC_RENT_PLAN.CLASS_NAME, toCondition, otherProperty, com, tx); - //资金计划 - DataOperatorUtil.copyJBOSet(LC_FUND_PLAN_TEMP.CLASS_NAME, fromCondition, LC_FUND_PLAN.CLASS_NAME, toCondition, otherProperty, null, tx); //现金流 DataOperatorUtil.copyJBOSet(LC_CASH_FLOW_TEMP.CLASS_NAME, fromCondition, LC_CASH_FLOW.CLASS_NAME, toCondition, otherProperty, null, tx); diff --git a/config/Wechat.properties b/config/Wechat.properties deleted file mode 100644 index f3c78b81b..000000000 --- a/config/Wechat.properties +++ /dev/null @@ -1,3 +0,0 @@ -# 微信推送消息接口路径 -# WechatURL=http://ont.ap-leasing.com/wxapi/template/send -WechatURL=http://ext.ap-leasing.com/wxapi/template/send \ No newline at end of file diff --git a/config/bigdata.properties b/config/bigdata.properties index cca3cffe4..9497d810f 100644 --- a/config/bigdata.properties +++ b/config/bigdata.properties @@ -7,26 +7,8 @@ keyword4 = keyword5 =fullcardNo #pengyuan -#shenzhen canshu -#pengyuanUrl=http://www.pycredit.com:8001 -pengyuanUrl=http://test.pycredit.com:6001 +pengyuanUrl=http://www.pycredit.com:8443 pengyuanServer=/services/WebServiceSingleQuery?wsdl - -userId = apwsqueryn01 -password = {MD5}i3rx5Ta+2VL5Dj5T866giQ== +userId = apwsqueryn +password = {MD5}fZ5p+Gnj7FWvmdrBRWy+oQ== methodType = queryReport - - -#tianjin canshu -t_pengyuanUrl=http://test.pycredit.com:6001 -t_pengyuanServer=/services/WebServiceSingleQuery?wsdl -t_userId = apwsqueryn01 -t_password = {MD5}i3rx5Ta+2VL5Dj5T866giQ== -t_methodType = queryReport - - - - - - - diff --git a/config/collect_config.properties b/config/collect_config.properties index 2dc335c20..96a704927 100644 --- a/config/collect_config.properties +++ b/config/collect_config.properties @@ -1,46 +1,53 @@ -#sheng chan huan jing url -#com.tenwa.yangdm.collect.serverUrl=http://cps.gnete.com/ProcessServlet -#com.tenwa.yangdm.bank.serverUrl=http://cps.gnete.com:8191/gzdsf/ProcessServlet - -#ce shi huan jing url dai shou collect si yao su bank feiyasuo -com.tenwa.yangdm.collect.serverUrl=http://59.41.103.98:333/gzdsf/ProcessServlet -com.tenwa.yangdm.bank.serverUrl=http://59.41.103.98:9110/gzdsf/ProcessServlet -#--------------------------------------------------------------------------------------------- - -#clearFile downUrl -com.tenwa.yangdm.bank.clearRequestUrl=http://59.41.103.98:9110/gzdsf/GetSettFile.do -#com.tenwa.yangdm.merchantId=000191400207649 -#test shang hu dai ma -com.tenwa.yangdm.merchantId=001053110000001 - -#--------------------------------------------------------------------------------------------- -#daishoupeizhi ( 'S' dai biao dai shou,batch.trxCode dai biao piliangdaishou,collect.trxCode dai biao shishidaishou,version banbenhao) -com.tenwa.yangdm.collect.flag=S -com.tenwa.yangdm.batch.trxCode=100001 -#com.tenwa.yangdm.collect.trxCode=100001 -com.tenwa.yangdm.collect.trxCode=100004 -com.tenwa.yangdm.collect.version=05 - -#ye wu dui ying yin hang dai ma bian hao(10702 wei zu ling) -com.tenwa.yangdm.collect.dataType=2 -com.tenwa.yangdm.collect.level=5 -#yi xia shi yao yong de yong hu ming he mi ma(zheng shi tou chan hou xiu gai) -#com.tenwa.yangdm.collect.userName=00019140020764901 -#com.tenwa.yangdm.collect.userPass=TPSHauto123. -com.tenwa.yangdm.collect.businessCode=10702 - -#test (ce shi huan jing zheng shi tou chan hou zhu shi diao) -com.tenwa.yangdm.collect.userName=operator -com.tenwa.yangdm.collect.userPass=ora_123456 -com.tenwa.yangdm.collect.businessCode=10600 - -#yin hang ka si yao su yan zheng -com.tenwa.yangdm.bank.trxCode=100039 -com.tenwa.yangdm.bank.version=03 -com.tenwa.yangdm.bank.dataType=2 -com.tenwa.yangdm.bank.level=5 - -#an quan zheng shu xiang guan (si yao he gong yao de cun fang wei zhi) -com.tenwa.yangdm.publicKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\gzdsf.cer -com.tenwa.yangdm.privateKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\ORA@TEST1.p12 -#com.tenwa.yangdm.privateKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\cps@00019140020764901.p12 \ No newline at end of file +#sheng chan huan jing url +#com.tenwa.yangdm.collect.serverUrl=https://cps.gnete.com:8085/ProcessServlet +#com.tenwa.yangdm.bank.serverUrl=https://cps.gnete.com:8191/gzdsf/ProcessServlet + +#ce shi huan jing url dai shou collect si yao su bank feiyasuo +#com.tenwa.yangdm.collect.serverUrl=https://cps.gnete.com:8085/gzdsf/ProcessServlet +com.tenwa.yangdm.collect.serverUrl=http://172.28.1.59:8085/gzdsf/ProcessServlet +com.tenwa.yangdm.bank.serverUrl=http://172.28.1.59:8085/gzdsf/ProcessServlet + + +#--------------------------------------------------------------------------------------------- + +#clearFile downUrl +com.tenwa.yangdm.bank.clearRequestUrl=http://172.28.1.59:8085/gzdsf/GetSettFile.do +#com.tenwa.yangdm.merchantId=000191400207649 +#test shang hu dai ma +#zheng shi +com.tenwa.yangdm.merchantId=000191400209238 +com.tenwa.yangdm.collect.userName=00019140020923804 +com.tenwa.yangdm.collect.userPass=APleasing-88 +com.tenwa.yangdm.collect.businessCode=10702 + +#--------------------------------------------------------------------------------------------- +#daishoupeizhi ( 'S' dai biao dai shou,batch.trxCode dai biao piliangdaishou,collect.trxCode dai biao shishidaishou,version banbenhao) +com.tenwa.yangdm.collect.flag=S +com.tenwa.yangdm.batch.trxCode=100001 +#com.tenwa.yangdm.collect.trxCode=100001 +com.tenwa.yangdm.collect.trxCode=100004 +com.tenwa.yangdm.collect.version=05 + +#ye wu dui ying yin hang dai ma bian hao(10702 wei zu ling) +com.tenwa.yangdm.collect.dataType=2 +com.tenwa.yangdm.collect.level=5 +#yi xia shi yao yong de yong hu ming he mi ma(zheng shi tou chan hou xiu gai) +#com.tenwa.yangdm.collect.userName=00019140020764901 +#com.tenwa.yangdm.collect.userPass=TPSHauto123. +#com.tenwa.yangdm.collect.businessCode=10702 + +#test (ce shi huan jing zheng shi tou chan hou zhu shi diao) +#com.tenwa.yangdm.collect.userName=operator +#com.tenwa.yangdm.collect.userPass=ora_123456 +#com.tenwa.yangdm.collect.businessCode=10600 + +#yin hang ka si yao su yan zheng +com.tenwa.yangdm.bank.trxCode=100039 +com.tenwa.yangdm.bank.version=03 +com.tenwa.yangdm.bank.dataType=2 +com.tenwa.yangdm.bank.level=5 + +#an quan zheng shu xiang guan (si yao he gong yao de cun fang wei zhi) +com.tenwa.yangdm.publicKeyUrl=/soft/files/yinlian/SecutyKey/gnete_pds.cer +com.tenwa.yangdm.privateKeyUrl=/soft/files/yinlian/SecutyKey/cps@00019140020923804.p12 +#com.tenwa.yangdm.privateKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\cps@00019140020764901.p12 diff --git a/config/credit.properties b/config/credit.properties index 84f5ac693..91b371206 100644 --- a/config/credit.properties +++ b/config/credit.properties @@ -1,26 +1,11 @@ #tong dun jie kou dizhi ceshi -apiUrl=https://apitest.tongdun.cn/bodyguard/apply/v4.2 +apiUrl=https://api.tongdun.cn:8083/bodyguard/apply/v4.2 -#shenzhen canshu #he zuo fang biao shi ceshi PARTNER_CODE=apgj #he zuo fang mi yao ceshi -PARTNER_KEY=3a7be6a6d73c48b18f083ddf8d399538 +PARTNER_KEY=2a0842b540e74c48ab1921f1f5d09378 #he zuo fang ying yong ming che ceshi -PARTNER_APP=apgj_web - - -#tianjin canshu -#tong dun jie kou dizhi ceshi -T_apiUrl=https://apitest.tongdun.cn/bodyguard/apply/v4.2 - -#he zuo fang biao shi ceshi -T_PARTNER_CODE=apgj - -#he zuo fang mi yao ceshi -T_PARTNER_KEY=3a7be6a6d73c48b18f083ddf8d399538 - -#he zuo fang ying yong ming che ceshi -T_PARTNER_APP=apgj_web \ No newline at end of file +PARTNER_APP=apgj_web \ No newline at end of file diff --git a/config/gps.properties b/config/gps.properties index 5847aa95c..c91504f7f 100644 --- a/config/gps.properties +++ b/config/gps.properties @@ -1,6 +1,9 @@ -TYuserAccount=tianyitest -TYtoken=9999 -TYsign=3474A2D7CFEC5DECD54DE8A263F7A4A9 -TYsign2=3474a2d7cfec5decd54de8a263f7a4a9 -TYUrl=http://121.43.178.183:9989/dispatch_intf/apiController/order -TYQueryOrderToVin=http://121.43.178.183:80/gps-intf/api2/getGpsInfosByCarVin \ No newline at end of file +TYuserAccount=apprd +TYtoken=128 +TYsign=F14D4C3CD95053F55E1B551361A9E302 +TYsign2=f14d4c3cd95053f55e1b551361a9e302 +#tainyi URL xiugaiqian beifen +#TYUrl=http://api.tianyigps.cn/dispatch_intf/apiController/order +#TYQueryOrderToVin=http://api.tianyigps.cn/gps-intf/api2/getGpsInfosByCarVin +TYUrl=http://172.28.1.59:8866/dispatch_intf/apiController/order +TYQueryOrderToVin=http://172.28.1.59:8867/gps-intf/api2/getGpsInfosByCarVin \ No newline at end of file diff --git a/config/interfacePlatform.properties b/config/interfacePlatform.properties index 0aee0d874..a90f40945 100644 --- a/config/interfacePlatform.properties +++ b/config/interfacePlatform.properties @@ -1,5 +1,5 @@ -url=http://localhost:8080/platform/batch/kjflc/ -FileToPush=pushToBatchDealAllTimer -AtTheEndOfContractPush=ContractFinishPushTimer -ContractLoanPush=loanPushTimer +url=https://ret.ap-leasing.com/platform/batch/kjflc/ +FileToPush=pushToBatchDealAllTimer +AtTheEndOfContractPush=ContractFinishPushTimer +ContractLoanPush=loanPushTimer PushApprovalOpinions=publicPushApproveTimer \ No newline at end of file diff --git a/config/license.properties b/config/license.properties index 3d3bc83c0..a62cef1e2 100644 --- a/config/license.properties +++ b/config/license.properties @@ -1,10 +1,2 @@ -#shenzhen #ying ke hu yao qiu xian guan bi shen fen yan zheng bas64jiami -#key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g= - - -#tianjin -#ying ke hu yao qiu xian guan bi shen fen yan zheng bas64jiami -#t_key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g= - -# \ No newline at end of file +key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g= \ No newline at end of file diff --git a/config/log4j.xml b/config/log4j.xml index 0d47c0200..fb7636820 100644 --- a/config/log4j.xml +++ b/config/log4j.xml @@ -9,7 +9,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -85,7 +85,6 @@ @@ -99,7 +98,6 @@ - @@ -109,19 +107,16 @@ - - - --> diff --git a/config/quartz.properties b/config/quartz.properties index 9ab59e615..8cecddd40 100644 --- a/config/quartz.properties +++ b/config/quartz.properties @@ -1,48 +1,53 @@ -org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnectForPools=true&autoReconnect=true&useSSL=false -org.quartz.dataSource.zhulhDS.user=338A48E135315FDBC2DF24EB080903D7 -org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3 -org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver -c3p0.minPoolSize=5 -c3p0.maxPoolSize=400 -c3p0.initialPoolSize=10 -c3p0.maxIdleTime=60 -c3p0.acquireIncrement=5 -c3p0.maxStatements=0 -c3p0.checkoutTimeout=0 -c3p0.breakAfterAcquireFailure=false -c3p0.testConnectionOnCheckout=false -c3p0.testConnectionOnCheckin=false -c3p0.idleConnectionTestPeriod=60 -c3p0.acquireRetryAttempts=10 -c3p0.acquireRetryDelay=1000 -c3p0.preferredTestQuery=select 1 - -org.quartz.scheduler.skipUpdateCheck=true -#QuartzScheduler -org.quartz.scheduler.instanceName=QuartzScheduler -org.quartz.scheduler.instanceId=AUTO -org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool -org.quartz.threadPool.threadCount=50 -org.quartz.threadPool.threadPriority=4 -org.quartz.jobStore.misfireThreshold=500 -org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX -org.quartz.jobStore.dataSource=zhulhDS -org.quartz.dataSource.zhulhDS.connectionProvider.class=com.tenwa.quartz.MyPoolingConnectionProvider -org.quartz.jobStore.tablePrefix=QRTZ_ -org.quartz.jobStore.isClustered=false -org.quartz.jobStore.clusterCheckinInterval=15000 -org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate -org.quartz.dataSource.zhulhDS.maxConnections=50 - -#control distributor(temporary) -distributor_role = 401 -#libreOffice -libreOffice_path=//opt//libreoffice5.4//program// - -#file_upload -fileType = jpg,png,gif,bmp,xlsx,rar,jpeg -fileNumLimit = 12 -#unit(m) -fileSizeLimit = 96 -fileSingleSizeLimit = 8 -autoUpload = true \ No newline at end of file +org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://rm-2zed0cp432cn85447.mysql.rds.aliyuncs.com:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnectForPools=true&autoReconnect=true&useSSL=false +org.quartz.dataSource.zhulhDS.user=338A48E135315FDBC2DF24EB080903D7 +#org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3 +org.quartz.dataSource.zhulhDS.key=C1CD9E690DFC628EE4114CA3F56B433D +org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver +c3p0.minPoolSize=5 +c3p0.maxPoolSize=400 +c3p0.initialPoolSize=10 +c3p0.maxIdleTime=60 +c3p0.acquireIncrement=5 +c3p0.maxStatements=0 +c3p0.checkoutTimeout=0 +c3p0.breakAfterAcquireFailure=false +c3p0.testConnectionOnCheckout=false +c3p0.testConnectionOnCheckin=false +c3p0.idleConnectionTestPeriod=60 +c3p0.acquireRetryAttempts=10 +c3p0.acquireRetryDelay=1000 +c3p0.preferredTestQuery=select 1 + +org.quartz.scheduler.skipUpdateCheck=true +#QuartzScheduler +org.quartz.scheduler.instanceName=QuartzScheduler +org.quartz.scheduler.instanceId=AUTO +org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool +org.quartz.threadPool.threadCount=25 +org.quartz.threadPool.threadPriority=5 +org.quartz.jobStore.misfireThreshold=600000 +org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX +org.quartz.jobStore.dataSource=zhulhDS +org.quartz.dataSource.zhulhDS.connectionProvider.class=com.tenwa.quartz.MyPoolingConnectionProvider +org.quartz.jobStore.tablePrefix=QRTZ_ +org.quartz.jobStore.isClustered=true +org.quartz.jobStore.clusterCheckinInterval=15000 +org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate +org.quartz.dataSource.zhulhDS.maxConnections=50 +org.quartz.dataSource.zhulhDS.validationQuery=select 0 from dual +#control distributor(temporary) +distributor_role = 401 +#libreOffice +libreOffice_path=/opt/libreoffice5.4/program/ + +#file_upload +#fileType = jpg,png,gif,bmp,xlsx,rar,jpeg,rar,zip,pdf,word +fileType = jpg,png,gif,bmp,xlsx,rar,jpeg,rar,zip,pdf,doc,docx,txt,xls,mp4,mov,m4v,avi,3gp,rm,rmvb,wmv,asf,mkv,vob,pptx,xlsm,vsdx +fileNumLimit = 12 +#unit(m) +fileSizeLimit = 600 +fileSingleSizeLimit = 50 +autoUpload = true +#webService bai ming dan +webServiceaddress=0:0:0:0:0:0:0:1|127.0.0.1|114.242.173.194|47.93.227.86|39.96.128.27|61.149.204.98|218.26.54.168|1.202.246.171 + diff --git a/config/telonline.properties b/config/telonline.properties index 44c8979ec..985f8d2c5 100644 --- a/config/telonline.properties +++ b/config/telonline.properties @@ -1,25 +1,11 @@ -#shenzhen canshu -#娴嬭瘯璇锋眰鍦板潃 +#\u751F\u4EA7\u8BF7\u6C42\u5730\u5740 com.tenwa.jianghd.url1=https -com.tenwa.jianghd.url2=apitest.tongdun.cn -com.tenwa.jianghd.url3=/bodyguard/apply/v4.3 +com.tenwa.jianghd.url2=api.tongdun.cn:8083 +com.tenwa.jianghd.url3=/bodyguard/apply/v4.2 com.tenwa.jianghd.partner_code=apgj -com.tenwa.jianghd.partner_key=3a7be6a6d73c48b18f083ddf8d399538 +com.tenwa.jianghd.partner_key=2a0842b540e74c48ab1921f1f5d09378 com.tenwa.jianghd.app_name=apgj_web com.tenwa.jianghd.biz_code=OnLine com.tenwa.jianghd.encode=UTF-8 - -#tianjin canshu -#娴嬭瘯璇锋眰鍦板潃 -com.tenwa.jianghd.t_url1=https -com.tenwa.jianghd.t_url2=apitest.tongdun.cn -com.tenwa.jianghd.t_url3=/bodyguard/apply/v4.3 - -com.tenwa.jianghd.t_partner_code=apgj -com.tenwa.jianghd.t_partner_key=3a7be6a6d73c48b18f083ddf8d399538 -com.tenwa.jianghd.t_app_name=apgj_web - -com.tenwa.jianghd.t_biz_code=OnLine -com.tenwa.jianghd.t_encode=UTF-8 \ No newline at end of file diff --git a/config/vouchers.properties b/config/vouchers.properties index 6452e86a3..f93a51966 100644 --- a/config/vouchers.properties +++ b/config/vouchers.properties @@ -1,137 +1,132 @@ -#凭证信息 -#账套 -voucher_account=8 -#单据类型 -voucher_billtype=vouchergl -#集团编码 -voucher_groupcode=06 -#系统参数 -voucher_isexchange=Y -#接收方 -voucher_receiver=807001002001 -#外系统编码 -voucher_sender=GL -#系统参数 -voucher_replace=Y -#凭证类别 -voucher_pk_vouchertype=01 -#来源系统 -voucher_pk_system=GL -#凭证类型值 -voucher_voucherkind=0 -#核算账簿 -voucher_pk_accountingbook=807001002001-0001 -#制单人 -voucher_pk_prepared=807yewuxitong -#所属组织 -voucher_pk_org=807001002001 -#所属集团 -voucher_pk_group=06 -#币种 -voucher_pk_currtype=CNY - - - -#客户信息 -#账套 -customer_account=8 -#单据类型 -customer_billtype=customer -#集团编码 -customer_groupcode=06 -#系统参数 -customer_isexchange=Y -#接收方 -customer_receiver=807001002001 -#外系统编码 -customer_sender=kh01 -#系统参数 -customer_replace=Y -#所属集团 -customer_pk_group=06 -#所属组织 -customer_pk_org=06 -#客户基本分类 -customer_pk_custclass=0202 -#国家地区 -customer_pk_country=CN -#时区 -customer_pk_timezone=P0800 -#数据格式 -customer_pk_format=ZH-CN - - - -#经销商信息 -#账套 -distributor_account=8 -#单据类型 -distributor_billtype=supplier -#集团编码 -distributor_groupcode=06 -#系统参数 -distributor_isexchange=Y -#接收方 -distributor_receiver=Y -#外系统编码 -distributor_sender=gys01 -#系统参数 -distributor_replace=Y -#所属集团 -distributor_pk_group=06 -#所属组织 -distributor_pk_org=06 -#供应商基本分类 -distributor_pk_supplierclass=0202 -#国家地区 -distributor_pk_country=CN -#时区 -distributor_pk_timezone=P0800 -#账数据格式 -distributor_pk_format=ZH-CN - - - -#合同信息 -#账套 -contract_account=8 -#单据类型 -contract_billtype=defdoc -#集团编码 -contract_groupcode=06 -#系统参数 -contract_isexchange=Y -#接收方 -contract_receiver=06 -#外系统编码 -contract_sender=ht -#系统参数 -contract_replace=Y -#所属集团 -contract_pk_group=06 -#所属组织 -contract_pk_org=06 - - - -#用友连接配置-测试:http://172.16.0.88:9990/service/XChangeServlet?account=8&groupcode=06 -#用友连接配置-正式:http://sk.baicgroup.com.cn:80/service/XChangeServlet?account=8&groupcode=06 -#IP地址及端口 -#NC_URL=http://sk.baicgroup.com.cn/ -NC_URL=http://172.16.0.88:9990/ -#NC_URL=http://test.baicgroup.com.cn/ -#账套 -account=8 -#集团编码 -groupcode=06 -#传输xml文件存放路径 -#LOCALHOST_URL=//data//files//apzl_leasing//tmp//XZW// -LOCALHOST_URL=E:\\voucherXml_NC\\ -#回执信息存放路径 -#RECEIVE_URL=//data//files//apzl_leasing//tmp//WEN// -RECEIVE_URL=E:\\VOUCHER_RECEIPT\\ -#异常信息存放路径 -#ERROR_URL=//data//files//apzl_leasing//tmp//NC_ERROR// -ERROR_URL=E:\\NC_ERROR\\ - - +#\u51ED\u8BC1\u4FE1\u606F +#\u8D26\u5957 +voucher_account=8 +#\u5355\u636E\u7C7B\u578B +voucher_billtype=vouchergl +#\u96C6\u56E2\u7F16\u7801 +voucher_groupcode=06 +#\u7CFB\u7EDF\u53C2\u6570 +voucher_isexchange=Y +#\u63A5\u6536\u65B9 +voucher_receiver=807001002001 +#\u5916\u7CFB\u7EDF\u7F16\u7801 +voucher_sender=GL +#\u7CFB\u7EDF\u53C2\u6570 +voucher_replace=Y +#\u51ED\u8BC1\u7C7B\u522B +voucher_pk_vouchertype=01 +#\u6765\u6E90\u7CFB\u7EDF +voucher_pk_system=GL +#\u51ED\u8BC1\u7C7B\u578B\u503C +voucher_voucherkind=0 +#\u6838\u7B97\u8D26\u7C3F +voucher_pk_accountingbook=807001002001-0001 +#\u5236\u5355\u4EBA +voucher_pk_prepared=807yewuxitong +#\u6240\u5C5E\u7EC4\u7EC7 +voucher_pk_org=807001002001 +#\u6240\u5C5E\u96C6\u56E2 +voucher_pk_group=06 +#\u5E01\u79CD +voucher_pk_currtype=CNY + + + +#\u5BA2\u6237\u4FE1\u606F +#\u8D26\u5957 +customer_account=8 +#\u5355\u636E\u7C7B\u578B +customer_billtype=customer +#\u96C6\u56E2\u7F16\u7801 +customer_groupcode=06 +#\u7CFB\u7EDF\u53C2\u6570 +customer_isexchange=Y +#\u63A5\u6536\u65B9 +customer_receiver=807001002001 +#\u5916\u7CFB\u7EDF\u7F16\u7801 +customer_sender=kh01 +#\u7CFB\u7EDF\u53C2\u6570 +customer_replace=Y +#\u6240\u5C5E\u96C6\u56E2 +customer_pk_group=06 +#\u6240\u5C5E\u7EC4\u7EC7 +customer_pk_org=06 +#\u5BA2\u6237\u57FA\u672C\u5206\u7C7B +customer_pk_custclass=0202 +#\u56FD\u5BB6\u5730\u533A +customer_pk_country=CN +#\u65F6\u533A +customer_pk_timezone=P0800 +#\u6570\u636E\u683C\u5F0F +customer_pk_format=ZH-CN + + + +#\u7ECF\u9500\u5546\u4FE1\u606F +#\u8D26\u5957 +distributor_account=8 +#\u5355\u636E\u7C7B\u578B +distributor_billtype=supplier +#\u96C6\u56E2\u7F16\u7801 +distributor_groupcode=06 +#\u7CFB\u7EDF\u53C2\u6570 +distributor_isexchange=Y +#\u63A5\u6536\u65B9 +distributor_receiver=Y +#\u5916\u7CFB\u7EDF\u7F16\u7801 +distributor_sender=gys01 +#\u7CFB\u7EDF\u53C2\u6570 +distributor_replace=Y +#\u6240\u5C5E\u96C6\u56E2 +distributor_pk_group=06 +#\u6240\u5C5E\u7EC4\u7EC7 +distributor_pk_org=06 +#\u4F9B\u5E94\u5546\u57FA\u672C\u5206\u7C7B +distributor_pk_supplierclass=0202 +#\u56FD\u5BB6\u5730\u533A +distributor_pk_country=CN +#\u65F6\u533A +distributor_pk_timezone=P0800 +#\u8D26\u6570\u636E\u683C\u5F0F +distributor_pk_format=ZH-CN + + + +#\u5408\u540C\u4FE1\u606F +#\u8D26\u5957 +contract_account=8 +#\u5355\u636E\u7C7B\u578B +contract_billtype=defdoc +#\u96C6\u56E2\u7F16\u7801 +contract_groupcode=06 +#\u7CFB\u7EDF\u53C2\u6570 +contract_isexchange=Y +#\u63A5\u6536\u65B9 +contract_receiver=06 +#\u5916\u7CFB\u7EDF\u7F16\u7801 +contract_sender=ht +#\u7CFB\u7EDF\u53C2\u6570 +contract_replace=Y +#\u6240\u5C5E\u96C6\u56E2 +contract_pk_group=06 +#\u6240\u5C5E\u7EC4\u7EC7 +contract_pk_org=06 + + + +#\u7528\u53CB\u8FDE\u63A5\u914D\u7F6E-\u6D4B\u8BD5:http://172.16.0.88:9990/service/XChangeServlet?account=8&groupcode=06 +#\u7528\u53CB\u8FDE\u63A5\u914D\u7F6E-\u6B63\u5F0F:http://sk.baicgroup.com.cn:80/service/XChangeServlet?account=8&groupcode=06 +#IP\u5730\u5740\u53CA\u7AEF\u53E3 +NC_URL=http://sk.baicgroup.com.cn/ + +#\u8D26\u5957 +account=8 +#\u96C6\u56E2\u7F16\u7801 +groupcode=06 +#\u4F20\u8F93xml\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84 +LOCALHOST_URL=//data//files//apzl_leasing//tmp//XZW// +#\u56DE\u6267\u4FE1\u606F\u5B58\u653E\u8DEF\u5F84 +RECEIVE_URL=//data//files//apzl_leasing//tmp//WEN// +#\u5F02\u5E38\u4FE1\u606F\u5B58\u653E\u8DEF\u5F84 +ERROR_URL=//data//files//apzl_leasing//tmp//NC_ERROR// + diff --git a/src/com/amarsoft/app/awe/config/CollectProperties.java b/src/com/amarsoft/app/awe/config/CollectProperties.java index a934906a1..770610121 100644 --- a/src/com/amarsoft/app/awe/config/CollectProperties.java +++ b/src/com/amarsoft/app/awe/config/CollectProperties.java @@ -22,9 +22,7 @@ public class CollectProperties{ private String privateKeyUrl; private String clearRequestUrl; private String batch_trxCode;//批量交易代码 - private String tianJinmerchantId; - private String tianJinuserName; - private String tianJinuserPass; + public String getBatch_trxCode() { return batch_trxCode; @@ -140,24 +138,7 @@ public class CollectProperties{ public void setB_level(String b_level) { this.b_level = b_level; } - public String getTianJinmerchantId() { - return tianJinmerchantId; - } - public void setTianJinmerchantId(String tianJinmerchantId) { - this.tianJinmerchantId = tianJinmerchantId; - } - public String getTianJinuserName() { - return tianJinuserName; - } - public void setTianJinuserName(String tianJinuserName) { - this.tianJinuserName = tianJinuserName; - } - public String getTianJinuserPass() { - return tianJinuserPass; - } - public void setTianJinuserPass(String tianJinuserPass) { - this.tianJinuserPass = tianJinuserPass; - } + } diff --git a/src/com/amarsoft/app/awe/config/InitCollectConfig.java b/src/com/amarsoft/app/awe/config/InitCollectConfig.java index 439bb6651..b1896e851 100644 --- a/src/com/amarsoft/app/awe/config/InitCollectConfig.java +++ b/src/com/amarsoft/app/awe/config/InitCollectConfig.java @@ -35,16 +35,7 @@ public class InitCollectConfig extends HttpServlet{ public static final String PUBLICKEYURL; public static final String PRIVATEKEYURL; public static final String CLEARREQUESTURL; - /** - * 新增天津子商户号 - * 子商户商户号：001053110000013 - 子商户商户名称：接口测试子商户 - 子商户用户名：operator13 - 子商户密码：ora_123456 - */ - public static final String TIANJIN_MERCHANTID; - public static final String TIANJIN_USERNAME; - public static final String TIANJIN_USERPASS; + static{ @@ -69,8 +60,5 @@ public class InitCollectConfig extends HttpServlet{ PUBLICKEYURL=collectproperties.getPublicKeyUrl(); PRIVATEKEYURL=collectproperties.getPrivateKeyUrl(); CLEARREQUESTURL=collectproperties.getClearRequestUrl(); - TIANJIN_MERCHANTID=collectproperties.getTianJinmerchantId(); - TIANJIN_USERNAME=collectproperties.getTianJinuserName(); - TIANJIN_USERPASS=collectproperties.getTianJinuserPass(); } } diff --git a/src/com/amarsoft/app/lc/check/InitProjectAlarmScen.java b/src/com/amarsoft/app/lc/check/InitProjectAlarmScen.java index 59912f803..2f836e847 100644 --- a/src/com/amarsoft/app/lc/check/InitProjectAlarmScen.java +++ b/src/com/amarsoft/app/lc/check/InitProjectAlarmScen.java @@ -1,8 +1,6 @@ package com.amarsoft.app.lc.check; -import jbo.com.tenwa.entity.project.PROJ_INFO_TEMP; - import com.amarsoft.are.ARE; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; @@ -38,7 +36,7 @@ public class InitProjectAlarmScen extends Bizlet{ if(id == null || id.length() == 0){ throw new Exception("场景初始化，未获取项目信息流水号！"); } - BizObjectManager manager= JBOFactory.getFactory().getManager(PROJ_INFO_TEMP.CLASS_NAME); + BizObjectManager manager= JBOFactory.getFactory().getManager("jbo.com.tenwa.entity.project.PROJ_INFO_TEMP"); BizObject jboPIT = manager.createQuery("flow_unid =:id").setParameter("id",id).getSingleResult(false); return jboPIT; } diff --git a/src/com/amarsoft/app/lc/customer/CustomerCertAction.java b/src/com/amarsoft/app/lc/customer/CustomerCertAction.java index 664437bb0..2a9e00ffb 100644 --- a/src/com/amarsoft/app/lc/customer/CustomerCertAction.java +++ b/src/com/amarsoft/app/lc/customer/CustomerCertAction.java @@ -13,7 +13,6 @@ import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; -import jbo.customer.CUSTOMER_CERT; import jbo.sys.CODE_LIBRARY; @@ -63,7 +62,7 @@ public class CustomerCertAction{ */ public String checkCert(JBOTransaction tx) throws Exception{ String result = "false"; - BizObjectManager bom = JBOFactory.getBizObjectManager(CUSTOMER_CERT.CLASS_NAME); + BizObjectManager bom = JBOFactory.getBizObjectManager("jbo.customer.CUSTOMER_CERT"); tx.join(bom); int iResult = bom.createQuery("CertType=:certType and CertID=:certID and IssueCountry=:issueCountry ") .setParameter("certType", certType).setParameter("certID", certID).setParameter("issueCountry", issueCountry).getTotalCount(); @@ -78,7 +77,7 @@ public class CustomerCertAction{ * @throws JBOException */ public CustomerInfo getCustomerInfo(JBOTransaction tx) throws JBOException{ - BizObjectManager bom = JBOFactory.getBizObjectManager(CUSTOMER_CERT.CLASS_NAME); + BizObjectManager bom = JBOFactory.getBizObjectManager("jbo.customer.CUSTOMER_CERT"); tx.join(bom); String orgid=orgID.substring(0, 5); BizObject boResult = bom.createQuery("CertType=:certType and CertID=:certID and IssueCountry=:issueCountry and inputorgid like '"+orgid+"%'") @@ -105,7 +104,7 @@ public class CustomerCertAction{ String checkResult = checkCustomerCert(tx); //增加新证件前，把之前该类型的证件置为无效。如果之前该类型的证件为主证件则将该证件设置为非主证件，并将新增的该类型证件设置为主证件，否则只设置证件状态为无效（Update的证件类型必须和新建的证件类型一致） - BizObjectManager m = JBOFactory.getFactory().getManager(CUSTOMER_CERT.CLASS_NAME); + BizObjectManager m = JBOFactory.getFactory().getManager("jbo.customer.CUSTOMER_CERT"); tx.join(m); BizObjectQuery bq = m.createQuery("update O set Status=:status,MainFlag=:mainFlag where CustomerID=:customerID and CertType=:certType"); bq.setParameter("customerID",customerID).setParameter("certType", certType). @@ -144,7 +143,7 @@ public class CustomerCertAction{ */ public String checkCustomerCert(JBOTransaction tx) throws Exception{ String result = "false"; - BizObjectManager bom = JBOFactory.getBizObjectManager(CUSTOMER_CERT.CLASS_NAME); + BizObjectManager bom = JBOFactory.getBizObjectManager("jbo.customer.CUSTOMER_CERT"); tx.join(bom); int iResult = bom.createQuery("CustomerID=:customerID and CertType=:certType and Status=:status and MainFlag=:mainFlag ") .setParameter("customerID", customerID).setParameter("certType", certType). @@ -161,7 +160,7 @@ public class CustomerCertAction{ * @throws Exception */ public String setMainCert(JBOTransaction tx) throws Exception{ - BizObjectManager bm = JBOFactory.getFactory().getManager(CUSTOMER_CERT.CLASS_NAME); + BizObjectManager bm = JBOFactory.getFactory().getManager("jbo.customer.CUSTOMER_CERT"); tx.join(bm); BizObjectQuery bq1 = bm.createQuery("update O set MainFlag=:mainFlag where CustomerID=:customerID and MainFlag='1' "); bq1.setParameter("customerID",customerID).setParameter("mainFlag", LCConstant.CUSTOMER_CERT_MAINFLAG_2); @@ -197,7 +196,7 @@ public class CustomerCertAction{ //检查该类型证件是否已存在有效的证件 String result = "false"; String mainFlag = ""; - BizObjectManager m = JBOFactory.getFactory().getManager(CUSTOMER_CERT.CLASS_NAME); + BizObjectManager m = JBOFactory.getFactory().getManager("jbo.customer.CUSTOMER_CERT"); tx.join(m); BizObject bo = m.createQuery("CustomerID=:customerID and CertType=:certType and Status=:status ") .setParameter("customerID", customerID).setParameter("certType", certType). @@ -219,7 +218,7 @@ public class CustomerCertAction{ * @throws Exception */ public String updateCertStatus(JBOTransaction tx) throws Exception{ - BizObjectManager m = JBOFactory.getFactory().getManager(CUSTOMER_CERT.CLASS_NAME); + BizObjectManager m = JBOFactory.getFactory().getManager("jbo.customer.CUSTOMER_CERT"); tx.join(m); BizObjectQuery bq = m.createQuery("update O set Status=:status,MainFlag=:mainFlag where CustomerID=:customerID and CertType=:certType"); bq.setParameter("customerID",customerID).setParameter("certType", certType). diff --git a/src/com/amarsoft/app/lc/customer/CustomerOperate.java b/src/com/amarsoft/app/lc/customer/CustomerOperate.java index a0077e441..6079b2b85 100644 --- a/src/com/amarsoft/app/lc/customer/CustomerOperate.java +++ b/src/com/amarsoft/app/lc/customer/CustomerOperate.java @@ -1,15 +1,13 @@ package com.amarsoft.app.lc.customer; -import jbo.app.CUSTOMER_INFO; -import jbo.app.ENT_INFO; -import jbo.customer.CUSTOMER_PARTNER; -import jbo.customer.PARTNER_PROJECT_INFO; - 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 jbo.app.CUSTOMER_INFO; +import jbo.app.ENT_INFO; + /** * 客户的校验检查操作 * @author Administrator @@ -26,7 +24,7 @@ public class CustomerOperate { String returnValue = ""; BizObjectManager bm = JBOFactory.getBizObjectManager(CUSTOMER_INFO.CLASS_NAME); - BizObjectManager bmc = JBOFactory.getBizObjectManager(CUSTOMER_PARTNER.CLASS_NAME); + BizObjectManager bmc = JBOFactory.getBizObjectManager("jbo.customer.CUSTOMER_PARTNER"); BizObject bo = bm.createQuery("certtype=:CertType and certID=:CertID").setParameter("CertType", certType) .setParameter("CertID", certID).getSingleResult(false); if(bo!=null){ @@ -56,14 +54,14 @@ public class CustomerOperate { } public String removePartner() throws JBOException{ - BizObjectManager bm = JBOFactory.getBizObjectManager(PARTNER_PROJECT_INFO.CLASS_NAME); + BizObjectManager bm = JBOFactory.getBizObjectManager("jbo.customer.PARTNER_PROJECT_INFO"); BizObject bo = bm.createQuery("" + "customerid=:customerID ") .setParameter("customerID", customerID) .getSingleResult(false); if(bo!=null) return "2";//已经存在此关联 - BizObjectManager bmc = JBOFactory.getBizObjectManager(CUSTOMER_PARTNER.CLASS_NAME); + BizObjectManager bmc = JBOFactory.getBizObjectManager("jbo.customer.CUSTOMER_PARTNER"); bmc.createQuery("delete from o where customerid =:customerid").setParameter("customerid", customerID) .executeUpdate(); return "1"; diff --git a/src/com/amarsoft/app/lc/customer/CustomerPartner.java b/src/com/amarsoft/app/lc/customer/CustomerPartner.java index 409253190..387f5171c 100644 --- a/src/com/amarsoft/app/lc/customer/CustomerPartner.java +++ b/src/com/amarsoft/app/lc/customer/CustomerPartner.java @@ -1,9 +1,5 @@ package com.amarsoft.app.lc.customer; -import jbo.customer.CUSTOMER_PARTNER; -import jbo.customer.PARTNER_PROJECT_RELATIVE; - -import com.amarsoft.app.lc.customer.CustomerInfo; import com.amarsoft.are.ARE; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; @@ -44,7 +40,7 @@ public class CustomerPartner{ * 初始化管理类 */ private void initManager() throws JBOException{ - bm = JBOFactory.getBizObjectManager(CUSTOMER_PARTNER.CLASS_NAME); + bm = JBOFactory.getBizObjectManager("jbo.customer.CUSTOMER_PARTNER"); } /** @@ -80,7 +76,7 @@ public class CustomerPartner{ public void initRelative(JBOTransaction tx , BizObject bo){ BizObjectManager bm; try { - bm = JBOFactory.getBizObjectManager(PARTNER_PROJECT_RELATIVE.CLASS_NAME); + bm = JBOFactory.getBizObjectManager("jbo.customer.PARTNER_PROJECT_RELATIVE"); tx.join(bm); BizObject boRelative = bm.newObject(); diff --git a/src/com/amarsoft/app/lc/rentbefore/dw/ProjectEquipListCustomData.java b/src/com/amarsoft/app/lc/rentbefore/dw/ProjectEquipListCustomData.java index 00d9c51ae..72b575e1a 100644 --- a/src/com/amarsoft/app/lc/rentbefore/dw/ProjectEquipListCustomData.java +++ b/src/com/amarsoft/app/lc/rentbefore/dw/ProjectEquipListCustomData.java @@ -13,8 +13,6 @@ import com.amarsoft.awe.dw.handler.BusinessProcessData; import com.amarsoft.awe.dw.ui.htmlfactory.ListHtmlWithASDataObjectGenerator; import com.amarsoft.awe.dw.ui.htmlfactory.QueryParamObject; -import jbo.lc.FLOWPHASE_HIS; - public class ProjectEquipListCustomData extends ListHtmlWithASDataObjectGenerator{ @Override @@ -75,7 +73,7 @@ public class ProjectEquipListCustomData extends ListHtmlWithASDataObjectGenerato // // String phaseInfo=""; - BizObjectManager bm =JBOFactory.getFactory().getManager(FLOWPHASE_HIS.CLASS_NAME); + BizObjectManager bm =JBOFactory.getFactory().getManager("jbo.lc.FLOWPHASE_HIS"); BizObject bo =bm.createQuery("FOObjectType=:FOObjectType and FOObjectNo=:FOObjectNo and PhaseNo=:PhaseNo") .setParameter("FOObjectType",objectType).setParameter("FOObjectNo",objectNo).setParameter("PhaseNo",phaseNo).getSingleResult(false); if(bo!=null){ diff --git a/src/com/amarsoft/app/lc/taskObject/TaskObjectManager.java b/src/com/amarsoft/app/lc/taskObject/TaskObjectManager.java index 6de3c62e6..a95fef820 100644 --- a/src/com/amarsoft/app/lc/taskObject/TaskObjectManager.java +++ b/src/com/amarsoft/app/lc/taskObject/TaskObjectManager.java @@ -1,6 +1,5 @@ package com.amarsoft.app.lc.taskObject; -import java.util.ArrayList; import java.util.List; import com.amarsoft.app.lc.LCConstant; @@ -8,7 +7,6 @@ import com.amarsoft.are.ARE; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; -import jbo.lc.PROJ_INFO; /** * 整合授信业务对象 @@ -53,7 +51,7 @@ public class TaskObjectManager { this.realCreditObjectType = creditObjectType; this.creditObjectNo = creditObjectNo; try { - if(creditObjectType.equalsIgnoreCase(LCConstant.TASKOBJECT_PROJ_REAL)) curJBOClass =PROJ_INFO.CLASS_NAME; + if(creditObjectType.equalsIgnoreCase(LCConstant.TASKOBJECT_PROJ_REAL)) curJBOClass ="jbo.lc.PROJ_INFO"; // else if(creditObjectType.equalsIgnoreCase(CreditConstant.CREDITOBJECT_APPROVE_REAL)) curJBOClass = BUSINESS_APPROVE.CLASS_NAME; // else if(creditObjectType.equalsIgnoreCase(CreditConstant.CREDITOBJECT_CONTRACT_REAL)) curJBOClass = BUSINESS_CONTRACT.CLASS_NAME; // else if(creditObjectType.equalsIgnoreCase(CreditConstant.CREDITOBJECT_PUTOUT_REAL)) curJBOClass = "jbo.app.BUSINESS_PUTOUT"; diff --git a/src/com/amarsoft/app/lc/workflow/action/FlowProcessAction.java b/src/com/amarsoft/app/lc/workflow/action/FlowProcessAction.java index c404412f2..463b5a003 100644 --- a/src/com/amarsoft/app/lc/workflow/action/FlowProcessAction.java +++ b/src/com/amarsoft/app/lc/workflow/action/FlowProcessAction.java @@ -1,7 +1,5 @@ package com.amarsoft.app.lc.workflow.action; -import jbo.lc.MEETING_RECORD; - import com.amarsoft.app.lc.LCConstant; import com.amarsoft.app.lc.util.DateAssistant; import com.amarsoft.are.jbo.BizObject; @@ -66,7 +64,7 @@ public class FlowProcessAction { */ public String getTaskNo(JBOTransaction tx) throws Exception{ String sRet = "undo"; - BizObject bo = JBOFactory.getBizObjectManager(MEETING_RECORD.CLASS_NAME, tx).createQuery("select recordno from O where taskno=:taskno and status=:status") + BizObject bo = JBOFactory.getBizObjectManager("jbo.lc.MEETING_RECORD", tx).createQuery("select recordno from O where taskno=:taskno and status=:status") .setParameter("taskno", taskno).setParameter("status", "1").getSingleResult(false); if (bo!=null) { sRet = "done"; @@ -81,7 +79,7 @@ public class FlowProcessAction { * @throws Exception */ public String insertMeetingRecord(JBOTransaction tx) throws Exception{ - BizObjectManager bm=JBOFactory.getBizObjectManager(MEETING_RECORD.CLASS_NAME); + BizObjectManager bm=JBOFactory.getBizObjectManager("jbo.lc.MEETING_RECORD"); tx.join(bm); BizObject bo=bm.newObject(); bo.setAttributeValue("taskno",taskno); diff --git a/src/com/amarsoft/app/lc/workflow/action/GroupManageAction.java b/src/com/amarsoft/app/lc/workflow/action/GroupManageAction.java index d22db2599..9ac71dbb3 100644 --- a/src/com/amarsoft/app/lc/workflow/action/GroupManageAction.java +++ b/src/com/amarsoft/app/lc/workflow/action/GroupManageAction.java @@ -3,8 +3,6 @@ package com.amarsoft.app.lc.workflow.action; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; -import jbo.lc.T_GROUPS; - public class GroupManageAction { private String id_; @@ -23,7 +21,7 @@ public class GroupManageAction { * @throws Exception */ public String setEnable(JBOTransaction tx) throws Exception { - JBOFactory.getBizObjectManager(T_GROUPS.CLASS_NAME).createQuery("update O set ENABLED_=:ENABLED_ where id_=:id_") + JBOFactory.getBizObjectManager("jbo.lc.T_GROUPS").createQuery("update O set ENABLED_=:ENABLED_ where id_=:id_") .setParameter("ENABLED_",1).setParameter("id_",id_).executeUpdate(); return "success"; } @@ -34,7 +32,7 @@ public class GroupManageAction { * @throws Exception */ public String setDisable(JBOTransaction tx) throws Exception { - JBOFactory.getBizObjectManager(T_GROUPS.CLASS_NAME).createQuery("update O set ENABLED_=:ENABLED_ where id_=:id_") + JBOFactory.getBizObjectManager("jbo.lc.T_GROUPS").createQuery("update O set ENABLED_=:ENABLED_ where id_=:id_") .setParameter("ENABLED_",0).setParameter("id_",id_).executeUpdate(); return "success"; } diff --git a/src/com/amarsoft/app/lc/workflow/action/NewProjectAction.java b/src/com/amarsoft/app/lc/workflow/action/NewProjectAction.java index 5631a86b8..7b58ce338 100644 --- a/src/com/amarsoft/app/lc/workflow/action/NewProjectAction.java +++ b/src/com/amarsoft/app/lc/workflow/action/NewProjectAction.java @@ -2,9 +2,6 @@ package com.amarsoft.app.lc.workflow.action; import java.util.Random; -import jbo.com.tenwa.entity.flow.FLOW_BUSSINESS_OBJECT; -import jbo.com.tenwa.entity.project.PROJ_INFO_TEMP; - import com.amarsoft.app.flow.FlowAction; import com.amarsoft.app.lc.LCConstant; import com.amarsoft.app.lc.util.DateAssistant; @@ -65,9 +62,9 @@ public class NewProjectAction { */ public String startProjectEstablishFlow(JBOTransaction tx) throws Exception{ String returnValue=LCConstant.OPERATION_FLAG_FAILED; - BizObjectManager bm=JBOFactory.getBizObjectManager(PROJ_INFO_TEMP.CLASS_NAME); + BizObjectManager bm=JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.project.PROJ_INFO_TEMP"); tx.join(bm); - BizObjectManager bmobj=JBOFactory.getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME); + BizObjectManager bmobj=JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.flow.FLOW_BUSSINESS_OBJECT"); tx.join(bmobj); BizObject bobus=bmobj.newObject(); bmobj.saveObject(bobus); diff --git a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java index d66bb1aca..cd894caa5 100644 --- a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java +++ b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java @@ -3,24 +3,6 @@ package com.amarsoft.dict.als.manage; import java.math.BigDecimal; import java.util.List; -import jbo.app.tenwa.calc.LC_CALC_CONDITION; -import jbo.app.tenwa.calc.LC_EBANK; -import jbo.app.tenwa.calc.LC_FUND_INCOME; -import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; -import jbo.app.tenwa.calc.LC_FUND_PLAN; -import jbo.app.tenwa.calc.LC_RENT_INCOME; -import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP; -import jbo.app.tenwa.calc.LC_RENT_PLAN; -import jbo.app.tenwa.calc.VI_LC_FUND_PLAN; -import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; -import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT; -import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; -import jbo.com.tenwa.entity.comm.own.DISTRICT_DISTRIBUTOR_RELATION; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; -import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; -import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; -import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; - import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; @@ -28,23 +10,23 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; +import jbo.app.tenwa.calc.LC_CALC_CONDITION; +import jbo.app.tenwa.calc.LC_EBANK; +import jbo.app.tenwa.calc.LC_FUND_INCOME; +import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; +import jbo.app.tenwa.calc.LC_FUND_PLAN; +import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP; +import jbo.app.tenwa.calc.LC_RENT_PLAN; +import jbo.app.tenwa.calc.VI_LC_FUND_PLAN; +import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; +import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT; +import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; +import jbo.com.tenwa.entity.comm.own.DISTRICT_DISTRIBUTOR_RELATION; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; +import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; + public class ColRelativeInfo { - //根据项目编号判断进单方向 - public static String getOrderDirection(String projectNo) throws JBOException{ - String orderDirection = "核心系统"; - BizObject lpiBo = JBOFactory.createBizObjectQuery(LB_PROJECT_INFO.CLASS_NAME,"PROJECT_NO=:PROJECT_NO and APPLICATION_NO is not null") - .setParameter("PROJECT_NO", projectNo).getSingleResult(false); - if(lpiBo==null){ - BizObject lpitBo = JBOFactory.createBizObjectQuery(LB_PROJECT_INFO_TEMP.CLASS_NAME,"PROJECT_NO=:PROJECT_NO and APPLICATION_NO is not null") - .setParameter("PROJECT_NO", projectNo).getSingleResult(false); - if(lpitBo!=null) - orderDirection="接口平台"; - }else{ - orderDirection="接口平台"; - } - return orderDirection; - } //根据合同ID获取经销商账号 public static String getAccNumberByContractID(String contractID) throws JBOException{ diff --git a/src/com/amarsoft/dict/als/manage/NameManager.java b/src/com/amarsoft/dict/als/manage/NameManager.java index 642794039..9676c71cc 100644 --- a/src/com/amarsoft/dict/als/manage/NameManager.java +++ b/src/com/amarsoft/dict/als/manage/NameManager.java @@ -1,13 +1,5 @@ package com.amarsoft.dict.als.manage; -import jbo.com.tenwa.lease.comm.BC_PAY_INFO_LOG; -import jbo.com.tenwa.lease.comm.LB_INSURANCE_INFO; -import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; -import jbo.sys.FLOW_TASK; - -import java.util.List; -import java.util.Map; - import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; @@ -19,8 +11,9 @@ import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.amarsoft.dict.als.cache.CodeCache; import com.amarsoft.dict.als.cache.NameCache; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.officetempalte.util.FileOperatorUtil; + +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; +import jbo.sys.FLOW_TASK; public class NameManager { @@ -199,11 +192,6 @@ public class NameManager return NameCache.getName("jbo.app.tenwa.customer.CUSTOMER_INFO", "CustomerName", "CustomerID", sCustomerID); } - public static String getCustomerNumber(String sCustomerID) - throws Exception - { - return NameCache.getName("jbo.app.tenwa.customer.CUSTOMER_INFO", "customer_num", "CustomerID", sCustomerID); - } public static String getBusinessName(String sTypeNo) throws Exception @@ -240,15 +228,6 @@ public class NameManager return bo != null?bo.getAttribute("PROJECT_NAME").getString():""; } - public static String getFlowInitiator(String OBJECTNO) throws Exception{ - BizObject bo = JBOFactory.createBizObjectQuery(FLOW_TASK.CLASS_NAME, "OBJECTNO=:OBJECTNO AND PHASENO=:PHASENO").setParameter("OBJECTNO", OBJECTNO).setParameter("PHASENO", "0010").getSingleResult(false); - return bo != null?bo.getAttribute("USERNAME").getString():""; - } - - public static String getFlowInitTime(String OBJECTNO) throws Exception{ - BizObject bo = JBOFactory.createBizObjectQuery(FLOW_TASK.CLASS_NAME, "OBJECTNO=:OBJECTNO AND PHASENO=:PHASENO").setParameter("OBJECTNO", OBJECTNO).setParameter("PHASENO", "0010").getSingleResult(false); - return bo != null?bo.getAttribute("BEGINTIME").getString():""; - } public static String getYears(String ContractId,String i) throws Exception{ System.out.println(ContractId+"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+i); diff --git a/src/com/amarsoft/filetemplate/servlet/FileTemplateViewServlet.java b/src/com/amarsoft/filetemplate/servlet/FileTemplateViewServlet.java index 20a100324..2aa0edfe9 100644 --- a/src/com/amarsoft/filetemplate/servlet/FileTemplateViewServlet.java +++ b/src/com/amarsoft/filetemplate/servlet/FileTemplateViewServlet.java @@ -80,6 +80,7 @@ public class FileTemplateViewServlet extends HttpServlet { String sFileSavePath = CurConfig.getConfigure("fileTemplatePath"); sFileSavePath=rootPath+sFileSavePath; File fileSS = new File(sFileSavePath); + System.out.println("sFileSavePath对应的上下文：" + sFileSavePath); if (!fileSS.exists()) fileSS.mkdirs(); String sFileSaveMode = CurConfig.getConfigure("FileSaveMode"); @@ -97,6 +98,7 @@ public class FileTemplateViewServlet extends HttpServlet { if (rs.next()) { //获取目标文件的绝对路径 String template_path = DataConvert.toString(rs.getString("templatepath"));// 获取要下载文件的全路径地址 + System.out.println("template_path对应全路径：" + sFileSavePath + "/" + template_path); String filename =template_path; //获得请求文件名 filename=URLDecoder.decode(filename, "UTF-8"); diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java index a69e2642e..95d47499e 100644 --- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java +++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java @@ -42,7 +42,6 @@ public class FileTemplateUtil { public String contractNo; public String isNetCar;//用于判断是否是网约车 public String operationType;//用于判断是否是北汽产品 - public String SubjectId; public String getTemplateCalss() {return templateCalss;} public void setTemplateCalss(String templateCalss) {this.templateCalss = templateCalss;} @@ -100,12 +99,7 @@ public class FileTemplateUtil { public void setOperationType(String operationType) { this.operationType = operationType; } - public String getSubjectId() { - return SubjectId; - } - public void setSubjectId(String subjectId) { - SubjectId = subjectId; - } + public String getTemplateClass(Transaction Sqlca) throws Exception{ String fileClass=templateCalss.replaceAll("@", ","); @@ -144,57 +138,29 @@ public class FileTemplateUtil { } public String getContractClass(Transaction Sqlca){ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){//天津合同模板 - if("BAIC_MOTOR".equals(operationType)){//北汽财务 - if("01".equals(leasform)){ - return "[{'fileTemplate':\""+"[{'text':'合同（直租）','value':'22244a8b74c54ed5b9f09de7e0ef1aad'}]"+"\"}]"; - }else{ - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'99ddc65b2cfc493eb19d30778d012165'}]"+"\"}]"; - } - }else if ("DYCD".equals(operationType)){//第一车贷 - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'12ef786b7e2c45d892e7b8588972b4f1'}]"+"\"}]"; - }else if ("ZYC".equals(operationType)){//专用车产品 - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'5433d6bb0ead4f3abc3dbad6aefa1d90'}]"+"\"}]"; - }else if ("KJZL".equals(operationType)){//凯捷租赁 - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）_凯捷','value':'3a95f3e7e1c54e53b203bfb04d35ff32'}]"+"\"}]"; - }else if ("BZZL".equals(operationType)){//保值租赁 - return "[{'fileTemplate':\""+"[{'text':'保值租赁','value':'32b77942767c410c922a429ea5d8902e'}]"+"\"}]"; - }else if ("WYC".equals(operationType)){//网约车 - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）和抵押合同','value':'1e225320f6214bb08c87c88a3653b542'}]"+"\"}]"; - }else if ("DT".equals(operationType)){//大通 - return "[{'fileTemplate':\""+"[{'text':'大通售后回租模板','value':'25b9e9440c574f89bccfdf148b12128d'}]"+"\"}]"; + if("BAIC_MOTOR".equals(operationType)){//北汽财务 + if("01".equals(leasform)){ + return "[{'fileTemplate':\""+"[{'text':'合同（直租）','value':'b20b919c6144480b9466e4ea9b0da142'}]"+"\"}]"; }else{ - if("01".equals(leasform)){ - return "[{'fileTemplate':\""+"[{'text':'合同（直租）','value':'333cd5b36cd846938e618516ba9c8cbb'}]"+"\"}]"; - }else{ - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'5c494617683548a49cfc050f60067ea2'}]"+"\"}]"; - } + return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'115905186577406ea5414dd14e592e7d'}]"+"\"}]"; } + }else if ("DYCD".equals(operationType)){//第一车贷 + return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'8d4232a5423e491ca905e77c54105a85'}]"+"\"}]"; + }else if ("ZYC".equals(operationType)){//专用车产品 + return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'35aab6dbac5f4ba292cd67a0914eae2e'}]"+"\"}]"; + }else if ("KJZL".equals(operationType)){//凯捷租赁 + return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）_凯捷','value':'a4fcbd2990d1479a9ba8ce440155f2f0'}]"+"\"}]"; + }else if ("BZZL".equals(operationType)){//保值租赁 + return "[{'fileTemplate':\""+"[{'text':'保值租赁','value':'91c7718aa925428ca312e343d1f5149f'}]"+"\"}]"; + }else if ("WYC".equals(operationType)){//网约车 + return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）和抵押合同','value':'c8d5b729a0954482877c26a1293b766b'}]"+"\"}]"; + }else if ("DT".equals(operationType)){//大通 + return "[{'fileTemplate':\""+"[{'text':'大通售后回租模板','value':'51a5f03ebe3b45cc8ae2b32fdaeceeae'}]"+"\"}]"; }else{ - if("BAIC_MOTOR".equals(operationType)){//北汽财务 - if("01".equals(leasform)){ - return "[{'fileTemplate':\""+"[{'text':'合同（直租）','value':'b20b919c6144480b9466e4ea9b0da142'}]"+"\"}]"; - }else{ - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'115905186577406ea5414dd14e592e7d'}]"+"\"}]"; - } - }else if ("DYCD".equals(operationType)){//第一车贷 - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'8d4232a5423e491ca905e77c54105a85'}]"+"\"}]"; - }else if ("ZYC".equals(operationType)){//专用车产品 - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'35aab6dbac5f4ba292cd67a0914eae2e'}]"+"\"}]"; - }else if ("KJZL".equals(operationType)){//凯捷租赁 - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）_凯捷','value':'a4fcbd2990d1479a9ba8ce440155f2f0'}]"+"\"}]"; - }else if ("BZZL".equals(operationType)){//保值租赁 - return "[{'fileTemplate':\""+"[{'text':'保值租赁','value':'91c7718aa925428ca312e343d1f5149f'}]"+"\"}]"; - }else if ("WYC".equals(operationType)){//网约车 - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）和抵押合同','value':'c8d5b729a0954482877c26a1293b766b'}]"+"\"}]"; - }else if ("DT".equals(operationType)){//大通 - return "[{'fileTemplate':\""+"[{'text':'大通售后回租模板','value':'51a5f03ebe3b45cc8ae2b32fdaeceeae'}]"+"\"}]"; + if("01".equals(leasform)){ + return "[{'fileTemplate':\""+"[{'text':'合同（直租）','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]"; }else{ - if("01".equals(leasform)){ - return "[{'fileTemplate':\""+"[{'text':'合同（直租）','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]"; - }else{ - return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; - } + return "[{'fileTemplate':\""+"[{'text':'合同（售后回租）','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; } } } diff --git a/src/com/tenwa/app/wechat/WechatCustomerInfoChange.java b/src/com/tenwa/app/wechat/WechatCustomerInfoChange.java deleted file mode 100644 index 3605a5e72..000000000 --- a/src/com/tenwa/app/wechat/WechatCustomerInfoChange.java +++ /dev/null @@ -1,312 +0,0 @@ -package com.tenwa.app.wechat; - -import java.text.SimpleDateFormat; -import java.util.Date; - -import jbo.app.WECHAT_ADVANCE_SETTLE; -import jbo.app.WECHAT_BANKNUMBER_CHANGE; -import jbo.app.WECHAT_BASIC_CHANGE; -import jbo.app.tenwa.customer.CUSTOMER_ADDRESS; -import jbo.app.tenwa.customer.CUSTOMER_PERSON; -import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; -import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE; - -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; - -public class WechatCustomerInfoChange { - private String basicChangeId; - private String customerId; - private String id; - private String type; - - - public String getBasicChangeId() { - return basicChangeId; - } - - - - public void setBasicChangeId(String basicChangeId) { - this.basicChangeId = basicChangeId; - } - - - - public String getCustomerId() { - return customerId; - } - - - - public void setCustomerId(String customerId) { - this.customerId = customerId; - } - - - - public String getId() { - return id; - } - - - - public void setId(String id) { - this.id = id; - } - - - - public String getType() { - return type; - } - - - - public void setType(String type) { - this.type = type; - } - - - - public String saveChange(JBOTransaction tx) { - try { - String date = this.getNewData("yyyy/MM/dd HH:mm:ss"); - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BASIC_CHANGE.CLASS_NAME, tx); - BizObject wbc = wbcMange.createQuery(" id=:id ").setParameter("id", basicChangeId).getSingleResult(true); - wbc.setAttributeValue("status", "通过"); - wbc.setAttributeValue("UPDATETIME", date); - - wbcMange.saveObject(wbc); - - BizObjectManager cpMange = JBOFactory.getBizObjectManager(CUSTOMER_PERSON.CLASS_NAME, tx); - BizObjectManager caMange = JBOFactory.getBizObjectManager(CUSTOMER_ADDRESS.CLASS_NAME, tx); - BizObject cp = cpMange.createQuery("customerid=:customerid ").setParameter("customerid", customerId).getSingleResult(true); - BizObject ca = caMange.createQuery("customerid=:customerid ").setParameter("customerid", customerId).getSingleResult(true); - cp.setAttributeValue("mobile", wbc.getAttribute("atel").toString()); - cp.setAttributeValue("WORKADD", wbc.getAttribute("aWORKADD").toString()); - cp.setAttributeValue("WORKCORP", wbc.getAttribute("aworkname").toString()); - cpMange.saveObject(cp); - ca.setAttributeValue("FULLADDRESS", wbc.getAttribute("aFULLADDRESS").toString()); - caMange.saveObject(ca); - - BizObjectManager bbmMange = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME, tx); - BizObject bbm = bbmMange.createQuery(" id=:id ").setParameter("id", wbc.getAttribute("MESSGEID").toString()).getSingleResult(true); - bbm.setAttributeValue("message_status", "has_process"); - bbm.setAttributeValue("is_read", "has_read"); - bbm.setAttributeValue("finish_time", date); - bbm.setAttributeValue("read_time", date); - bbmMange.saveObject(bbm); - - return "true"; - } catch (JBOException e) { - e.printStackTrace(); - return "false"; - } - } - - public String refuseChange(JBOTransaction tx) { - try { - String date = this.getNewData("yyyy/MM/dd HH:mm:ss"); - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BASIC_CHANGE.CLASS_NAME, tx); - BizObject wbc = wbcMange.createQuery(" id=:id ").setParameter("id", basicChangeId).getSingleResult(true); - wbc.setAttributeValue("status", "否决"); - wbc.setAttributeValue("UPDATETIME", date); - wbcMange.saveObject(wbc); - BizObjectManager bbmMange = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME, tx); - BizObject bbm = bbmMange.createQuery(" id=:id ").setParameter("id", wbc.getAttribute("MESSGEID").toString()).getSingleResult(true); - bbm.setAttributeValue("message_status", "has_process"); - bbm.setAttributeValue("is_read", "has_read"); - bbm.setAttributeValue("finish_time", date); - bbm.setAttributeValue("read_time", date); - - bbmMange.saveObject(bbm); - - return "true"; - } catch (JBOException e) { - e.printStackTrace(); - return "false"; - } - } - - //校验是否已经提交流程 - public String isSubmit(JBOTransaction tx){ - try { - if("bank".equals(type)){ - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BANKNUMBER_CHANGE.CLASS_NAME, tx); - BizObject wbc = wbcMange.createQuery(" id=:id and status='处理中' and (flowStatus <> '已提交' or flowStatus is null) ").setParameter("id", id).getSingleResult(false); - if(wbc == null ){ - return "该申请在流程中或者已申请不能进行否决！"; - }else { - return "success"; - } - }else if("advance".equals(type)){ - BizObjectManager wasMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME, tx); - BizObject was = wasMange.createQuery(" id=:id and status='处理中' and (flowStatus <> '已提交' or flowStatus is null) ").setParameter("id", id).getSingleResult(false); - if(was == null ){ - return "该申请在流程中或者已申请不能进行否决！"; - }else { - return "success"; - } - } - return "未查询到对应的类型，请联系管理员！"; - } catch (JBOException e) { - e.printStackTrace(); - return "系统异常！"; - } - } - - //微信提交不需要走流程直接否决 - public String vetoSubmit(JBOTransaction tx){ - try { - String date = this.getNewData("yyyy/MM/dd HH:mm:ss"); - BizObjectManager bbmMange = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME, tx); - if("bank".equals(type)){ - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BANKNUMBER_CHANGE.CLASS_NAME, tx); - BizObject wbc = wbcMange.createQuery(" id=:id and status='处理中' and (flowStatus <> '已提交' or flowStatus is null) ").setParameter("id", id).getSingleResult(true); - if(wbc == null ){ - return "该申请在流程中或者已申请不能进行否决！"; - }else { - wbc.setAttributeValue("status", "否决"); - wbc.setAttributeValue("UPDATETIME", date); - wbcMange.saveObject(wbc); - BizObject bbm = bbmMange.createQuery(" id=:id ").setParameter("id", wbc.getAttribute("messgeId").toString()).getSingleResult(true); - if(bbm != null){ - bbm.setAttributeValue("message_status", "has_process"); - bbm.setAttributeValue("is_read", "has_read"); - bbm.setAttributeValue("finish_time", date); - bbm.setAttributeValue("read_time", date); - bbmMange.saveObject(bbm); - } - return "success"; - } - }else if("advance".equals(type)){ - BizObjectManager wasMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME, tx); - BizObject was = wasMange.createQuery(" id=:id and status='处理中' and (flowStatus <> '已提交' or flowStatus is null) ").setParameter("id", id).getSingleResult(true); - if(was == null ){ - return "该申请在流程中或者已申请不能进行否决！"; - }else { - was.setAttributeValue("status", "否决"); - was.setAttributeValue("UPDATETIME", date); - wasMange.saveObject(was); - BizObject bbm = bbmMange.createQuery(" id=:id ").setParameter("id", was.getAttribute("messgeId").toString()).getSingleResult(true); - if(bbm != null){ - bbm.setAttributeValue("message_status", "has_process"); - bbm.setAttributeValue("is_read", "has_read"); - bbm.setAttributeValue("finish_time", date); - bbm.setAttributeValue("read_time", date); - bbmMange.saveObject(bbm); - } - return "success"; - } - } - return "未查询到对应的类型，请联系管理员！"; - } catch (JBOException e) { - e.printStackTrace(); - return "系统异常！"; - } - } - - //校验数据是否已处理 - public String isProcessed(JBOTransaction tx){ - try { - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BASIC_CHANGE.CLASS_NAME, tx); - BizObject wbc = wbcMange.createQuery(" id=:id and status='处理中' ").setParameter("id", basicChangeId).getSingleResult(false); - if(wbc == null ){ - return "该数据已处理，无法操作！"; - }else { - return "success"; - } - - } catch (JBOException e) { - e.printStackTrace(); - return "系统异常！"; - } - } - - //校验数据是否已处理 - public String isSettle(JBOTransaction tx){ - try { - BizObjectManager wasMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME, tx); - BizObject was = wasMange.createQuery(" id=:id and status='处理中' ").setParameter("id", id).getSingleResult(false); - if(was == null ){ - return "该数据已处理，无法操作！"; - }else { - return "success"; - } - - } catch (JBOException e) { - e.printStackTrace(); - return "系统异常！"; - } - } - - //校验数据是否已处理 - public String isopinions(JBOTransaction tx){ - try { - String opinions = null; - BizObjectManager wbcMange = null; - if("basic".equals(type)){ - wbcMange = JBOFactory.getBizObjectManager(WECHAT_BASIC_CHANGE.CLASS_NAME, tx); - }else if("bank".equals(type)){ - wbcMange = JBOFactory.getBizObjectManager(WECHAT_BANKNUMBER_CHANGE.CLASS_NAME, tx); - }else if ("advance".equals(type)){ - wbcMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME, tx); - }else{ - return "未查询到指定类型，请联系管理员！"; - } - - BizObject wbc = wbcMange.createQuery(" id=:id ").setParameter("id", id).getSingleResult(false); - opinions = wbc.getAttribute("opinions").toString(); - if(opinions != null && opinions.length()>0){ - return "success"; - }else { - return "请先保存审批意见！"; - } - - } catch (JBOException e) { - e.printStackTrace(); - return "系统异常！"; - } - } - //获取指定个格式的当前系统时间 - public String getNewData(String datetype){ - Date date1 = new Date() ; //获取系统时间 - SimpleDateFormat sdf = new SimpleDateFormat(datetype); //日期格式 - String date = sdf.format(date1); //将系统时间转换成上方指定类型 - return date; - } - - //微信提交不需要走流程直接否决 - public String SettleSubmit(JBOTransaction tx){ - try { - String date = this.getNewData("yyyy/MM/dd HH:mm:ss"); - BizObjectManager bbmMange = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME, tx); - - BizObjectManager wasMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME, tx); - BizObject was = wasMange.createQuery(" id=:id and status='处理中' ").setParameter("id", id).getSingleResult(true); - if(was == null ){ - return "未查询到数据！"; - }else { - was.setAttributeValue("status", "已受理"); - was.setAttributeValue("UPDATETIME", date); - wasMange.saveObject(was); - BizObject bbm = bbmMange.createQuery(" id=:id ").setParameter("id", was.getAttribute("messgeId").toString()).getSingleResult(true); - if(bbm != null){ - bbm.setAttributeValue("message_status", "has_process"); - bbm.setAttributeValue("is_read", "has_read"); - bbm.setAttributeValue("finish_time", date); - bbm.setAttributeValue("read_time", date); - bbmMange.saveObject(bbm); - } - return "success"; - } - } catch (JBOException e) { - e.printStackTrace(); - return "系统异常！"; - } - } -} diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index ba463e804..321da8963 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -79,17 +79,12 @@ public class ContractSignAction{ public String Ttype; public String contractNo; public String leasform; - public String SubjectId; private static Logger logger=Logger.getLogger(ContractSignAction.class); @SuppressWarnings("deprecation") public static String getConfigRequestUrl() throws Exception{ return Configure.getInstance().getConfigure("RequestHessionUrl"); } - @SuppressWarnings("deprecation") - public static String getConfigRequestUrlTj() throws Exception{ - return Configure.getInstance().getConfigure("RequestHessionUrlTj"); - } @SuppressWarnings("deprecation") public static String getFileSavePath() throws Exception{ @@ -228,12 +223,6 @@ public class ContractSignAction{ public void setLeasform(String leasform) { this.leasform = leasform; } - public String getSubjectId() { - return SubjectId; - } - public void setSubjectId(String subjectId) { - SubjectId = subjectId; - } /** * 自然人电子签约 * @@ -244,11 +233,7 @@ public class ContractSignAction{ */ @SuppressWarnings("unchecked") public String signIng(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); //BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); @@ -389,11 +374,7 @@ public class ContractSignAction{ @SuppressWarnings("unchecked") public String compnySignIng(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); //BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); @@ -542,11 +523,7 @@ public class ContractSignAction{ */ @SuppressWarnings("unchecked") public String companySignIng(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); Map> map = new HashMap>(); @@ -680,11 +657,7 @@ public class ContractSignAction{ * @throws Exception */ public String PersonDeductSignIng(JBOTransaction tx) throws Exception{ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); Map> map = new HashMap>(); ContractSignInfo con = null; @@ -813,11 +786,7 @@ public class ContractSignAction{ * @throws Exception */ public String AdjustFordSignIng(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); Map> map = new HashMap>(); ContractSignInfo con = null; @@ -934,11 +903,7 @@ public class ContractSignAction{ * @throws Exception */ public String getAdjustFordSignStatus(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); BizObjectManager clBom = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME, tx); List ldclBoList = ldclBom.createQuery("flow_unid='" + FlowUnid + "' and file_flag='yes' and " @@ -991,11 +956,8 @@ public class ContractSignAction{ * @throws Exception */ public String contractSignStatusForContract(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); + BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); BizObjectManager clBom = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME, tx); List ldclBoList = ldclBom.createQuery("flow_unid='" + FlowUnid + "' and file_flag='yes' and " + "sendprocess='1'").getResultList(true); @@ -1047,11 +1009,8 @@ public class ContractSignAction{ * @throws Exception */ public String contractSignStatus(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } //BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); + //BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); BizObjectManager clBom = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME, tx); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); @@ -1158,11 +1117,7 @@ public class ContractSignAction{ * @throws Exception */ public String changeCarSignStatus(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager clBom = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME, tx); BizObjectManager ldlMange = JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME, tx); BizObjectManager ldMange = JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME, tx); @@ -1243,11 +1198,7 @@ public class ContractSignAction{ * @throws Exception */ public String contractSignStatusList(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); BizObjectManager clBom = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME, tx); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); @@ -1285,11 +1236,7 @@ public class ContractSignAction{ * @throws Exception */ public String sign(JBOTransaction tx) throws MalformedURLException, Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); @SuppressWarnings("unchecked") List bo = contBom.createQuery("project_id=:projectId and file_flag='yes'") @@ -1324,11 +1271,7 @@ public class ContractSignAction{ * @throws MalformedURLException */ public String downloadDoc(JBOTransaction tx) throws MalformedURLException, Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); String sql = ""; if ("01".equals(customerType)) { @@ -1388,11 +1331,7 @@ public class ContractSignAction{ * @throws MalformedURLException */ public String changedownloadDoc(JBOTransaction tx) throws MalformedURLException, Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager ldMange = JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME, tx); String sql = "OBJECTTYPE='ChangeCar' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid "; @SuppressWarnings("unchecked") @@ -1441,11 +1380,7 @@ public class ContractSignAction{ //扣款卡变更下载合同 public String downloadDocContract(JBOTransaction tx) throws MalformedURLException, Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); String sql = ""; sql = "flow_unid=:flow_unid and file_flag='yes'"; @@ -1505,11 +1440,7 @@ public class ContractSignAction{ * @throws MalformedURLException */ public String downloadZipContract(JBOTransaction tx) throws MalformedURLException, Exception{ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom=JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); try{ String path=null; @@ -1547,11 +1478,7 @@ public String downloadZipContract(JBOTransaction tx) throws MalformedURLExceptio * @throws MalformedURLException */ public String download(JBOTransaction tx) throws MalformedURLException, Exception{ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom=JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); try{ String path=null; @@ -1927,11 +1854,7 @@ public String AccountAccreditSign(JBOTransaction tx){ } } public String accountSign(JBOTransaction tx,String flowunid,String orgid) throws Exception{ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx); BizObjectManager attrBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME,tx); Map map=new HashMap(); @@ -2037,11 +1960,7 @@ public String getFlowUnid(JBOTransaction tx) throws JBOException{ * */ public String sendMessageAgain(JBOTransaction tx) { try{ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); List bo = null; String file = new String(); @@ -2085,11 +2004,7 @@ public String sendMessageAgain(JBOTransaction tx) { * */ public String ChangesendMessageAgain(JBOTransaction tx) { try{ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); List bo = null; String file = new String(); Map contractmap = new HashMap(); @@ -2146,11 +2061,7 @@ public String getProcess(JBOTransaction tx){ } public String claimSign(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); ContractSignInfo con = null; BizObject bo = null; @@ -2242,11 +2153,7 @@ public String claimSign(JBOTransaction tx) throws Exception { * @throws Exception */ public String claimSignA(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); String libraryid=""; PLAN_LIST=PLAN_LIST.split("\\.")[0]; BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); @@ -2359,11 +2266,7 @@ public String claimSign(JBOTransaction tx) throws Exception { * @throws Exception */ public String changeCarSignA(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); String libraryid=""; BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME,tx); BizObjectManager bom1=null; @@ -2448,11 +2351,7 @@ public String claimSign(JBOTransaction tx) throws Exception { * @throws Exception */ public String collectionSignA(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); String libraryid=""; BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); BizObject DOCRELATIVE = null; @@ -2601,11 +2500,7 @@ public String claimSign(JBOTransaction tx) throws Exception { */ public String TcollectionSignA(JBOTransaction tx) throws Exception { - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrlTj()); - }else{ - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - } + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); String libraryid=""; BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); BizObject DOCRELATIVE = null; diff --git a/src_core/com/tenwa/comm/credit/BodyGuardApiInvoker.java b/src_core/com/tenwa/comm/credit/BodyGuardApiInvoker.java index 686b43572..2d2b9290c 100644 --- a/src_core/com/tenwa/comm/credit/BodyGuardApiInvoker.java +++ b/src_core/com/tenwa/comm/credit/BodyGuardApiInvoker.java @@ -29,21 +29,11 @@ public class BodyGuardApiInvoker { private static final String PARTNER_KEY = CreditPropertiesUtil.get("PARTNER_KEY");//合作方密钥_深圳 private static final String PARTNER_APP = CreditPropertiesUtil.get("PARTNER_APP");//应用名_深圳 - private static final String T_apiUrl = CreditPropertiesUtil.get("T_apiUrl");//请求url_天津 - private static final String T_PARTNER_CODE = CreditPropertiesUtil.get("T_PARTNER_CODE");// 合作方标识_天津 - private static final String T_PARTNER_KEY = CreditPropertiesUtil.get("T_PARTNER_KEY");//合作方密钥_天津 - private static final String T_PARTNER_APP = CreditPropertiesUtil.get("T_PARTNER_APP");//应用名_天津 - private HttpURLConnection conn; - public BodyGuardApiResponse invoke(Map params,String SubjectId) { + public BodyGuardApiResponse invoke(Map params) { try { - String urlString = null; - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){//天津 - urlString = new StringBuilder().append(T_apiUrl).append("?partner_code=").append(T_PARTNER_CODE).append("&partner_key=").append(T_PARTNER_KEY).append("&app_name=").append(T_PARTNER_APP).toString(); - }else { - urlString = new StringBuilder().append(apiUrl).append("?partner_code=").append(PARTNER_CODE).append("&partner_key=").append(PARTNER_KEY).append("&app_name=").append(PARTNER_APP).toString(); - } + String urlString = new StringBuilder().append(apiUrl).append("?partner_code=").append(PARTNER_CODE).append("&partner_key=").append(PARTNER_KEY).append("&app_name=").append(PARTNER_APP).toString(); URL url = new URL(urlString); // 组织请求参数 StringBuilder postBody = new StringBuilder(); @@ -170,7 +160,7 @@ public class BodyGuardApiInvoker { params.put("event_occur_time", "2016-03-01 08:16:30"); params.put("organization", "阿里巴巴西溪园区"); params.put("contact2_mobile", "13800008888"); - BodyGuardApiResponse bodyGuardApiResponse = new BodyGuardApiInvoker().invoke(params,"d989246c11c111eaaa0000163e0e11e6"); + BodyGuardApiResponse bodyGuardApiResponse = new BodyGuardApiInvoker().invoke(params); System.out.println(bodyGuardApiResponse.toString()); } } diff --git a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java index 08aa28ae2..ecd074983 100644 --- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java +++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java @@ -28,7 +28,6 @@ public class CreditBodyGuardAction { private String flowunid; private String phaseno; private String certids; - private String SubjectId; public String getFlowunid() { @@ -55,14 +54,6 @@ public class CreditBodyGuardAction { this.certids = certids; } - public String getSubjectId() { - return SubjectId; - } - - public void setSubjectId(String subjectId) { - SubjectId = subjectId; - } - public String doCreditVerification(JBOTransaction tx) throws JBOException{ try { @@ -171,7 +162,7 @@ public class CreditBodyGuardAction { //借款人手机号 params.put("account_mobile", failedpersonList.get(m).getAttribute("phoneNumber").getString()); //调用同盾信贷接口方法 - BodyGuardApiResponse ResponseResult = bodyGuardApiInvoker.invoke(params,SubjectId); + BodyGuardApiResponse ResponseResult = bodyGuardApiInvoker.invoke(params); if(!ResponseResult.getSuccess()){ //失败信息更新到对应记录表中 continue; @@ -230,7 +221,7 @@ public class CreditBodyGuardAction { }else if("身份证命中法院失信名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); - /*@SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") List courtdetailList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("court_details")),HashMap.class); StringBuffer sb = new StringBuffer(); for(int j=0;j 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name")+"。"; }else if("身份证命中法院执行名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); - /*@SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") List courtdetailList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("court_details")),HashMap.class); StringBuffer sb = new StringBuffer(); for(int j=0;j 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中信贷逾期名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") @@ -299,18 +290,18 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中车辆租赁违约名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中法院结案名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); - /*@SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") List courtdetailList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("court_details")),HashMap.class); StringBuffer sb = new StringBuffer(); for(int j=0;j detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); @SuppressWarnings("rawtypes") List fuzzyList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("fuzzy_list_details")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - // +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" + +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" +"姓名:"+fuzzyList.get(0).get("fuzzy_name").toString()+"。" +"模糊身份证:"+fuzzyList.get(0).get("fuzzy_id_number").toString()+"。"; }else if("身份证_姓名命中法院失信模糊名单".equals(riskItemList.get(i).get("risk_name"))){ @@ -350,7 +341,7 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List fuzzyList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("fuzzy_list_details")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - // +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" + +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" +"姓名:"+fuzzyList.get(0).get("fuzzy_name").toString()+"。" +"模糊身份证:"+fuzzyList.get(0).get("fuzzy_id_number").toString()+"。"; }else if("身份证_姓名命中法院执行模糊名单".equals(riskItemList.get(i).get("risk_name"))){ @@ -359,7 +350,7 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List fuzzyList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("fuzzy_list_details")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - // +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" + +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" +"姓名:"+fuzzyList.get(0).get("fuzzy_name").toString()+"。" +"模糊身份证:"+fuzzyList.get(0).get("fuzzy_id_number").toString()+"。"; }else if("身份证_姓名命中法院结案模糊名单".equals(riskItemList.get(i).get("risk_name"))){ @@ -368,62 +359,62 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List fuzzyList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("fuzzy_list_details")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - // +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" + +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" +"姓名:"+fuzzyList.get(0).get("fuzzy_name").toString()+"。" +"模糊身份证:"+fuzzyList.get(0).get("fuzzy_id_number").toString()+"。"; }else if("身份证命中欠款公司法人代表名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中故意违章乘车名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中欠税名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中欠税公司法人代表名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中信贷逾期后还款名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中虚假号码库".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中通信小号库".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中诈骗骚扰库".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中高风险关注名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中信贷逾期名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") @@ -447,19 +438,19 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中欠款公司法人代表名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中信贷逾期后还款名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("3个月内身份证关联多个申请信息".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") @@ -609,13 +600,13 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("申请人信息命中低风险关注名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List 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("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("3个月内申请人在多个平台被放款_不包含本合作方".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index 29711e939..69420638d 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -368,35 +368,6 @@ public class DebitCardAction { return "success"; } - //合同变更校验是否已经签约 - public String IsSignStatus(JBOTransaction tx) throws Exception{ - BizObjectManager cahManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_HIS.CLASS_NAME); - List cahs = cahManage.createQuery(" account=:account and acc_number=:acc_number and bank_name=:bank_name and mobile=:mobile ") - .setParameter("account", account).setParameter("acc_number", acc_number).setParameter("bank_name", bank_name).setParameter("mobile", mobile).getResultList(false); - for (BizObject cah : cahs) { - if("Y".equals(cah.getAttribute("sign_status").toString())){ - return "Y"; - } - } - return "N"; - } - - //校验是否已经生成直接扣款委托书 - public String isEntrustFile(JBOTransaction tx){ - try { - BizObjectManager ldrManage = JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME, tx); - BizObject ldr = ldrManage.createQuery("OBJECTTYPE='ChangeCar' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contractid).getSingleResult(false); - if(ldr == null){ - return "success"; - }else{ - return "直接扣款委托书已生成，无法重新保存数据！"; - } - } catch (JBOException e) { - e.printStackTrace(); - } - return "获取状态失败！"; - } - public String getMobile() { return mobile; } diff --git a/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java b/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java index e2f5468ee..b10dc423e 100644 --- a/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java +++ b/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java @@ -24,9 +24,7 @@ public class FileMailingMessage extends BaseBussinessMessage { BizObjectManager messageManager =JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME,this.curTx); messageManager.createQuery(" delete from O where message_content='邮寄档案归档' ").executeUpdate(); - //String sql = "SELECT COUNT(O.PROJECT_MANAGE) number,O.PROJECT_MANAGE PROJECT_MANAGE FROM LB_CONTRACT_INFO O LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfi ON lfi.contract_id = O.id LEFT JOIN ORG_INFO oi ON oi.orgid = O.PROJECT_DEPT LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id = O.id WHERE (lfi.ALLHANDOVERSTATUS IS NULL OR lfi.ALLHANDOVERSTATUS = 'part' OR lfi.ALLHANDOVERSTATUS = 'none') AND NOT EXISTS (SELECT 1 FROM LB_FILE_MAILARCHIVING_INFO_TEMP lfmit WHERE lfmit.contract_id = O.id AND lfmit.is_flowing = '0') AND EXISTS (SELECT 1 FROM LB_FILE_ARCHIVING_INFO lfai WHERE lfai.contract_id = O.id) GROUP BY O.PROJECT_MANAGE"; - String sql = "SELECT COUNT(DI.DISTRIBUTOR_CODING) number,O.PROJECT_MANAGE AS PROJECT_MANAGE FROM LB_CONTRACT_INFO O LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=O.DISTRIBUTOR_ID LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfi ON lfi.contract_id = O.id LEFT JOIN ORG_INFO oi ON oi.orgid = O.PROJECT_DEPT LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id = O.id WHERE (lfi.ALLHANDOVERSTATUS IS NULL OR lfi.ALLHANDOVERSTATUS = 'part' OR lfi.ALLHANDOVERSTATUS = 'none') AND NOT EXISTS (SELECT 1 FROM LB_FILE_MAILARCHIVING_INFO_TEMP lfmit WHERE lfmit.contract_id = O.id AND lfmit.is_flowing = '0') AND EXISTS (SELECT 1 FROM LB_FILE_ARCHIVING_INFO lfai WHERE lfai.contract_id = O.id) AND DI.DISTRIBUTOR_CODING<>'APZL-BJ002-HHGJ' GROUP BY O.PROJECT_MANAGE UNION ALL SELECT COUNT(O.PROJECT_MANAGE) number,'8006U00000017' AS PROJECT_MANAGE FROM LB_CONTRACT_INFO O LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=O.DISTRIBUTOR_ID LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfi ON lfi.contract_id = O.id LEFT JOIN ORG_INFO oi ON oi.orgid = O.PROJECT_DEPT LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id = O.id WHERE (lfi.ALLHANDOVERSTATUS IS NULL OR lfi.ALLHANDOVERSTATUS = 'part' OR lfi.ALLHANDOVERSTATUS = 'none') AND NOT EXISTS (SELECT 1 FROM LB_FILE_MAILARCHIVING_INFO_TEMP lfmit WHERE lfmit.contract_id = O.id AND lfmit.is_flowing = '0') AND EXISTS (SELECT 1 FROM LB_FILE_ARCHIVING_INFO lfai WHERE lfai.contract_id = O.id) AND DI.DISTRIBUTOR_CODING='APZL-BJ002-HHGJ' GROUP BY DI.DISTRIBUTOR_CODING "; - + String sql = "SELECT COUNT(O.PROJECT_MANAGE) number,O.PROJECT_MANAGE PROJECT_MANAGE FROM LB_CONTRACT_INFO O LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfi ON lfi.contract_id = O.id LEFT JOIN ORG_INFO oi ON oi.orgid = O.PROJECT_DEPT LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id = O.id WHERE (lfi.ALLHANDOVERSTATUS IS NULL OR lfi.ALLHANDOVERSTATUS = 'part' OR lfi.ALLHANDOVERSTATUS = 'none') AND NOT EXISTS (SELECT 1 FROM LB_FILE_MAILARCHIVING_INFO_TEMP lfmit WHERE lfmit.contract_id = O.id AND lfmit.is_flowing = '0') AND EXISTS (SELECT 1 FROM LB_FILE_ARCHIVING_INFO lfai WHERE lfai.contract_id = O.id) GROUP BY O.PROJECT_MANAGE"; List> lciList=DataOperatorUtil.getDataBySql(sql, null); for(Map lci : lciList){ diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java index 00b07e2ff..14420967c 100644 --- a/src_core/com/tenwa/doc/action/DocListInitAction.java +++ b/src_core/com/tenwa/doc/action/DocListInitAction.java @@ -42,7 +42,7 @@ public class DocListInitAction { * @throws Exception */ @SuppressWarnings("unchecked") - public static synchronized void initDocList(Map param,Map other, String docno, Configure curConfig,Transaction Sqlca)throws Exception { + public static synchronized void initDocList(Map param,Map other, String docno, Configure curConfig )throws Exception { String CustomerType = other.get("CustomerType"); String[] itemnos = docno.split(","); String s = ""; @@ -65,9 +65,9 @@ public class DocListInitAction { s = s.substring(0, s.length() - 1); } docno = s; - BizObjectManager relaBm = JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME,Sqlca); - BizObjectManager libBm = JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME,Sqlca); - BizObjectManager configBm = JBOFactory.getBizObjectManager(LB_DOCCONFIG.CLASS_NAME,Sqlca); + BizObjectManager relaBm = JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME); + BizObjectManager libBm = JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); + BizObjectManager configBm = JBOFactory.getBizObjectManager(LB_DOCCONFIG.CLASS_NAME); if ("".equals(docno)) { return; } diff --git a/src_core/com/tenwa/doc/servlet/DocFlowDownloadZipServlet.java b/src_core/com/tenwa/doc/servlet/DocFlowDownloadZipServlet.java index a8622356d..18e6eb1df 100644 --- a/src_core/com/tenwa/doc/servlet/DocFlowDownloadZipServlet.java +++ b/src_core/com/tenwa/doc/servlet/DocFlowDownloadZipServlet.java @@ -77,7 +77,7 @@ import com.tenwa.util.ZipFileUtil; ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file)); for(BizObject lib:libs){ @SuppressWarnings("unchecked") - List attrs=JBOFactory.createBizObjectQuery(LB_DOCATTRIBUTE.CLASS_NAME,"library_id=:id and DELETEED is null").setParameter("id",lib.getAttribute("id").getString()).getResultList(false); + List attrs=JBOFactory.createBizObjectQuery(LB_DOCATTRIBUTE.CLASS_NAME,"library_id=:id ").setParameter("id",lib.getAttribute("id").getString()).getResultList(false); if(attrs.size()==0){ continue; } diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/LBRentPlanTempCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/LBRentPlanTempCallBack.java index 1d0a3d57e..30e6631ae 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/impl/LBRentPlanTempCallBack.java +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/LBRentPlanTempCallBack.java @@ -29,8 +29,7 @@ public class LBRentPlanTempCallBack extends BaseImportExcelCallBack { BizObject virent=JBOFactory.createBizObjectQuery(VI_LC_RENT_PLAN.CLASS_NAME,"payment_number=:paymentnumber and plan_list=:planlist").setParameter("paymentnumber", paymentnumber).setParameter("planlist", planlist).getSingleResult(false); if(virent!=null&&!virent.getAttribute("planstatus").getString().equals("未回笼")){ - return; -// throw new BusinessException("租金计划期次："+planlist+"已回笼不能修改"); + throw new BusinessException("租金计划期次："+planlist+"已回笼不能修改"); } BigDecimal rent=new BigDecimal(NumberUtils.round(importObject.getAttribute("rent").getDouble(),2)+""); BigDecimal CORPUS=new BigDecimal(NumberUtils.round(importObject.getAttribute("CORPUS").getDouble(),2)+""); diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java index aada520a6..3f0c52fb6 100644 --- a/src_core/com/tenwa/util/SerialNumberUtil.java +++ b/src_core/com/tenwa/util/SerialNumberUtil.java @@ -57,9 +57,6 @@ public class SerialNumberUtil { public static synchronized String getVoucherPCNumber(JBOTransaction tx) throws Exception{ return SerialNumberUtil.getSerialNumber("AP{year}{month}{day}-{maxOrderNumber}",3,null, "凭证接口批次", null, tx); } - public static synchronized String getWechatBatchNumber(JBOTransaction tx) throws Exception{ - return SerialNumberUtil.getSerialNumber("AP{year}{month}{day}-{maxOrderNumber}",3,null, "微信接口批次", null, tx); - } //鹏元apply_id public static synchronized String getPengyuanNumber(JBOTransaction tx) throws Exception{ return SerialNumberUtil.getSerialNumber("{year}{month}{day}{maxOrderNumber}",9,null, "鹏元apply_id", null, tx); @@ -167,7 +164,7 @@ public class SerialNumberUtil { int year = Integer.parseInt(currentYear); int month = Integer.parseInt(currentMonth); int day = Integer.parseInt(currentDay); - return SerialNumberUtil.getSerialNumberByDay(dept+"{year}{month}{day}{maxOrderNumber}",4,null, "合同编号", year,month,day, tx); + return SerialNumberUtil.getSerialNumberByDay("BQAP("+dept+"){year}{month}{day}{maxOrderNumber}",4,null, "合同编号", year,month,day, tx); } /*public static String getContractSerialNaumber(String sSerialType,JBOTransaction tx) throws Exception { diff --git a/src_core/com/tenwa/util/ZipFileUtil.java b/src_core/com/tenwa/util/ZipFileUtil.java index 6ae7ecd12..c9adccac2 100644 --- a/src_core/com/tenwa/util/ZipFileUtil.java +++ b/src_core/com/tenwa/util/ZipFileUtil.java @@ -4,13 +4,11 @@ import java.io.File; import java.io.FileInputStream; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import org.mozilla.javascript.edu.emory.mathcs.backport.java.util.Collections; -import org.springframework.security.core.authority.mapping.MappableAttributesRetriever; public class ZipFileUtil { /** @@ -24,7 +22,6 @@ public class ZipFileUtil { if(!path.endsWith("/")){ path+="/"; } - HashMap map = new HashMap(); byte[] buf = new byte[1024]; try { if(srcFiles.size()==0){ @@ -51,18 +48,11 @@ public class ZipFileUtil { * 第二次：若相同，1++， * 若不同，放入key，1 */ - String filename= filenames.get(i); - if(map.get(filename)==null){ - map.put(filename, 1); - }else{ - int num = map.get(filename)+1; - map.put(filename,num); - } - if(1!=map.get(filename)){ - String[] arr = filenames.get(i).split("\\."); - filename = arr[0]+"("+map.get(filename)+")."+arr[1]; - } FileInputStream in = new FileInputStream(srcFiles.get(i)); + String filename = srcFiles.get(i).getName(); + if(filenames != null) { + filename = filenames.get(i); + } out.putNextEntry(new ZipEntry(path + filename)); int len; while((len=in.read(buf))>0){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java index 62739a6c3..853b9c6dc 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java @@ -4,19 +4,17 @@ 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.itextpdf.text.log.SysoCounter; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.flow.baseBussion.BaseBussiness; import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; + +import jbo.app.tenwa.customer.CUSTOMER_LIST; +import jbo.voucher.LV_VOUCHER_CONFIG; +import jbo.voucher.TAX_CODE; /** * 传统实际付款后生成凭证 * @author xiezhiwen @@ -46,7 +44,6 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ String HANDLING_CHARGE_MONEY_NOTAX=null;// 手续费(不含税) String HANDLING_CHARGE_MONEY_TAX=null; // 手续费(税金) String OTHERS_MATH=null; // 设备款+其他-首付款-保证金-手续费 - String GPS_FEE=null; // GPS费用 String ACCOUNT_DATE=null; // 记账日期 String FACT_DATE=null; // 实际付款日期 String CONTRACT_ID=null; // 合同id @@ -63,25 +60,23 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ String TAX_NUM=null; // 银行账号 String sql=""; - // 传统回租 - if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2018092500000162".equals(VOUCHERNO) || "PZ2018092500000164".equals(VOUCHERNO) || "PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092500000169".equals(VOUCHERNO)){ - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS EQUIPTAX,ROUND((ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)+IFNULL(LFIT2.OTHER_MONEY, 0)),2) AS EQUIPNOTAX_OTHER,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 = '2' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LFIT1.FLOWUNID = :FLOWUNID "; - // 传统直租 - }else if("PZ2019071800000036".equals(VOUCHERNO) || "PZ2019071800000038".equals(VOUCHERNO) || "PZ2019071800000039".equals(VOUCHERNO) || "PZ2019071800000040".equals(VOUCHERNO) || "PZ2019071800000041".equals(VOUCHERNO) || "PZ2019071800000037".equals(VOUCHERNO)){ - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS EQUIPTAX,ROUND((ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)+IFNULL(LFIT2.OTHER_MONEY, 0)),2) AS EQUIPNOTAX_OTHER,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 = '2' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LFIT1.FLOWUNID = :FLOWUNID "; - // 汽车类传统-回租 - }else if("PZ2019072000000078".equals(VOUCHERNO) || "PZ2019072000000079".equals(VOUCHERNO) || "PZ2019072000000080".equals(VOUCHERNO) || "PZ2019072000000081".equals(VOUCHERNO)){ - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS MONEY,CASE WHEN IFNULL(LFIT6.CONTRIBUTIVE_MONEY,0)=0 THEN IFNULL(LCCT.unite_money,0) ELSE 0 END AS INTERESTNOTAX,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LCCT.CLEAN_LEASE_MONEY,0) + CASE WHEN IFNULL(LFIT6.CONTRIBUTIVE_MONEY,0)=0 THEN IFNULL(LCCT.unite_money,0) ELSE 0 END - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)-IFNULL(LCCT.GPS_FEE,0)) AS OTHERS_MATH,IFNULL(LCCT.GPS_FEE,0) AS GPS_FEE,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS CONTRIBUTIVE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype32' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT6 ON LFIT6.FLOWUNID = LFIT1.FLOWUNID AND LFIT6.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 = '3' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LFIT1.FLOWUNID = :FLOWUNID "; - // 汽车类传统-直租 - }else if("PZ2019072200000112".equals(VOUCHERNO) || "PZ2019072200000113".equals(VOUCHERNO) || "PZ2019072200000114".equals(VOUCHERNO) || "PZ2019072200000115".equals(VOUCHERNO) || "PZ2019072200000116".equals(VOUCHERNO) || "PZ2019072200000117".equals(VOUCHERNO)){ - sql="SELECT ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS EQUIPTAX,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 = '3' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LFIT1.FLOWUNID = :FLOWUNID "; - // 放款-确认GPS收入-汽车类传统回租 - }else if("PZ2019090500000004".equals(VOUCHERNO)){ - sql="SELECT ROUND((getTax (lci.LEAS_FORM,'GPS',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.GPS_FEE,0) AS MONEY,ROUND(IFNULL(LCCT.GPS_FEE,0)/getTax(LCI.LEAS_FORM,'GPS',LCCT.START_DATE),2) AS INTERESTNOTAX,(IFNULL(LCCT.GPS_FEE,0)-ROUND(IFNULL(LCCT.GPS_FEE,0)/getTax(LCI.LEAS_FORM,'GPS',LCCT.START_DATE),2)) AS TAX,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT.FACT_DATE, '%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,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 = '3' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND IFNULL(LCCT.GPS_FEE,0)>0 AND LFIT.FLOWUNID = :FLOWUNID "; + if (("PZ2018092500000159".equals(VOUCHERNO)) || ("PZ2018092500000162".equals(VOUCHERNO)) + || ("PZ2018092500000164".equals(VOUCHERNO)) || ("PZ2018092500000166".equals(VOUCHERNO)) + || ("PZ2018092500000169".equals(VOUCHERNO)) || ("PZ2019071800000036".equals(VOUCHERNO)) + || ("PZ2019071800000038".equals(VOUCHERNO)) || ("PZ2019071800000039".equals(VOUCHERNO)) + || ("PZ2019071800000040".equals(VOUCHERNO)) || ("PZ2019071800000041".equals(VOUCHERNO)) + || ("PZ2019071800000037".equals(VOUCHERNO))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS EQUIPTAX,ROUND((ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)+IFNULL(LFIT2.OTHER_MONEY, 0)),2) AS EQUIPNOTAX_OTHER,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 = '2' AND LUL.IS_MAIN = 'Y' AND LFIT1.FLOWUNID = :FLOWUNID "; + } else if (("PZ2019072000000077".equals(VOUCHERNO)) || ("PZ2019072000000078".equals(VOUCHERNO)) + || ("PZ2019072000000079".equals(VOUCHERNO)) || ("PZ2019072000000080".equals(VOUCHERNO)) + || ("PZ2019072000000081".equals(VOUCHERNO)) || ("PZ2019072200000112".equals(VOUCHERNO)) + || ("PZ2019072200000113".equals(VOUCHERNO)) || ("PZ2019072200000114".equals(VOUCHERNO)) + || ("PZ2019072200000115".equals(VOUCHERNO)) || ("PZ2019072200000116".equals(VOUCHERNO)) + || ("PZ2019072200000117".equals(VOUCHERNO))) { + sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS EQUIPTAX,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 = '3' AND LUL.IS_MAIN = 'Y' AND LFIT1.FLOWUNID = :FLOWUNID "; } - // 非差额放款 - if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2019071800000036".equals(VOUCHERNO) || "PZ2019072200000112".equals(VOUCHERNO)){ + if (("PZ2018092500000159".equals(VOUCHERNO)) || ("PZ2019071800000036".equals(VOUCHERNO)) || ("PZ2019072000000077".equals(VOUCHERNO)) || ("PZ2019072200000112".equals(VOUCHERNO))) { sql+=" AND (IFNULL(LFIT3.FIRST_PAYMENT,0) = 0 AND IFNULL(LFIT4.GUARANTY,0) =0 AND IFNULL(LFIT5.HANDLING_CHARGE_MONEY ,0) = 0)"; // 差额-经销商支付的预付款(首付) }else if("PZ2018092500000162".equals(VOUCHERNO) || "PZ2019071800000038".equals(VOUCHERNO) || "PZ2019072000000078".equals(VOUCHERNO) || "PZ2019072200000113".equals(VOUCHERNO)) { @@ -93,7 +88,7 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ }else if("PZ2018092500000166".equals(VOUCHERNO) || "PZ2019071800000040".equals(VOUCHERNO) || "PZ2019071800000041".equals(VOUCHERNO) || "PZ2019072000000080".equals(VOUCHERNO) || "PZ2019072200000115".equals(VOUCHERNO) || "PZ2019072200000116".equals(VOUCHERNO)) { sql+=" AND IFNULL(LFIT5.HANDLING_CHARGE_MONEY ,0) <> 0 "; // 给经销商放款-差额放款 - }else if("PZ2018092500000169".equals(VOUCHERNO) || "PZ2019072200000117".equals(VOUCHERNO)) { + } else if (("PZ2018092500000169".equals(VOUCHERNO)) || ("PZ2019072000000081".equals(VOUCHERNO)) || ("PZ2019072200000117".equals(VOUCHERNO))) { sql+=" AND (IFNULL(LFIT3.FIRST_PAYMENT,0) <> 0 OR IFNULL(LFIT4.GUARANTY,0) <> 0 OR IFNULL(LFIT5.HANDLING_CHARGE_MONEY ,0) <> 0)"; } @@ -134,7 +129,6 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ HANDLING_CHARGE_MONEY_NOTAX=dataList.get(i).get("HANDLING_CHARGE_MONEY_NOTAX");// 不含税手续费 HANDLING_CHARGE_MONEY_TAX=dataList.get(i).get("HANDLING_CHARGE_MONEY_TAX");// 手续费税金 OTHERS_MATH=dataList.get(i).get("OTHERS_MATH");// 设备款+其他-首付款-保证金-手续费 - GPS_FEE=dataList.get(i).get("GPS_FEE"); // GPS费用 ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE");// 会计日期 FACT_DATE=dataList.get(i).get("FACT_DATE");// 实际付款日期 CONTRACT_ID=dataList.get(i).get("CONTRACT_ID");// 合同id @@ -172,7 +166,6 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ param.put("HANDLING_CHARGE_MONEY_NOTAX",HANDLING_CHARGE_MONEY_NOTAX); param.put("HANDLING_CHARGE_MONEY_TAX",HANDLING_CHARGE_MONEY_TAX); param.put("OTHERS_MATH",OTHERS_MATH); - param.put("GPS_FEE_FINANCE",GPS_FEE); param.put("ACCOUNT_DATE",ACCOUNT_DATE); param.put("FACT_DATE",FACT_DATE); param.put("CONTRACT_ID",CONTRACT_ID); @@ -197,8 +190,6 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ if("PZ2018092500000166".equals(VOUCHERNO) || "PZ2019071800000040".equals(VOUCHERNO) || "PZ2019071800000041".equals(VOUCHERNO) || "PZ2019072000000080".equals(VOUCHERNO) || "PZ2019072200000115".equals(VOUCHERNO) || "PZ2019072200000116".equals(VOUCHERNO)){ param.put("CASHFLOW", "");// 现金流项目 param.put("BUSINESSTYPE", "0604");// 主营类型 - }else if("PZ2019090500000004".equals(VOUCHERNO)){ - param.put("BUSINESSTYPE", "0601");// 主营类型 } // 给供应商放款-非差额放款/给经销商放款-差额放款, 用来判断集团内外的现金流辅助项 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java index 1ffb984c5..765627ef6 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java @@ -36,8 +36,6 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) thro String DISTRIBUTOR_NAME=null; String ACC_NUMBER=null; String LOCAL_BANK=null; - String SUBJECTID=null; - String SUBJECTNAME=null; String sql=""; param.clear(); map.put("FLOWUNID", FlowUnid); @@ -46,7 +44,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) thro }*/ if("PZ2018072100000032".equals(VOUCHERNO)){ //sql= "SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(DDIT.COLLECT_TIME, '%Y/%m/%d') AS FACT_DATE,DDIT.payer,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,DIF.DISTRIBUTOR_NAME,DDIT.LOCAL_ACCOUNT AS ACC_NUMBER, DDIT.LOCAL_BANK FROM D_DEPOSITCHARGE_INFO_TEMP DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO = DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID = :FLOWUNID "; - sql="SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(DDIT.COLLECT_TIME, '%Y/%m/%d') AS FACT_DATE,DDIT.payer,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,DIF.DISTRIBUTOR_NAME,DDIT.LOCAL_ACCOUNT AS ACC_NUMBER,DDIT.LOCAL_BANK,DDIT.SUBJECTID,DDIT.SUBJECTNAME FROM D_DEPOSITCHARGE_INFO_TEMP DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO = DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID = :FLOWUNID "; + sql="SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(DDIT.COLLECT_TIME, '%Y/%m/%d') AS FACT_DATE,DDIT.payer,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,DIF.DISTRIBUTOR_NAME,DDIT.LOCAL_ACCOUNT AS ACC_NUMBER,DDIT.LOCAL_BANK FROM D_DEPOSITCHARGE_INFO_TEMP DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO = DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID = :FLOWUNID "; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); @@ -64,8 +62,6 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) thro DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); ACC_NUMBER=dataList.get(i).get("ACC_NUMBER"); LOCAL_BANK=dataList.get(i).get("LOCAL_BANK"); - SUBJECTID=dataList.get(i).get("SUBJECTID"); - SUBJECTNAME=dataList.get(i).get("SUBJECTNAME"); leas_form="02"; param.put("FACT_MONEY",MONEY); param.put("ACCOUNT_DATE",ACCOUNT_DATE); @@ -78,8 +74,6 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) thro param.put("FlowUnid", FlowUnid); param.put("ACC_NUMBER", ACC_NUMBER); param.put("LOCAL_BANK", LOCAL_BANK); - param.put("SUBJECTID", SUBJECTID); - param.put("SUBJECTNAME", SUBJECTNAME); param.put("VOUCHERNO", VOUCHERNO); // 通过客户名称获取客户编码维护里面的数据, 如果有数据说明是集团内, 如果没有数据说明是集团外 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java index 43f1ef655..bc120c0b9 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java @@ -46,11 +46,11 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { map.put("FlowUnid", FlowUnid); sql= "SELECT IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS MONEY,IFNULL(ROUND(LCCT.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2),0) AS HANDLFEENOTAX,IFNULL((LCCT.HANDLING_CHARGE_MONEY - ROUND(LCCT.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2)),0) AS HANDLTAX,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,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,cif.customer_num FROM LC_CALC_CONDITION LCCT INNER JOIN lc_fund_income_temp lfit ON lfit.contract_id = lcct.contract_id AND lfit.fee_type = 'feetype10' LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.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.FLOWUNID = :FLOWUNID "; // 给经销商放款冲抵确认收到手续费（按月分摊收入） - if("PZ2018071000000009".equals(VOUCHERNO)){ + if (("PZ2018071000000009".equals(VOUCHERNO)) || ("PZ2018080300000073".equals(VOUCHERNO))) { sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020'"; } // 给经销商放款冲抵确认手续费收入（一次性确认收入） - if("PZ2018071000000007".equals(VOUCHERNO)){ + if (("PZ2018071000000007".equals(VOUCHERNO)) || ("PZ2018080300000072".equals(VOUCHERNO))) { sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0010'"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java index aded22007..72d297d7a 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java @@ -13,6 +13,7 @@ public class CommLoanFactMoneyToMoney implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); + returnValue.put("FUNDTYPE", "01"); returnValue.put("MONEY",param.get("FACT_MONEY")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java index 01e806b0f..39c608455 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java @@ -39,7 +39,7 @@ public class ContractActualPaymentTraditionVoucher extends BaseBussiness { * 汽车类传统-回租 */ //cvap.CreateVoucher(FlowUnid, "PZ2019072000000077",userid); // 放款-购置融资租赁资产(汽车类传统)-非差额 - cvap.CreateVoucher(FlowUnid, "PZ2019090500000004",userid); // 放款-确认GPS收入 + cvap.CreateVoucher(FlowUnid, "PZ2019072000000077", userid); // 放款-确认GPS收入 cvap.CreateVoucher(FlowUnid, "PZ2019072000000078",userid); // 放款-经销商支付的预付款(汽车类传统) cvap.CreateVoucher(FlowUnid, "PZ2019072000000079",userid); // 放款-客户记录保证金(汽车类传统) cvap.CreateVoucher(FlowUnid, "PZ2019072000000080",userid); // 放款-收到客户手续费(汽车类传统) @@ -54,7 +54,6 @@ public class ContractActualPaymentTraditionVoucher extends BaseBussiness { cvap.CreateVoucher(FlowUnid, "PZ2019072200000115",userid); // 放款-收到客户手续费(汽车类传统)(一次性) cvap.CreateVoucher(FlowUnid, "PZ2019072200000116",userid); // 放款-收到客户手续费(汽车类传统)(按月) cvap.CreateVoucher(FlowUnid, "PZ2019072200000117",userid); // 放款-购置融资租赁资产(汽车类传统)-差额放款 - System.out.println(0/0); return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java index f350db1c7..5ab6ebb4b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java @@ -20,7 +20,6 @@ public class ContractBeforeOnhireToVoucher extends BaseBussiness { */ cvbo.CreateVoucher(FlowUnid, "PZ2018092500000156","feetype2",userid); // 回款-收到客户保证金(传统) cvbo.CreateVoucher(FlowUnid, "PZ2018092500000157","feetype1",userid); // 回款-收到客户手续费(传统)-一次性 - cvbo.CreateVoucher(FlowUnid, "PZ2019120400000149","feetype1",userid); // 回款-收到客户手续费(传统)-按月 cvbo.CreateVoucher(FlowUnid, "PZ2018092500000158","feetype5",userid); // 回款-收到客户预付款(传统) /** @@ -36,7 +35,6 @@ public class ContractBeforeOnhireToVoucher extends BaseBussiness { */ cvbo.CreateVoucher(FlowUnid, "PZ2019072000000074","feetype2",userid); // 回款-收到客户保证金(汽车类传统) cvbo.CreateVoucher(FlowUnid, "PZ2019072000000075","feetype1",userid); // 回款-收到客户手续费(汽车类传统)-一次性 - cvbo.CreateVoucher(FlowUnid, "PZ2019120400000150","feetype1",userid); // 回款-收到客户手续费(汽车类传统)-按月 cvbo.CreateVoucher(FlowUnid, "PZ2019072000000076","feetype5",userid); // 回款-收到客户预付款(汽车类传统) /** diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java index 8015a9c47..cad145c13 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -3,7 +3,6 @@ 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; /** @@ -51,8 +50,6 @@ public class IncomeVoucher extends BaseBussiness { 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/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucherForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucherForTradition.java index 06bbeeac3..b48a1e25d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucherForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucherForTradition.java @@ -2,7 +2,6 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; import com.amarsoft.awe.util.Transaction; import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherEbankMoney; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherIncomeForTradition; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncomeTradition; /** @@ -79,11 +78,6 @@ public class IncomeVoucherForTradition extends BaseBussiness { cvrit.CreateVoucher(FlowUnid, "PZ2019072200000122", userid);// 回款-收到的租金-季付(汽车类传统)(跨月) cvrit.CreateVoucher(FlowUnid, "PZ2019072200000123", userid);// 回款-收到的逾期利息(汽车类传统) - /** - * 将多余还款分解 - */ - CreateVoucherEbankMoney cvem = new CreateVoucherEbankMoney(); - cvem.CreateVoucher(FlowUnid, "PZ2019073000000146", userid,Sqlca);// 回款-多余回款分解 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java index 5de15a790..96f82d1a3 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java @@ -2,14 +2,7 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; import com.amarsoft.awe.util.Transaction; import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherContractTerminate; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustomerRentOrFee; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherDistCautionMoneyRe; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherEbankMoney; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherInsuranceSettlement; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedRentIncome; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncome; /** * 资金红冲/租金红冲流程结束后生成相应的凭证 * @author xiezhiwen @@ -38,11 +31,6 @@ public class RedIncomeVoucher extends BaseBussiness { cvri.CreateVoucher(FlowUnid, "PZ2019070100000021",userid);//网银回款反冲-收到的违约金/罚款 cvri.CreateVoucher(FlowUnid, "PZ2019070100000025",userid);//网银回款反冲-收到名义货价 - /** - * 将多余还款分解 - */ - CreateVoucherEbankMoney cvem = new CreateVoucherEbankMoney(); - cvem.CreateVoucher(FlowUnid, "PZ2019070100000024", userid,Sqlca);// 回款-多余回款分解 return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucherForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucherForTradition.java index d2394954d..a9dcaf814 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucherForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucherForTradition.java @@ -2,11 +2,7 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; import com.amarsoft.awe.util.Transaction; import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherEbankMoney; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedDashedIncomeCarTradition; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedDashedIncomeTradition; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedRentIncome; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedRentIncomeCarTradition; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedRentIncomeTradition; /** * 传统红冲凭证 @@ -86,11 +82,6 @@ public class RedIncomeVoucherForTradition extends BaseBussiness { cvrict.CreateVoucher(FlowUnid, "PZ2019072200000129",userid);// 回款反冲-收到的租金-季付(传统)(跨月) cvrict.CreateVoucher(FlowUnid, "PZ2019072200000130",userid);// 回款反冲-收到的逾期利息(传统) - /** - * 将多余还款分解反冲 - */ - CreateVoucherEbankMoney cvem = new CreateVoucherEbankMoney(); - cvem.CreateVoucher(FlowUnid, "PZ2019073000000147", userid,Sqlca);// 回款反冲-多余回款分解 return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index a27fa4b45..9facf3f00 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -71,23 +71,14 @@ public class CreateVoucherMonthSettlement { * 汽车回租 */ // 月结-确认未实现利息收入 - if ("PZ2018071200000016".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(NOW(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(INTEREST) AS INTEREST,MIN(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 (SELECT F58 FROM voucher_v8 WHERE module_name LIKE '%月结-确认未实现利息收入%' GROUP BY F58)V8 ON V8.f58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND ((IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 OR (DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m') < DATE_FORMAT(LRP.PLAN_DATE, '%Y/%m') AND LRP.COLLECT_MSG IN ('微信支付', '银联支付'))) AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 AND V8.f58 IS NULL "; + if (("PZ2018071200000016".equals(voucherNo)) || ("PZ2019070100000028".equals(voucherNo))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS,0) - ROUND(IFNULL(LRP.CORPUS,0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(IFNULL(CRM.INTEREST_TAX,0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(INTEREST) AS INTEREST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%月结-确认未实现利息收入%') "; // 月结-确认手续费 - } else if ("PZ2018071200000017".equals(voucherNo)) { - sql = "SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE))),0) AS FEE_NOTAX,CRM.DISCOUNT AS DISCOUNT,IFNULL((CRM.DISCOUNT - ROUND(CRM.DISCOUNT / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%月结-确认手续费%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND lul.IS_MAIN = 'Y' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND V8.F58 IS NULL "; + } else if (("PZ2018071200000017".equals(voucherNo)) || ("PZ2019070100000029".equals(voucherNo))) { + sql = "SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE))),0) AS FEE_NOTAX,CRM.DISCOUNT AS DISCOUNT,IFNULL((CRM.DISCOUNT - ROUND(CRM.DISCOUNT / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%月结-确认手续费%')"; // 月结-确认贴息收入 } else if ("PZ2018072100000048".equals(voucherNo)) { - sql = "SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE))),0) AS FEE_NOTAX,IFNULL(CRM.DISCOUNT, 0) AS DISCOUNT_NOTAX,IFNULL(CRM.DISCOUNT, 0) - ROUND(IFNULL(CRM.DISCOUNT, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS DISCOUNT_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%月结-确认贴息收入%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND lul.IS_MAIN = 'Y' AND IFNULL(CRM.DISCOUNT, 0) > 0 AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL "; - } - - /** - * 汽车直租 - */ - if("PZ2019070100000028".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(NOW(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(INTEREST) AS INTEREST,MIN(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 (SELECT F58 FROM voucher_v8 WHERE module_name LIKE '%月结-确认未实现利息收入%' GROUP BY F58)V8 ON V8.f58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND ((IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 OR (DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m') < DATE_FORMAT(LRP.PLAN_DATE, '%Y/%m') AND LRP.COLLECT_MSG IN ('微信支付', '银联支付'))) AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 AND V8.f58 IS NULL "; - }else if("PZ2019070100000029".equals(voucherNo)) { - sql = "SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE))),0) AS FEE_NOTAX,CRM.DISCOUNT AS DISCOUNT,IFNULL((CRM.DISCOUNT - ROUND(CRM.DISCOUNT / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%月结-确认手续费%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='01' AND lul.IS_MAIN = 'Y' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND V8.F58 IS NULL "; + sql = "SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE))),0) AS FEE_NOTAX,IFNULL(CRM.DISCOUNT, 0) AS DISCOUNT_NOTAX,IFNULL(CRM.DISCOUNT, 0) - ROUND(IFNULL(CRM.DISCOUNT, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS DISCOUNT_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND IFNULL(CRM.DISCOUNT, 0)>0 AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%月结-确认贴息收入%') "; } List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlementForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlementForTradition.java index 00f28ae39..449a0f3c4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlementForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlementForTradition.java @@ -53,53 +53,17 @@ public class CreateVoucherMonthSettlementForTradition { String F58 = null; String TAX_NUM = null; String sql = ""; - /** - * 传统-回租 - */ - // 月结--确认未实现利息收入-月付(传统) - if ("PZ2018092500000183".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-月付%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND V8.F58 IS NULL "; - // 月结--确认未实现利息收入-季付(传统) - }else if ("PZ2018092500000184".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST 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 CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-季付%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL "; - }else if("PZ2019120400000151".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'手续费',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,IFNULL(CRM.FEE_TAX,0) AS MONEY,ROUND(IFNULL(CRM.FEE_TAX,0) / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2) AS MONEYNOTAX,IFNULL(CRM.FEE_TAX,0)- ROUND(IFNULL(CRM.FEE_TAX,0) / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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,LCI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%月结-确认手续费-传统%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LCI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND IFNULL(CRM.FEE_TAX,0)>0 AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND V8.F58 IS NULL "; - } - /** - * 传统-直租 - */ - // 月结--确认未实现利息收入-月付(传统) - if ("PZ2019071800000069".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS, 0) - ROUND(IFNULL(LRP.CORPUS, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) + (IFNULL(CRM.INTEREST_TAX, 0) - ROUND(IFNULL(CRM.INTEREST_TAX, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-月付%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND V8.F58 IS NULL "; - // 月结--确认未实现利息收入-季付(传统) - }else if ("PZ2019071800000070".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST 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 CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-季付%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL "; - } - - /** - * 汽车类传统-回租 - */ - // 月结--确认未实现利息收入-月付(汽车类传统) - if ("PZ2019072200000106".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(IFNULL(CRM.INTEREST_TAX,0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-月付%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND V8.F58 IS NULL "; - // 月结--确认未实现利息收入-季付(汽车类传统) - }else if ("PZ2019072200000107".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST 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 CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-季付%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL "; - // 月结-确认手续费收入(汽车类传统) - }else if("PZ2019120400000152".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'手续费',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,IFNULL(CRM.FEE_TAX,0) AS MONEY,ROUND(IFNULL(CRM.FEE_TAX,0) / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2) AS MONEYNOTAX,IFNULL(CRM.FEE_TAX,0)- ROUND(IFNULL(CRM.FEE_TAX,0) / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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,LCI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%月结-确认手续费-汽车类传统%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LCI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND IFNULL(CRM.FEE_TAX,0)>0 AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE = '0020' AND V8.F58 IS NULL "; - } - /** - * 汽车类传统-直租 - */ - // 月结--确认未实现利息收入-月付(汽车类传统) - if ("PZ2019072300000144".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(IFNULL(CRM.INTEREST_TAX,0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-月付%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND V8.F58 IS NULL "; - // 月结--确认未实现利息收入-季付(汽车类传统) - }else if ("PZ2019072200000107".equals(voucherNo) || "PZ2019072300000145".equals(voucherNo)) { - sql="SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST 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 CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-季付%' GROUP BY F58)V8 ON V8.F58=CRM.ID WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND V8.F58 IS NULL "; - } - + if (("PZ2018092500000183".equals(voucherNo)) || ("PZ2019071800000069".equals(voucherNo))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(IFNULL(CRM.INTEREST_TAX,0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-月付%') "; + } else if (("PZ2018092500000184".equals(voucherNo)) || ("PZ2019071800000070".equals(voucherNo))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST 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 CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) WHERE LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-季付%');"; + } + if (("PZ2019072200000106".equals(voucherNo)) || ("PZ2019072300000144".equals(voucherNo))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CAST(CRM.RENT_LIST AS SIGNED) - CAST(IFNULL(LRI2.PLAN_LIST, 0) AS SIGNED)) <= 2 THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,(IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRP.CORPUS,0)-ROUND(IFNULL(LRP.CORPUS,0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(IFNULL(CRM.INTEREST_TAX,0)-ROUND(IFNULL(CRM.INTEREST_TAX,0)/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.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 CUSTOMER_LIST CL ON (CL.CUST_NAME = DI.DISTRIBUTOR_CODING OR CL.CUST_NAME = CIF.CUSTOMER_NUM) WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCCT.INCOME_NUMBER_YEAR = 'income_1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-月付%') "; + } else if (("PZ2019072200000107".equals(voucherNo)) || ("PZ2019072300000145".equals(voucherNo))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,CRM.ID,CASE WHEN (CL.CUST_NAME IS NOT NULL OR CL.CUST_NAME != '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST = 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 1) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST - LRI2.PLAN_LIST = 1) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(LRI2.HIRE_DATE, '%Y-%m-%d'))= 2) AND (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 2) THEN ROUND(CRM.INTEREST_TAX * 2, 2) WHEN CRM.RENT_LIST != 1 AND (CL.CUST_NAME IS NULL OR CL.CUST_NAME = '') AND (CRM.RENT_LIST-LRI2.PLAN_LIST<=1) AND ((TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 3) OR (TIMESTAMPDIFF(MONTH,DATE_FORMAT(LRP2.PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d'))= 0)) THEN CRM.INTEREST_TAX ELSE 0 END AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.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 FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = lci.id LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID,PLAN_LIST) LRP2 ON LRP2.CONTRACT_ID = LRI2.CONTRACT_ID AND LRP2.PLAN_LIST = LRI2.PLAN_LIST 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 CUSTOMER_LIST CL ON (CL.CUST_ID = DI.DISTRIBUTOR_CODING OR CL.CUST_ID = CIF.CUSTOMER_NUM) WHERE LPI.BUSINESSTYPE = '3' AND lul.IS_MAIN = 'Y' AND LCCT.INCOME_NUMBER_YEAR = 'income_3' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%确认未实现利息收入-季付%');"; + } + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java index f0ce5b91f..205d96be7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java @@ -39,8 +39,6 @@ public class CreateVoucherRentIncome { String DISTRIBUTOR_NAME=null; String CUSTID=null; String CUSTNAME=null; - String CUSTID2=null;// 该网银已经收过款， 预收科目的客户用这个 - String CUSTNAME2=null; String CUSTOMERTYPE=null; String BUSINESSTYPE=null; String TAX_NUM=null; @@ -53,22 +51,18 @@ public class CreateVoucherRentIncome { map.clear(); map.put("FLOWUNID", flowunid); - // 回款-收到的租金(网银)--当月 - if("PZ2018072100000024".equals(VOUCHERNO) || "PZ2019070100000016".equals(VOUCHERNO)){ - //sql= "SELECT LCI.SUBJECTID,LCI.SUBJECTNAME,ROUND((getTax(lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENTMONEY,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) + (IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(CASE WHEN(LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER=IFNULL(LRIT.EBANK_NUMBER,0) GROUP BY EBANK_NUMBER)IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.RENT, 0) > 0 AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND LRIT.FLOWUNID = :FLOWUNID "; - sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENTMONEY,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) + (IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER = IFNULL(LRIT.EBANK_NUMBER, 0) GROUP BY EBANK_NUMBER) IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO,CASE WHEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE CIF.CUSTOMER_NUM END AS CUSTOMERID2,CASE WHEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE CIF.CUSTOMERNAME END AS CUSTOMERNAME2 FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LC_EBANK LE ON LE.ID=LRIT.EBANK_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.RENT, 0) > 0 AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND NOT EXISTS(SELECT F58 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME LIKE '%代偿-收到代偿的租金%') AND LRIT.FLOWUNID = :FLOWUNID "; - }else if("PZ2018080400000081".equals(VOUCHERNO) || "PZ2019070100000017".equals(VOUCHERNO)){ - //sql= "SELECT LCI.SUBJECTID,LCI.SUBJECTNAME,ROUND((getTax(lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENTMONEY,IFNULL(LRIT.CORPUS, 0) AS CORPUS,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER=IFNULL(LRIT.EBANK_NUMBER,0) GROUP BY EBANK_NUMBER)IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.RENT, 0) > 0 AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND LRIT.FLOWUNID = :FLOWUNID "; - sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENTMONEY,IFNULL(LRIT.CORPUS, 0) AS CORPUS,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER=IFNULL(LRIT.EBANK_NUMBER,0) GROUP BY EBANK_NUMBER)IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO,CASE WHEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE CIF.CUSTOMER_NUM END AS CUSTOMERID2,CASE WHEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE CIF.CUSTOMERNAME END AS CUSTOMERNAME2 FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LC_EBANK LE ON LE.ID=LRIT.EBANK_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.RENT, 0) > 0 AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND NOT EXISTS(SELECT F58 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME LIKE '%代偿-收到代偿的租金%') AND LRIT.FLOWUNID = :FLOWUNID "; - // 回款-收到的逾期利息(网银) - }else if("PZ2018072100000025".equals(VOUCHERNO) || "PZ2019070100000014".equals(VOUCHERNO)) { - //sql= "SELECT LCI.SUBJECTID,LCI.SUBJECTNAME,ROUND((getTax(lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.PENALTY, 0) AS MONEY,ROUND(IFNULL(LRIT.PENALTY, 0) / getTax(LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.PENALTY, 0) - ROUND(IFNULL(LRIT.PENALTY, 0) / getTax(LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER=IFNULL(LRIT.EBANK_NUMBER,0) GROUP BY EBANK_NUMBER)IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.PENALTY, 0) > 0 AND LRIT.FLOWUNID = :FLOWUNID "; - sql= "SELECT ROUND((getTax(lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.PENALTY, 0) AS MONEY,ROUND(IFNULL(LRIT.PENALTY, 0) / getTax(LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.PENALTY, 0) - ROUND(IFNULL(LRIT.PENALTY, 0) / getTax(LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER=IFNULL(LRIT.EBANK_NUMBER,0) GROUP BY EBANK_NUMBER)IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO,CASE WHEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE CIF.CUSTOMER_NUM END AS CUSTOMERID2,CASE WHEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE CIF.CUSTOMERNAME END AS CUSTOMERNAME2 FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LC_EBANK LE ON LE.ID=LRIT.EBANK_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.PENALTY, 0) > 0 AND NOT EXISTS(SELECT F58 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME LIKE '%代偿-代偿逾期利息%') AND LRIT.FLOWUNID = :FLOWUNID "; - } + if (("PZ2018072100000024".equals(VOUCHERNO)) || ("PZ2019070100000016".equals(VOUCHERNO))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENTMONEY,IFNULL(LRIT.CORPUS, 0) AS CORPUS,(IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS CORPUS_TAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) + (IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER = IFNULL(LRIT.EBANK_NUMBER, 0) GROUP BY EBANK_NUMBER) IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.RENT, 0) > 0 AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND NOT EXISTS(SELECT F58 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME LIKE '%代偿-收到代偿的租金%') AND LRIT.FLOWUNID = :FLOWUNID "; + } else if (("PZ2018080400000081".equals(VOUCHERNO)) || ("PZ2019070100000017".equals(VOUCHERNO))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT, 0) AS RENTMONEY,IFNULL(LRIT.CORPUS, 0) AS CORPUS,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER=IFNULL(LRIT.EBANK_NUMBER,0) GROUP BY EBANK_NUMBER)IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.RENT, 0) > 0 AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND NOT EXISTS(SELECT F58 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME LIKE '%代偿-收到代偿的租金%') AND LRIT.FLOWUNID = :FLOWUNID "; + } else if (("PZ2018072100000025".equals(VOUCHERNO)) || ("PZ2019070100000014".equals(VOUCHERNO))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.PENALTY, 0) AS MONEY,ROUND(IFNULL(LRIT.PENALTY, 0) / getTax(LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.PENALTY, 0) - ROUND(IFNULL(LRIT.PENALTY, 0) / getTax(LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE != '') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE != '') THEN LRIT.HIRE_DATE ELSE NOW() END,'%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,LRIT.PLAN_LIST,LRP.ID AS F58,CASE WHEN (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE EBANK_NUMBER=IFNULL(LRIT.EBANK_NUMBER,0) GROUP BY EBANK_NUMBER)IS NULL THEN 'YES' ELSE 'NO' END AS YES_OR_NO FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND LRP.PLAN_LIST = LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.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 LUL.IS_MAIN = 'Y' AND IFNULL(LRIT.PENALTY, 0) > 0 AND NOT EXISTS(SELECT F58 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME LIKE '%代偿-代偿逾期利息%') AND LRIT.FLOWUNID = :FLOWUNID "; + } + List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); - CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + CreateVoucherRedCompensatory cvrc = new CreateVoucherRedCompensatory(); String VOUCHER_TYPE="1";// 凭证分类 金蝶 for (int i=0;i '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() 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 SYSDATE() 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,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_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 LFIT.FEE_TYPE = :FEE_TYPE AND LPI.BUSINESSTYPE='2' AND lul.IS_MAIN='Y' AND LFIT.FLOWUNID = :FLOWUNID "; - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() 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 SYSDATE() 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,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,CASE WHEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE 'APZL00000000CT' END AS CUSTOMERID2,CASE WHEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE '传统B端待查客户' END AS CUSTOMERNAME2 FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LC_EBANK LE ON LE.ID=LFIT.EBANK_NUMBER 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_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 LFIT.FEE_TYPE = :FEE_TYPE AND LPI.BUSINESSTYPE = '2' AND lul.IS_MAIN = 'Y' AND LFIT.FLOWUNID = :FLOWUNID "; - // 汽车类传统 - }else if("PZ2019072000000074".equals(VOUCHERNO) || "PZ2019072000000075".equals(VOUCHERNO) || "PZ2019072000000076".equals(VOUCHERNO) || "PZ2019072200000108".equals(VOUCHERNO) || "PZ2019072200000109".equals(VOUCHERNO) || "PZ2019072200000110".equals(VOUCHERNO) || "PZ2019072200000111".equals(VOUCHERNO) || "PZ2019120400000150".equals(VOUCHERNO)) { - //sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() 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 SYSDATE() 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,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_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 LFIT.FEE_TYPE = :FEE_TYPE AND LPI.BUSINESSTYPE='3' AND lul.IS_MAIN='Y' AND LFIT.FLOWUNID = :FLOWUNID "; - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() 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 SYSDATE() 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,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,CASE WHEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMER_NUM FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE 'APZL00000000CT' END AS CUSTOMERID2,CASE WHEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) IS NOT NULL THEN (SELECT CUSTOMERNAME FROM CUSTOMER_INFO WHERE CUSTOMERID = LE.CUSTOMER_ID) ELSE '传统B端待查客户' END AS CUSTOMERNAME2 FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LC_EBANK LE ON LE.ID=LFIT.EBANK_NUMBER 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_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 LFIT.FEE_TYPE = :FEE_TYPE AND LPI.BUSINESSTYPE='3' AND lul.IS_MAIN='Y' AND LFIT.FLOWUNID = :FLOWUNID "; - } - - // 手续费判断一次性还是按月 - if("PZ2019071800000033".equals(VOUCHERNO) || "PZ2019072200000109".equals(VOUCHERNO) || "PZ2018092500000157".equals(VOUCHERNO) || "PZ2019072000000075".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("PZ2019071800000034".equals(VOUCHERNO) || "PZ2019072200000110".equals(VOUCHERNO) || "PZ2019120400000149".equals(VOUCHERNO) || "PZ2019120400000150".equals(VOUCHERNO)){ - sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' "; - } + if (("PZ2018092500000156".equals(VOUCHERNO)) || ("PZ2018092500000157".equals(VOUCHERNO)) || ("PZ2018092500000158".equals(VOUCHERNO)) || ("PZ2019071800000032".equals(VOUCHERNO)) || ("PZ2019071800000033".equals(VOUCHERNO)) || ("PZ2019071800000034".equals(VOUCHERNO)) || ("PZ2019071800000035".equals(VOUCHERNO))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'" + tax_type + "',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'" + tax_type + "',LCCT.START_DATE),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'" + tax_type + "',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() 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 SYSDATE() 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,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_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 LFIT.FEE_TYPE = :FEE_TYPE AND LPI.BUSINESSTYPE='2' AND lul.IS_MAIN='Y' AND LFIT.FLOWUNID = :FLOWUNID "; + } else if (("PZ2019072000000074".equals(VOUCHERNO)) || ("PZ2019072000000075".equals(VOUCHERNO)) || ("PZ2019072000000076".equals(VOUCHERNO)) || ("PZ2019072200000108".equals(VOUCHERNO)) || ("PZ2019072200000109".equals(VOUCHERNO)) || ("PZ2019072200000110".equals(VOUCHERNO)) || ("PZ2019072200000111".equals(VOUCHERNO))) { + sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'" + tax_type + "',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'" + tax_type + "',LCCT.START_DATE),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'" + tax_type + "',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LFIT.ACCOUNTING_DATE IS NOT NULL OR LFIT.ACCOUNTING_DATE <> '') THEN LFIT.ACCOUNTING_DATE ELSE SYSDATE() 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 SYSDATE() 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,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_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 LFIT.FEE_TYPE = :FEE_TYPE AND LPI.BUSINESSTYPE='3' AND lul.IS_MAIN='Y' AND LFIT.FLOWUNID = :FLOWUNID "; + } + if (("PZ2019071800000033".equals(VOUCHERNO)) || ("PZ2019072200000109".equals(VOUCHERNO))) { + sql = sql + " AND (lcct.HANDLING_CHARGE_MONEY_TYPE='0010' OR lcct.HANDLING_CHARGE_MONEY_TYPE IS NULL OR lcct.HANDLING_CHARGE_MONEY_TYPE='')"; + } else if (("PZ2019071800000034".equals(VOUCHERNO)) || ("PZ2019072200000110".equals(VOUCHERNO))) { + sql = sql + " AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' "; + } + // 查询sql, 将结果集封装到list集合中 List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); @@ -101,8 +94,6 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness { DISTRIBUTOR_NAME = dataList.get(i).get("DISTRIBUTOR_NAME"); CUSTOMERID = dataList.get(i).get("CUSTOMERID"); CUSTOMERNAME = dataList.get(i).get("CUSTOMERNAME"); - CUSTOMERID2 = dataList.get(i).get("CUSTOMERID2"); - CUSTOMERNAME2 = dataList.get(i).get("CUSTOMERNAME2"); CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE"); BUSINESSTYPE = dataList.get(i).get("BUSINESSTYPE"); TAX_NUM = dataList.get(i).get("TAX_NUM"); @@ -125,8 +116,6 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness { param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME); param.put("CUSTID", CUSTOMERID); param.put("CUSTNAME", CUSTOMERNAME); - param.put("CUSTID2", CUSTOMERID2); - param.put("CUSTNAME2", CUSTOMERNAME2); param.put("CUSTOMERTYPE", CUSTOMERTYPE); param.put("BUSINESSTYPE", BUSINESSTYPE); if(TAX_CODES!=null) { @@ -136,7 +125,7 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness { param.put("VOUCHERNO", VOUCHERNO); // 收到客户手续费 - if("PZ2019071800000033".equals(VOUCHERNO) || "PZ2019071800000034".equals(VOUCHERNO) || "PZ2018092500000157".equals(VOUCHERNO) || "PZ2019120400000149".equals(VOUCHERNO) || "PZ2019072000000075".equals(VOUCHERNO) || "PZ2019120400000150".equals(VOUCHERNO) || "PZ2019072200000109".equals(VOUCHERNO) || "PZ2019072200000110".equals(VOUCHERNO)){ + if (("PZ2019071800000033".equals(VOUCHERNO)) || ("PZ2019071800000034".equals(VOUCHERNO)) || ("PZ2019072000000075".equals(VOUCHERNO)) || ("PZ2019072200000109".equals(VOUCHERNO)) || ("PZ2019072200000110".equals(VOUCHERNO))) { param.put("CASHFLOW", "");// 现金流项目 param.put("BUSINESSTYPE", "0604");// 主营类型 } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentCompensatory.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentCompensatory.java index dbaea549f..d63c02b5e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentCompensatory.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentCompensatory.java @@ -1,6 +1,5 @@ package com.tenwa.voucher.CreateVoucherProcess; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -48,12 +47,11 @@ public class InsertVoucherRentCompensatory { * 查询数据, 判断是否需要执行插入中间表 */ // 查询是否有当月的, 未生成凭证的数据(经销商代偿) - String sqls11="SELECT lrp.RENT FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_rent_plan GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT income_id FROM lv_rent_plan2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID WHERE lrp.collect_status = '代偿' AND lrp.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y' "; + String sqls11 = "SELECT lrp.RENT FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status='代偿' AND lrp.rent > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_rent_plan) AND lrp.id NOT IN (SELECT income_id FROM lv_rent_plan2) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y' "; // 查询跨月的, 未生成凭证的数据(经销商代偿) - String sqls22="SELECT lrp.RENT FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_rent_plan GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT income_id FROM lv_rent_plan2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID WHERE lrp.collect_status ='代偿' AND lrp.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y' "; + String sqls22 = "SELECT lrp.RENT FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status ='代偿' AND lrp.rent > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_rent_plan) AND lrp.id NOT IN (SELECT income_id FROM lv_rent_plan2) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y' "; // 查询当前数据是否有逾期利息(经销商代偿) - String sqls33="SELECT lrp.penalty FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_penalty_plan GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID WHERE lrp.collect_status='代偿' AND lrp.penalty > 0 AND LV1.INCOME_ID IS NULL AND lul.is_main = 'Y' "; - + String sqls33 = "SELECT lrp.penalty FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status='代偿' AND lrp.penalty > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_penalty_plan) AND lul.is_main = 'Y' "; List> dataList11=DataOperatorUtil.getDataBySql(Sqlca, sqls11, null); List> dataList22=DataOperatorUtil.getDataBySql(Sqlca, sqls22, null); List> dataList33=DataOperatorUtil.getDataBySql(Sqlca, sqls33, null); @@ -62,12 +60,11 @@ public class InsertVoucherRentCompensatory { * 将数据插入中间表的SQL */ // 未逾期及逾期未过月(经销商代偿) - String sql11="INSERT INTO lv_rent_plan (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,DATE_FORMAT(NOW(),'%Y/%m/%d') AS hire_date,lrp.plan_list,lrp.RENT,lrp.CORPUS,lrp.INTEREST,0.00,'' OWN_BANK,'' OWN_ACCOUNT,'' OWN_NUMBER,'' EBANK_NUMBER,'' CARDDEDUCT_ID,DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_rent_plan GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT income_id FROM lv_rent_plan2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID WHERE lrp.collect_status='代偿' AND lrp.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y') "; + String sql11 = "INSERT INTO lv_rent_plan (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,DATE_FORMAT(NOW(),'%Y/%m/%d') AS hire_date,lrp.plan_list,lrp.RENT,lrp.CORPUS,lrp.INTEREST,0.00,'' OWN_BANK,'' OWN_ACCOUNT,'' OWN_NUMBER,'' EBANK_NUMBER,'' CARDDEDUCT_ID,DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status='代偿' AND lrp.rent > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_rent_plan) AND lrp.id NOT IN (SELECT income_id FROM lv_rent_plan2) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y') "; // 逾期过月(经销商代偿) - String sql22="INSERT INTO lv_rent_plan2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,DATE_FORMAT(NOW(),'%Y/%m/%d') AS HIRE_DATE,lrp.plan_list,lrp.RENT,lrp.CORPUS,lrp.INTEREST,0.00,'' OWN_BANK,'' OWN_ACCOUNT,'' OWN_NUMBER,'' EBANK_NUMBER,'' CARDDEDUCT_ID,DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_rent_plan GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID =LRP.ID LEFT JOIN (SELECT income_id FROM lv_rent_plan2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID WHERE lrp.collect_status ='代偿' AND lrp.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y') "; + String sql22 = "INSERT INTO lv_rent_plan2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,DATE_FORMAT(NOW(),'%Y/%m/%d') AS HIRE_DATE,lrp.plan_list,lrp.RENT,lrp.CORPUS,lrp.INTEREST,0.00,'' OWN_BANK,'' OWN_ACCOUNT,'' OWN_NUMBER,'' EBANK_NUMBER,'' CARDDEDUCT_ID,DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status ='代偿' AND lrp.rent > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_rent_plan) AND lrp.id NOT IN (SELECT income_id FROM lv_rent_plan2) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y') "; // 逾期利息(经销商代偿) - String sql33="INSERT INTO lv_penalty_plan (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,DATE_FORMAT(NOW(),'%Y/%m/%d') AS HIRE_DATE,lrp.plan_list,0.00,0.00,0.00,lrp.PENALTY,'' OWN_BANK,'' OWN_ACCOUNT,'' OWN_NUMBER,'' EBANK_NUMBER,'' CARDDEDUCT_ID,DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT INCOME_ID FROM lv_penalty_plan GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID WHERE lrp.collect_status ='代偿' AND lrp.penalty > 0 AND LV1.INCOME_ID IS NULL )"; - + String sql33 = "INSERT INTO lv_penalty_plan (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,DATE_FORMAT(NOW(),'%Y/%m/%d') AS HIRE_DATE,lrp.plan_list,0.00,0.00,0.00,lrp.PENALTY,'' OWN_BANK,'' OWN_ACCOUNT,'' OWN_NUMBER,'' EBANK_NUMBER,'' CARDDEDUCT_ID,DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status ='代偿' AND lrp.penalty > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_penalty_plan) AND lul.is_main = 'Y')"; /** * 根据查询语句判断, 有值才执行插入SQL */ @@ -114,21 +111,21 @@ public class InsertVoucherRentCompensatory { * 汽车回租 */ // 当月的租金(经销商代偿)-(汽车回租) - String sqlqh11="SELECT lvri.RENT FROM lv_rent_plan lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status ='代偿' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; + String sqlqh11 = "SELECT lvri.RENT FROM lv_rent_plan lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status ='代偿' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 本月以前的租金(经销商代偿)-(汽车回租) - String sqlqh22="SELECT lvri.RENT FROM lv_rent_plan2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status ='代偿' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqh22 = "SELECT lvri.RENT FROM lv_rent_plan2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status ='代偿' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 逾期利息(经销商代偿)-(汽车回租) - String sqlqh33="SELECT lvri.PENALTY FROM lv_penalty_plan lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%代偿逾期利息%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status ='代偿' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL "; + String sqlqh33 = "SELECT lvri.PENALTY FROM lv_penalty_plan lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status ='代偿' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%代偿逾期利息%' AND f58 IS NOT NULL) "; /** * 汽车直租 */ // 当月的租金(经销商代偿)-(汽车直租) - String sqlqz11="SELECT lvri.RENT FROM lv_rent_plan lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status ='代偿' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; + String sqlqz11 = "SELECT lvri.RENT FROM lv_rent_plan lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status ='代偿' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 本月以前的租金(经销商代偿)-(汽车直租) - String sqlqz22="SELECT lvri.RENT FROM lv_rent_plan2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status ='代偿' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqz22 = "SELECT lvri.RENT FROM lv_rent_plan2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status ='代偿' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 逾期利息(经销商代偿)-(汽车直租) - String sqlqz33="SELECT lvri.PENALTY FROM lv_penalty_plan lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%代偿逾期利息%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status ='代偿' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND V8.F58 IS NULL "; + String sqlqz33 = "SELECT lvri.PENALTY FROM lv_penalty_plan lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status ='代偿' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%代偿逾期利息%' AND f58 IS NOT NULL) "; /** * 汽车回租 @@ -147,20 +144,20 @@ public class InsertVoucherRentCompensatory { * 汽车类-回租 */ // 收到的租金--经销商代偿-当月的-(汽车回租) - String sql_whereqh11 ="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN ( lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到代偿的租金-',LVRI.PLAN_LIST) ELSE '收到代偿的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '6' THEN '' WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_NAME ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '6' THEN '' WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_CODING ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_rent_plan 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000001')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='代偿' ORDER BY lvri.voucher_f3 "; + String sql_whereqh11 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN ( lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到代偿的租金-',LVRI.PLAN_LIST) ELSE '收到代偿的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '6' THEN '' WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_NAME ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '6' THEN '' WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_CODING ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_rent_plan 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000001')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' 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.collect_status ='代偿' ORDER BY lvri.voucher_f3 "; // 收到的租金--经销商代偿-跨月的-(汽车回租) - String sql_whereqh22 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到代偿的租金-',LVRI.PLAN_LIST) ELSE '收到代偿的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_NAME ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_CODING ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_rent_plan2 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000002')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='代偿' ORDER BY lvri.voucher_f3 "; + String sql_whereqh22 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到代偿的租金-',LVRI.PLAN_LIST) ELSE '收到代偿的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_NAME ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_CODING ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_rent_plan2 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000002')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' 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.collect_status ='代偿' ORDER BY lvri.voucher_f3 "; //收到的逾期利息--经销商代偿-(汽车回租) - String sql_whereqh33 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('代偿逾期利息-',LVRI.PLAN_LIST) ELSE '代偿逾期利息' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN lvri.penalty ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN LCI.CONTRACT_NUMBER ELSE '' END AS f60,DI.DISTRIBUTOR_NAME AS f61,lv.LOAN_SUBJECT AS f62,DI.DISTRIBUTOR_CODING AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_penalty_plan 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000003')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%代偿逾期利息%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status = '代偿' ORDER BY lvri.voucher_f3 "; + String sql_whereqh33 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('代偿逾期利息-',LVRI.PLAN_LIST) ELSE '代偿逾期利息' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN lvri.penalty ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN LCI.CONTRACT_NUMBER ELSE '' END AS f60,DI.DISTRIBUTOR_NAME AS f61,lv.LOAN_SUBJECT AS f62,DI.DISTRIBUTOR_CODING AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_penalty_plan 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000003')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' 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.collect_status = '代偿' ORDER BY lvri.voucher_f3 "; /** * 汽车类-直租 */ // 收到的租金--经销商代偿-当月的-(汽车直租) - String sql_whereqz11 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN ( lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到代偿的租金-',LVRI.PLAN_LIST) ELSE '收到代偿的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '6' THEN '' WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_NAME ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '6' THEN '' WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_CODING ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_rent_plan 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000001')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='代偿' ORDER BY lvri.voucher_f3 "; + String sql_whereqz11 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到代偿的租金-',LVRI.PLAN_LIST) ELSE '收到代偿的租金' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST WHEN LV.sort_number = '3' THEN (LVRI.CORPUS-ROUND(LVRI.CORPUS/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) ELSE 0.00 END f7,CASE WHEN lv.sort_number = '4' THEN lvri.corpus WHEN lv.sort_number = '5' THEN lvri.interest WHEN lv.sort_number = '6' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '7' THEN ((LVRI.CORPUS - ROUND(LVRI.CORPUS /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(lvri.interest - ROUND(lvri.interest /getTax(LCI.LEAS_FORM,'利息',LCCT.START_DATE),2))) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '7' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '7' THEN '' WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_NAME ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '7' THEN '' WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_CODING ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '6' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '7' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_rent_plan 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019070100000012')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' 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.collect_status = '代偿' ORDER BY lvri.voucher_f3 "; // 收到的租金--经销商代偿-跨月的-(汽车直租) - String sql_whereqz22 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到代偿的租金-',LVRI.PLAN_LIST) ELSE '收到代偿的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_NAME ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_CODING ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_rent_plan2 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000002')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到代偿的租金%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='代偿' ORDER BY lvri.voucher_f3 "; + String sql_whereqz22 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到代偿的租金-',LVRI.PLAN_LIST) ELSE '收到代偿的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_NAME ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN DI.DISTRIBUTOR_CODING ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_rent_plan2 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019070100000013')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' 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.collect_status = '代偿' ORDER BY lvri.voucher_f3 "; //收到的逾期利息--经销商代偿-(汽车直租) - String sql_whereqz33 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('代偿逾期利息-',LVRI.PLAN_LIST) ELSE '代偿逾期利息' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN lvri.penalty ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN LCI.CONTRACT_NUMBER ELSE '' END AS f60,DI.DISTRIBUTOR_NAME AS f61,lv.LOAN_SUBJECT AS f62,DI.DISTRIBUTOR_CODING AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_penalty_plan 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019053000000003')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%代偿逾期利息%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status = '代偿' ORDER BY lvri.voucher_f3 "; + String sql_whereqz33 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67 ) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('代偿逾期利息-',LVRI.PLAN_LIST) ELSE '代偿逾期利息' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN lvri.penalty ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN LCI.CONTRACT_NUMBER ELSE '' END AS f60,DI.DISTRIBUTOR_NAME AS f61,lv.LOAN_SUBJECT AS f62,DI.DISTRIBUTOR_CODING AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 FROM lv_penalty_plan 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 DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 ('PZ2019070100000011')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' 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.collect_status = '代偿' ORDER BY lvri.voucher_f3 "; /** * 根据查询语句判断, 有值才执行插入SQL diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java index 600c1789f..11bb24ca3 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java @@ -40,16 +40,16 @@ public class InsertVoucherRentIncome { * 查询数据, 判断是否需要执行插入中间表 */ // 查询是否有当月的, 未生成凭证的数据(卡扣) - String sqls1="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_rent_income GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT income_id FROM lv_rent_income2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('微信支付', '银联支付')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y' "; + String sqls1 = "SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status IN ('手工收款', '批量收款') AND lri.rent > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_rent_income) AND lrp.id NOT IN (SELECT income_id FROM lv_rent_income2) AND LRP.ID NOT IN(SELECT INCOME_ID FROM LV_RENT_PLAN) AND LRP.ID NOT IN(SELECT INCOME_ID FROM LV_RENT_PLAN2) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y' "; // 查询跨月的, 未生成凭证的数据(卡扣) - String sqls2="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_rent_income GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT income_id FROM lv_rent_income2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID= LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('微信支付', '银联支付')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y' "; + String sqls2 = "SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status IN ('手工收款', '批量收款') AND lri.rent > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_rent_income) AND lrp.id NOT IN (SELECT income_id FROM lv_rent_income2) AND LRP.ID NOT IN(SELECT INCOME_ID FROM LV_RENT_PLAN) AND LRP.ID NOT IN(SELECT INCOME_ID FROM LV_RENT_PLAN2) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y' "; // 查询当前数据是否有逾期利息(卡扣) - String sqls3="SELECT lri.PENALTY FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_penalty_income GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('微信支付', '银联支付')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' "; + String sqls3 = "SELECT lri.PENALTY FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status IN ('手工收款', '批量收款') AND lri.penalty > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_penalty_income) AND LRP.ID NOT IN (SELECT INCOME_ID FROM LV_PENALTY_PLAN) AND LRP.ID NOT IN (SELECT INCOME_ID FROM LV_RENT_PLAN) AND LRP.ID NOT IN (SELECT INCOME_ID FROM LV_RENT_PLAN2) AND lul.is_main = 'Y' "; // 代偿反冲租金 - String sqls4="SELECT lri.RENT,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('微信支付', '银联支付')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; + String sqls4 = "SELECT lri.RENT,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status IN ('手工收款', '批量收款') AND lri.rent > 0 AND ( LRP.ID IN (SELECT INCOME_ID FROM LV_RENT_PLAN) OR LRP.ID IN (SELECT INCOME_ID FROM LV_RENT_PLAN2)) AND NOT EXISTS(SELECT F58 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%') AND lul.is_main = 'Y' "; // 代偿反冲逾期利息 - String slqs5="SELECT lri.PENALTY,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('微信支付', '银联支付')) AND lri.PENALTY > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; + String slqs5 = "SELECT lri.PENALTY,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status IN ('手工收款', '批量收款') AND lri.PENALTY > 0 AND ( LRP.ID IN (SELECT INCOME_ID FROM LV_RENT_PLAN) OR LRP.ID IN (SELECT INCOME_ID FROM LV_RENT_PLAN2)) AND NOT EXISTS(SELECT F58 FROM VOUCHER_V8 WHERE F58=LRP.ID AND F59=1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%') AND lul.is_main = 'Y' "; List> dataList1=DataOperatorUtil.getDataBySql(Sqlca, sqls1, null); List> dataList2=DataOperatorUtil.getDataBySql(Sqlca, sqls2, null); @@ -61,11 +61,11 @@ public class InsertVoucherRentIncome { * 将数据插入中间表的SQL */ // 未逾期及逾期未过月(卡扣) - String sql1="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('微信支付', '银联支付') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_rent_income GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID = LRP.ID LEFT JOIN (SELECT income_id FROM lv_rent_income2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('微信支付', '银联支付')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y')"; + String sql1 = "INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status IN ('手工收款', '批量收款') AND lri.rent > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_rent_income) AND lrp.id NOT IN (SELECT income_id FROM lv_rent_income2) AND LRP.ID NOT IN(SELECT INCOME_ID FROM LV_RENT_PLAN) AND LRP.ID NOT IN(SELECT INCOME_ID FROM LV_RENT_PLAN2) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y') "; // 逾期过月(卡扣) - String sql2="INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('微信支付', '银联支付') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_rent_income GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT income_id FROM lv_rent_income2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('微信支付', '银联支付')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y') "; + String sql2 = "INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status IN ('手工收款', '批量收款') AND lri.rent > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_rent_income) AND lrp.id NOT IN (SELECT income_id FROM lv_rent_income2) AND LRP.ID NOT IN(SELECT INCOME_ID FROM LV_RENT_PLAN) AND LRP.ID NOT IN(SELECT INCOME_ID FROM LV_RENT_PLAN2) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND lul.is_main = 'Y')"; // 逾期利息(卡扣) - String sql3="INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('微信支付', '银联支付') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 LEFT JOIN (SELECT income_id FROM lv_penalty_income GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('微信支付', '银联支付')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y') "; + String sql3 = "INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,lrp.COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.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 lrp.collect_status IN ('手工收款','批量收款','代偿') AND lri.penalty > 0 AND lrp.id NOT IN (SELECT income_id FROM lv_penalty_income) AND LRP.ID NOT IN (SELECT INCOME_ID FROM LV_PENALTY_PLAN) AND LRP.ID NOT IN (SELECT INCOME_ID FROM LV_RENT_PLAN) AND LRP.ID NOT IN (SELECT INCOME_ID FROM LV_RENT_PLAN2) AND lul.is_main = 'Y')"; /** * 根据查询语句判断, 有值才执行插入SQL */ @@ -112,7 +112,7 @@ public class InsertVoucherRentIncome { } if(Sqlca!=null){ - Sqlca.commit(); + Sqlca.disConnect(); } } @@ -124,6 +124,7 @@ public class InsertVoucherRentIncome { public void CreateVoucher() throws Exception{ Transaction Sqlca =null; Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + Map map = new HashMap(); int a=0; int b=0; int c=0; @@ -139,37 +140,19 @@ public class InsertVoucherRentIncome { // 当月的租金(卡扣)-(汽车回租) String sqlqh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 本月以前的租金(卡扣)-(汽车回租) - String sqlqh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqh2 = "SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 逾期利息(卡扣)-(汽车回租) - String sqlqh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL "; + String sqlqh3 = "SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL) "; /** * 汽车直租-卡扣 */ // 当月的租金(卡扣)-(汽车直租) - String sqlqz1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqz1 = "SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 本月以前的租金(卡扣)-(汽车直租) - String sqlqz2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqz2 = "SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 逾期利息(卡扣)-(汽车直租) - String sqlqz3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND V8.F58 IS NULL "; - /** - * 汽车回租-微信 - */ - // 当月的租金(微信)-(汽车回租) - String sqlWh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('微信支付') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; - // 本月以前的租金(微信)-(汽车回租) - String sqlWh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('微信支付') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; - // 逾期利息(微信)-(汽车回租) - String sqlWh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('微信支付') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL "; - /** - * 汽车回租-微信银联 - */ - // 当月的租金(微信)-(汽车直租) - String sqlWYh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('银联支付') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; - // 本月以前的租金(微信)-(汽车直租) - String sqlWYh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('银联支付') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; - // 逾期利息(微信)-(汽车直租) - String sqlWYh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信银联)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE lvri.collect_status IN ('银联支付') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='02' AND V8.F58 IS NULL "; - + String sqlqz3 = "SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lvri.contract_id AND lrp.id=lvri.income_id WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE='1' AND LVRI.LEAS_FORM='01' AND lvri.income_id NOT IN(SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL) "; + /** * 汽车回租-卡扣 */ @@ -183,59 +166,25 @@ public class InsertVoucherRentIncome { List> dataListqz2= DataOperatorUtil.getDataBySql(Sqlca, sqlqz2, null); List> dataListqz3= DataOperatorUtil.getDataBySql(Sqlca, sqlqz3, null); - /** - * 汽车回租-微信 - */ - List> dataListWh1=DataOperatorUtil.getDataBySql(Sqlca, sqlWh1, null); - List> dataListWh2=DataOperatorUtil.getDataBySql(Sqlca, sqlWh2, null); - List> dataListWh3=DataOperatorUtil.getDataBySql(Sqlca, sqlWh3, null); - /** - * 汽车直租-微信 - */ - List> dataListWYh1= DataOperatorUtil.getDataBySql(Sqlca, sqlWYh1, null); - List> dataListWYh2= DataOperatorUtil.getDataBySql(Sqlca, sqlWYh2, null); - List> dataListWYh3= DataOperatorUtil.getDataBySql(Sqlca, sqlWYh3, null); /** * 汽车类-回租-卡扣 */ // 收到的租金--卡扣-当月的-(汽车回租) - String sql_whereqh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2018082100000142')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; + String sql_whereqh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-',LVRI.PLAN_LIST) ELSE '收到的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2018082100000142')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' 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.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; // 收到的租金--卡扣-跨月的-(汽车回租) - String sql_whereqh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; + String sql_whereqh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-',LVRI.PLAN_LIST) ELSE '收到的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 LCI.LEAS_FORM='02' 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.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车回租) - String sql_whereqh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67 ) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; + String sql_whereqh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67 ) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-',LVRI.PLAN_LIST) ELSE '收到的逾期利息' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 LCI.LEAS_FORM='02' 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.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; /** * 汽车类-直租-卡扣 */ // 收到的租金--卡扣-当月的-(汽车直租) - String sql_whereqz1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST WHEN LV.sort_number = '3' THEN (LVRI.CORPUS-ROUND(LVRI.CORPUS / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) ELSE 0.00 END f7,CASE WHEN lv.sort_number = '4' THEN lvri.corpus WHEN lv.sort_number = '5' THEN lvri.interest WHEN lv.sort_number = '6' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '7' THEN ((LVRI.CORPUS - ROUND(LVRI.CORPUS /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(lvri.interest - ROUND(lvri.interest /getTax(LCI.LEAS_FORM,'利息',LCCT.START_DATE),2))) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '7' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '6' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '7' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019070100000008')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; + String sql_whereqz1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-',LVRI.PLAN_LIST) ELSE '收到的租金' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST WHEN LV.sort_number = '3' THEN (LVRI.CORPUS-ROUND(LVRI.CORPUS / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) ELSE 0.00 END f7,CASE WHEN lv.sort_number = '4' THEN lvri.corpus WHEN lv.sort_number = '5' THEN lvri.interest WHEN lv.sort_number = '6' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '7' THEN ((LVRI.CORPUS - ROUND(LVRI.CORPUS /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(lvri.interest - ROUND(lvri.interest /getTax(LCI.LEAS_FORM,'利息',LCCT.START_DATE),2))) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '7' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '6' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '7' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019070100000008')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' 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.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; // 收到的租金--卡扣-跨月的-(汽车直租) - String sql_whereqz2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019070100000009')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; + String sql_whereqz2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-',LVRI.PLAN_LIST) ELSE '收到的租金' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019070100000009')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' 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.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车直租) - String sql_whereqz3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67 )SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019070100000007')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; - /** - * 汽车类-回租-微信 - */ - // 收到的租金--卡扣-当月的-(汽车回租) - String sql_whereWh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信-',LVRI.PLAN_LIST) ELSE '收到的租金-微信' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019120900000160')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.collect_status IN ('微信支付') ORDER BY lvri.voucher_f3 "; - // 收到的租金--卡扣-跨月的-(汽车回租) - String sql_whereWh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信-',LVRI.PLAN_LIST) ELSE '收到的租金-微信' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019120900000161')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('微信支付') ORDER BY lvri.voucher_f3 "; - //收到的逾期利息--卡扣-(汽车回租) - String sql_whereWh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67 ) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-微信-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-微信' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019120900000159')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('微信支付') ORDER BY lvri.voucher_f3 "; - /** - * 汽车类-回租-微信银联 - */ - // 收到的租金--卡扣-当月的-(汽车回租) - String sql_whereWYh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信银联-',LVRI.PLAN_LIST) ELSE '收到的租金-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST WHEN LV.sort_number = '3' THEN (LVRI.CORPUS-ROUND(LVRI.CORPUS / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) ELSE 0.00 END f7,CASE WHEN lv.sort_number = '4' THEN lvri.corpus WHEN lv.sort_number = '5' THEN lvri.interest WHEN lv.sort_number = '6' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '7' THEN ((LVRI.CORPUS - ROUND(LVRI.CORPUS /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(lvri.interest - ROUND(lvri.interest /getTax(LCI.LEAS_FORM,'利息',LCCT.START_DATE),2))) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '7' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '6' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '7' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019120500000153')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('银联支付') ORDER BY lvri.voucher_f3 "; - // 收到的租金--卡扣-跨月的-(汽车回租) - String sql_whereWYh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信银联-',LVRI.PLAN_LIST) ELSE '收到的租金-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019120500000154')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('银联支付') ORDER BY lvri.voucher_f3 "; - //收到的逾期利息--卡扣-(汽车回租) - String sql_whereWYh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67 )SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-微信银联-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS F49,LCI.SUBJECTNAME AS F50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019120500000155')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信银联)%' AND f58 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('银联支付') ORDER BY lvri.voucher_f3 "; - - /** - * 根据查询语句判断, 有值才执行插入SQL - */ + String sql_whereqz3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67 )SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-',LVRI.PLAN_LIST) ELSE '收到的逾期利息' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,lv.OWNED_COMPANY AS f49,lv.OWNED_COMPANY AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67 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 ('PZ2019070100000007')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' 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.collect_status IN ('手工收款', '批量收款') ORDER BY lvri.voucher_f3 "; /** * 汽车回租-卡扣 */ @@ -267,37 +216,7 @@ public class InsertVoucherRentIncome { SqlObject sqlsqz3 = new SqlObject(sql_whereqz3); e=Sqlca.executeSQL(sqlsqz3); } - /** - * 汽车回租-微信 - */ - if(dataListWh1 != null && !dataListWh1.isEmpty()) { - SqlObject sqlsWh1 = new SqlObject(sql_whereWh1); - a=Sqlca.executeSQL(sqlsWh1); - } - if(dataListWh2 != null && !dataListWh2.isEmpty()) { - SqlObject sqlsWh2 = new SqlObject(sql_whereWh2); - c=Sqlca.executeSQL(sqlsWh2); - } - if(dataListWh3 != null && !dataListWh3.isEmpty()) { - SqlObject sqlsWh3 = new SqlObject(sql_whereWh3); - e=Sqlca.executeSQL(sqlsWh3); - } - /** - * 汽车回租-微信银联 - */ - if(dataListWYh1 != null && !dataListWYh1.isEmpty()) { - SqlObject sqlsWYh1 = new SqlObject(sql_whereWYh1); - a=Sqlca.executeSQL(sqlsWYh1); - } - if(dataListWYh2 != null && !dataListWYh2.isEmpty()) { - SqlObject sqlsWYh2 = new SqlObject(sql_whereWYh2); - c=Sqlca.executeSQL(sqlsWYh2); - } - if(dataListWYh3 != null && !dataListWYh3.isEmpty()) { - SqlObject sqlsWYh3 = new SqlObject(sql_whereWYh3); - e=Sqlca.executeSQL(sqlsWYh3); - } Sqlca.commit(); if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index d495803b8..031e14091 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -25,6 +25,7 @@ import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.log.Log; +import com.amarsoft.awe.Configure; import com.tenwa.comm.exception.BusinessException; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.quartz.StringUtil; @@ -80,7 +81,7 @@ public class CreateVoucherServiceImpl { Map param=new HashMap(); param.put("FlowUnid", "FBO2017101600000061"); - //CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); //vs.createVoucher("","网银收款", "2017032800000009", "02", null, "admin", param, tx); } @@ -101,8 +102,7 @@ public class CreateVoucherServiceImpl { param.put("OWNED_COMPANY", owned); param.put("PROJ_TYPE", projtype); if(voucherType==null||"".equals(voucherType)){ - //voucherType=Configure.getInstance().getConfigure("VoucherType"); - voucherType="1"; + voucherType=Configure.getInstance().getConfigure("VoucherType"); } param.put("VOUCHER_TYPE",voucherType); BizObject user=JBOFactory.createBizObjectQuery(USER_INFO.CLASS_NAME, "USERID='"+userid+"'").getSingleResult(false); @@ -129,51 +129,9 @@ public class CreateVoucherServiceImpl { .setParameter("MODULAR_NUMBER",param.get("MODULAR_NUMBER")).setParameter("OWNED_COMPANY", param.get("OWNED_COMPANY")).setParameter("VOUCHER_TYPE",param.get("VOUCHER_TYPE")) .setParameter("PROJ_TYPE", param.get("PROJ_TYPE")).setParameter("ID", param.get("voucher_id")).getSingleResult(false); param.put("MODULAR_NUMBER", voucherConfig.getAttribute("MODULAR_NUMBER").getString());// 凭证名称 - String CONTRACT_NUMBER = param.get("CONTRACT_NUMBER"); - String CONTRACT_ID = param.get("CONTRACT_ID"); - String SUBJECTID = param.get("SUBJECTID"); - String SUBJECTNAME = param.get("SUBJECTNAME"); - String VOUCHERNO = param.get("VOUCHERNO"); - String OWN_NUMBER = ""; + param.put("F49", voucherConfig.getAttribute("OWNED_COMPANY").getString()); + param.put("F50", voucherConfig.getAttribute("OWNED_COMPANY").getString()); - // 如果没有获取到主体信息， 出部分特殊要求，其它默认通过合同的id获取主体信息 - if(SUBJECTID==null || "".equals(SUBJECTID) || SUBJECTNAME==null || "".equals(SUBJECTNAME)) { - if("PZ2018081600000120".equals(VOUCHERNO) || "PZ2018092500000155".equals(VOUCHERNO) || "PZ2019072000000071".equals(VOUCHERNO) || "PZ2019072000000072".equals(VOUCHERNO) || "PZ2019072000000073".equals(VOUCHERNO) || "PZ2018121800000005".equals(VOUCHERNO)) { - String OWN_ACCOUNT= param.get("OWN_ACCOUNT"); - BizObject ZT = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"SUBJECTNAME=:OWN_ACCOUNT").setParameter("OWN_ACCOUNT", OWN_ACCOUNT).getSingleResult(false); - SUBJECTID = ZT.getAttribute("SUBJECTID").getString(); - SUBJECTNAME = ZT.getAttribute("SUBJECTNAME").getString(); - if(SUBJECTNAME !=null && !"".equals(SUBJECTNAME)) { - BizObject BF = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,"OWN_NAME=:OWN_NAME").setParameter("OWN_NAME", SUBJECTNAME).getSingleResult(false); - OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); - } - }else { - if(CONTRACT_ID!=null && !"".equals(CONTRACT_ID)) { - BizObject ZT = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"ID=:ID").setParameter("ID", CONTRACT_ID).getSingleResult(false); - SUBJECTID = ZT.getAttribute("SUBJECTID").getString(); - SUBJECTNAME = ZT.getAttribute("SUBJECTNAME").getString(); - if(SUBJECTNAME !=null && !"".equals(SUBJECTNAME)) { - BizObject BF = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,"OWN_NAME=:OWN_NAME").setParameter("OWN_NAME", SUBJECTNAME).getSingleResult(false); - OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); - } - } - if(SUBJECTID==null || "".equals(SUBJECTID) || SUBJECTNAME==null || "".equals(SUBJECTNAME)) { - BizObject ZT = JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"itemno=:itemno").setParameter("itemno", "aa740e4111c111eaaa0000163e0e11e6").getSingleResult(false); - SUBJECTID = "aa740e4111c111eaaa0000163e0e11e6"; - SUBJECTNAME = ZT.getAttribute("itemname").getString(); - BizObject BF = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,"OWN_NAME=:OWN_NAME").setParameter("OWN_NAME", SUBJECTNAME).getSingleResult(false); - OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); - } - } - } - if("PZ2018072100000032".equals(VOUCHERNO)) { - BizObject BF = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,"OWN_NAME=:OWN_NAME").setParameter("OWN_NAME", SUBJECTNAME).getSingleResult(false); - OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); - } - param.put("F47", CONTRACT_NUMBER); // 合同编号 - param.put("F48", OWN_NUMBER); // 账套（出租人编号） - param.put("F49", SUBJECTID); // 所属主体id - param.put("F50", SUBJECTNAME);// 所属主体名称 //3：加载默认默认属性库 Map attr=this.getDefaultAttribute(tx,param.get("VOUCHER_TYPE")); param.putAll(attr); @@ -405,20 +363,16 @@ public class CreateVoucherServiceImpl { if("PZ2018072100000026".equals(VOUCHERNO) || "PZ2018072100000031".equals(VOUCHERNO) || "PZ2018072100000028".equals(VOUCHERNO) || "PZ2018072100000041".equals(VOUCHERNO) || "PZ2019070100000015".equals(VOUCHERNO) || "PZ2019070100000019".equals(VOUCHERNO) || "PZ2019070100000018".equals(VOUCHERNO) || "PZ2019070100000024".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 - }else if("PZ2018081700000134".equals(VOUCHERNO) || "PZ2018081700000138".equals(VOUCHERNO) || "PZ2018072100000047".equals(VOUCHERNO) || "PZ2018081700000132".equals(VOUCHERNO) || "PZ2018081700000130".equals(VOUCHERNO) || "PZ2018081700000128".equals(VOUCHERNO)){ + }else if (("PZ2018081700000134".equals(VOUCHERNO)) || ("PZ2018081700000138".equals(VOUCHERNO)) || ("PZ2018072100000047".equals(VOUCHERNO)) || ("PZ2018081700000132".equals(VOUCHERNO)) || ("PZ2018081700000130".equals(VOUCHERNO)) || ("PZ2018081700000128".equals(VOUCHERNO)) || ("PZ2019071500000030".equals(VOUCHERNO)) || ("PZ2019071500000031".equals(VOUCHERNO))) { subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 }else if("PZ2018072100000039".equals(VOUCHERNO) || "PZ2019070100000021".equals(VOUCHERNO) || "PZ2018072100000043".equals(VOUCHERNO) || "PZ2019070100000025".equals(VOUCHERNO)) { subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 // 起租前网银回款 - }else if("PZ2018092500000156".equals(VOUCHERNO) || "PZ2018092500000158".equals(VOUCHERNO) || "PZ2019071800000032".equals(VOUCHERNO) || "PZ2019071800000033".equals(VOUCHERNO) || "PZ2019071800000034".equals(VOUCHERNO) || "PZ2019071800000035".equals(VOUCHERNO) || "PZ2019072000000074".equals(VOUCHERNO) || "PZ2019072000000076".equals(VOUCHERNO) || "PZ2019072200000108".equals(VOUCHERNO) || "PZ2019072200000109".equals(VOUCHERNO) || "PZ2019072200000110".equals(VOUCHERNO) || "PZ2019072200000111".equals(VOUCHERNO)) { + }else if (("PZ2018092500000156".equals(VOUCHERNO)) || ("PZ2018092500000157".equals(VOUCHERNO)) || ("PZ2018092500000158".equals(VOUCHERNO)) || ("PZ2019071800000032".equals(VOUCHERNO)) || ("PZ2019071800000033".equals(VOUCHERNO)) || ("PZ2019071800000034".equals(VOUCHERNO)) || ("PZ2019071800000035".equals(VOUCHERNO)) || ("PZ2019072000000074".equals(VOUCHERNO)) || ("PZ2019072000000075".equals(VOUCHERNO)) || ("PZ2019072000000076".equals(VOUCHERNO)) || ("PZ2019072200000108".equals(VOUCHERNO)) || ("PZ2019072200000109".equals(VOUCHERNO)) || ("PZ2019072200000110".equals(VOUCHERNO)) || ("PZ2019072200000111".equals(VOUCHERNO))) { subData.put("CUSTID","APZL00000000CT");//虚拟客户 subData.put("CUSTNAME","传统B端待查客户");//虚拟客户 - // 起租前网银回款-传统与汽车类传统手续费 - }else if("PZ2018092500000157".equals(VOUCHERNO) || "PZ2019120400000149".equals(VOUCHERNO) || "PZ2019072000000075".equals(VOUCHERNO) || "PZ2019120400000150".equals(VOUCHERNO)) { - subData.put("CUSTID",param.get("CUSTID2"));//网银回款前，网银选了客户就用网银的，没有就用CT默认 - subData.put("CUSTNAME",param.get("CUSTNAME2")); // 传统-回款-资金 }else if("PZ2018092500000173".equals(VOUCHERNO) || "PZ2018092500000174".equals(VOUCHERNO) || "PZ2019071800000043".equals(VOUCHERNO) || "PZ2019071800000044".equals(VOUCHERNO) || "PZ2019072000000088".equals(VOUCHERNO) || "PZ2019072000000089".equals(VOUCHERNO) || "PZ2019072200000124".equals(VOUCHERNO) || "PZ2019072200000125".equals(VOUCHERNO) || "PZ2019073000000146".equals(VOUCHERNO) || "PZ2019073000000147".equals(VOUCHERNO)) { subData.put("CUSTID","APZL00000000CT");//虚拟客户 @@ -439,16 +393,11 @@ public class CreateVoucherServiceImpl { subData.put("CUSTID","APZL00000000CT");//虚拟客户 subData.put("CUSTNAME","传统B端待查客户");//虚拟客户 // 网银核销， 单笔网银第一次收租金客户为APZL00000000DC固定客户 - }else if("PZ2018080400000081".equals(VOUCHERNO) || "PZ2019070100000017".equals(VOUCHERNO) || "PZ2018072100000025".equals(VOUCHERNO) || "PZ2019070100000014".equals(VOUCHERNO) || "PZ2019071500000030".equals(VOUCHERNO) || "PZ2019071500000031".equals(VOUCHERNO)){ + }else if (("PZ2018080400000081".equals(VOUCHERNO)) || ("PZ2019070100000017".equals(VOUCHERNO)) || ("PZ2018072100000025".equals(VOUCHERNO)) || ("PZ2019070100000014".equals(VOUCHERNO))) { String YES_OR_NO = param.get("YES_OR_NO"); - String CUSTID2 = param.get("CUSTID2"); - String CUSTNAME2 = param.get("CUSTNAME2"); - if(YES_OR_NO==null || "YES".equals(YES_OR_NO)){ + if( "YES".equals(YES_OR_NO)){ subData.put("CUSTID","APZL00000000DC");//虚拟账户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟账户 - }else if("NO".equals(YES_OR_NO)){ - subData.put("CUSTID",CUSTID2);//网银客户 - subData.put("CUSTNAME",CUSTNAME2);//网银客户 } } }else{ @@ -485,7 +434,7 @@ public class CreateVoucherServiceImpl { subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称 } }*/ - + String LEAS_FORM = (String)param.get("LEAS_FORM"); // 起租-第一车贷, 购置融资租赁资产带固定编码 if("PZ2018073100000062".equals(VOUCHERNO)) { if("3".equals(SORT_NUMBER)) { @@ -531,15 +480,10 @@ public class CreateVoucherServiceImpl { */ if("PZ2018072100000024".equals(VOUCHERNO) || "PZ2019070100000016".equals(VOUCHERNO)) { String YES_OR_NO = param.get("YES_OR_NO");// 判断是否使用默认编码 - String CUSTID2 = param.get("CUSTID2"); - String CUSTNAME2 = param.get("CUSTNAME2"); if("YES".equals(YES_OR_NO) && "1".equals(SORT_NUMBER)){ subData.put("CUSTID","APZL00000000DC");//虚拟账户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟账户 - }else if("NO".equals(YES_OR_NO) && "1".equals(SORT_NUMBER)){ - subData.put("CUSTID",CUSTID2);//虚拟账户 - subData.put("CUSTNAME",CUSTNAME2);//虚拟账户 } } @@ -612,7 +556,7 @@ public class CreateVoucherServiceImpl { String sql = "select id from lv_voucher_loan where voucher_id=" + "'" + voucherConfigId + "'"; Map param = new HashMap(); List> list = DataOperatorUtil.getDataBySql(tx, sql, param); - for(Map ma:list){ + for(Map ma:list){ fromCondtion.clear(); otherProperty.clear(); fromCondtion = ma; diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforAssistContract.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforAssistContract.java index 30ddca293..90b5837ea 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforAssistContract.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforAssistContract.java @@ -223,7 +223,7 @@ public class VoucherToNCforAssistContract implements Job{ } catch (Exception e) { try { Sqlca.rollback(); - if(batch!=null && !"".equals(batch)){ + if(batch!=null || !"".equals(batch)){ logger.debug("合同xml传输失败"); String insertSql="INSERT INTO NCXML_TOTAL_RECORDS(ID,BATCH,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,ERR_DESCRIBE,CREATETIME) VALUES('"+UUID.randomUUID().toString().replace("-", "")+"','"+batch+"','"+type+"','N','"+count+"','"+count+"','"+e.toString()+"','"+year_month_days+"')"; Sqlca1.executeSQL(insertSql); @@ -429,7 +429,7 @@ public class VoucherToNCforAssistContract implements Job{ } catch (Exception e) { try { Sqlca.rollback(); - if(batch!=null && !"".equals(batch)){ + if(batch!=null || !"".equals(batch)){ logger.debug("合同xml传输失败"); String insertSql="INSERT INTO NCXML_TOTAL_RECORDS(ID,BATCH,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,ERR_DESCRIBE,CREATETIME) VALUES('"+UUID.randomUUID().toString().replace("-", "")+"','"+batch+"','"+type+"','N','"+count+"','"+count+"','"+e.toString()+"','"+year_month_days+"')"; Sqlca1.executeSQL(insertSql); @@ -602,7 +602,7 @@ public class VoucherToNCforAssistContract implements Job{ } // 判断集合为否为null, 不为空遍历集合, 获取旧数据的批次号 - if(batchList.size()>0) { + if(batchList!= null || batchList.size()>0) { // 定义当前批次, 错误记录数 for (String old_batch : batchList) { int con=0; @@ -656,7 +656,7 @@ public class VoucherToNCforAssistContract implements Job{ Sqlca.executeSQL(insertSql1); } // 判断集合为否为null, 不为空遍历集合, 获取旧数据的批次号 - if(batchList.size()>0) { + if(batchList != null ) { // 定义当前批次, 错误记录数 for (String old_batch : batchList) { updateSql=" UPDATE NCXML_DETAIL_RECORDS SET FLAG='1',ERR_DESCRIBE='传输成功 !' WHERE XML_TYPE= '"+type+"' AND BATCH='"+old_batch+"'"; diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforCustomer.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforCustomer.java index aba1a6bb6..235e8973e 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforCustomer.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforCustomer.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.UUID; import javax.xml.transform.OutputKeys; @@ -43,7 +42,6 @@ import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.log.Log; import com.amarsoft.awe.util.Transaction; -import com.base.util.QuartzUtil; import com.tenwa.comm.util.date.DateAssistant; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.httpclient.resources.VouchersPropertiesUtil; @@ -293,7 +291,7 @@ public class VoucherToNCforCustomer implements Job{ } catch (Exception e) { try { Sqlca.rollback(); - if(batch!=null && !"".equals(batch)){ + if(batch!=null || !"".equals(batch)){ logger.debug("客户xml传输失败"); String insertSql="INSERT INTO NCXML_TOTAL_RECORDS(ID,BATCH,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,ERR_DESCRIBE,CREATETIME) VALUES('"+UUID.randomUUID().toString().replace("-", "")+"','"+batch+"','"+type+"','N','"+count+"','"+count+"','"+e.toString()+"','"+year_month_days+"')"; Sqlca1.executeSQL(insertSql); @@ -562,7 +560,7 @@ public class VoucherToNCforCustomer implements Job{ } catch (Exception e) { try { Sqlca.rollback(); - if(batch!=null && !"".equals(batch)){ + if(batch!=null || !"".equals(batch)){ logger.debug("客户xml传输失败"); String insertSql="INSERT INTO NCXML_TOTAL_RECORDS(ID,BATCH,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,ERR_DESCRIBE,CREATETIME) VALUES('"+UUID.randomUUID().toString().replace("-", "")+"','"+batch+"','"+type+"','N','"+count+"','"+count+"','"+e.toString()+"','"+year_month_days+"')"; Sqlca1.executeSQL(insertSql); @@ -735,7 +733,7 @@ public class VoucherToNCforCustomer implements Job{ } // 判断集合为否为null, 不为空遍历集合, 获取旧数据的批次号 - if(batchList.size()>0) { + if(batchList!= null || batchList.size()>0) { // 定义当前批次, 错误记录数 for (String old_batch : batchList) { int con=0; @@ -789,7 +787,7 @@ public class VoucherToNCforCustomer implements Job{ Sqlca.executeSQL(insertSql1); } // 判断集合为否为null, 不为空遍历集合, 获取旧数据的批次号 - if(batchList.size()>0) { + if(batchList != null) { // 定义当前批次, 错误记录数 for (String old_batch : batchList) { updateSql=" UPDATE NCXML_DETAIL_RECORDS SET FLAG='1',ERR_DESCRIBE='传输成功 !' WHERE XML_TYPE= '"+type+"' AND BATCH='"+old_batch+"'"; diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java index 84a4ed0d5..296f14129 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java @@ -363,7 +363,7 @@ public class VoucherToNCforDistributor implements Job{ } catch (Exception e) { try { Sqlca.rollback(); - if(batch!=null && !"".equals(batch)){ + if(batch!=null || !"".equals(batch)){ logger.debug("经销商xml传输失败"); String insertSql="INSERT INTO NCXML_TOTAL_RECORDS(ID,BATCH,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,ERR_DESCRIBE,CREATETIME) VALUES('"+UUID.randomUUID().toString().replace("-", "")+"','"+batch+"','"+type+"','N','"+count+"','"+count+"','"+e.toString()+"','"+year_month_days+"')"; Sqlca1.executeSQL(insertSql); @@ -705,7 +705,7 @@ public class VoucherToNCforDistributor implements Job{ } catch (Exception e) { try { Sqlca.rollback(); - if(batch!=null && !"".equals(batch)){ + if(batch!=null || !"".equals(batch)){ logger.debug("经销商xml传输失败"); String insertSql="INSERT INTO NCXML_TOTAL_RECORDS(ID,BATCH,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,ERR_DESCRIBE,CREATETIME) VALUES('"+UUID.randomUUID().toString().replace("-", "")+"','"+batch+"','"+type+"','N','"+count+"','"+count+"','"+e.toString()+"','"+year_month_days+"')"; Sqlca1.executeSQL(insertSql); @@ -878,7 +878,7 @@ public class VoucherToNCforDistributor implements Job{ } // 判断集合为否为null, 不为空遍历集合, 获取旧数据的批次号 - if(batchList.size()>0) { + if(batchList!= null || batchList.size()>0) { // 定义当前批次, 错误记录数 for (String old_batch : batchList) { int con=0; @@ -932,7 +932,7 @@ public class VoucherToNCforDistributor implements Job{ Sqlca.executeSQL(insertSql1); } // 判断集合为否为null, 不为空遍历集合, 获取旧数据的批次号 - if(batchList.size()>0) { + if(batchList != null) { // 定义当前批次, 错误记录数 for (String old_batch : batchList) { updateSql=" UPDATE NCXML_DETAIL_RECORDS SET FLAG='1',ERR_DESCRIBE='传输成功 !' WHERE XML_TYPE= '"+type+"' AND BATCH='"+old_batch+"'"; diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforVoucherPZ.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforVoucherPZ.java index c571f5c73..332a95182 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforVoucherPZ.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforVoucherPZ.java @@ -43,12 +43,14 @@ import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.log.Log; import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.date.DateAssistant; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.httpclient.resources.VouchersPropertiesUtil; import com.tenwa.util.SerialNumberUtil; import jbo.voucher.LV_STACTS_CONFIG; import jbo.voucher.NCXML_DETAIL_RECORDS; +import schemasMicrosoftComOfficeOffice.BulletAttribute; public class VoucherToNCforVoucherPZ implements Job{ private static Log logger=ARE.getLog(); @@ -57,40 +59,11 @@ public class VoucherToNCforVoucherPZ implements Job{ * 定时任务凭证NC传输 */ public void execute(JobExecutionContext arg0) throws JobExecutionException { - // 获取回执信息判断成功与否 - String SUBJECTID=null; - String SUBJECTNAME=null; - String receiver=null; - String pk_accountingbook=null; - String pk_org=null; - /** - * 深圳主体 - */ - try { - SUBJECTID="aa740e4111c111eaaa0000163e0e11e6"; - SUBJECTNAME="安鹏国际融资租赁（深圳）有限公司"; - receiver="807001002001"; - pk_accountingbook="807001002001-0001"; - pk_org="807001002001"; - String returns = DOM4JcreateToVoucher(SUBJECTID,SUBJECTNAME,receiver,pk_accountingbook,pk_org); - System.out.println("深圳主体凭证传输状态："+returns); - } catch (Exception e) { - new Exception("《《《《《《《《《深圳主体凭证传输失败》》》》》》》》》"); - } - /** - * 天津主体 - */ - try { - SUBJECTID="d989246c11c111eaaa0000163e0e11e6"; - SUBJECTNAME="安鹏国际融资租赁（天津）有限公司"; - receiver="807001003"; - pk_accountingbook="807001003-0001"; - pk_org="807001003"; - String returns = DOM4JcreateToVoucher(SUBJECTID,SUBJECTNAME,receiver,pk_accountingbook,pk_org); - System.out.println("天津主体凭证传输状态："+returns); - } catch (Exception e) { - new Exception("《《《《《《《《《天津主体凭证传输失败》》》》》》》》》"); - } + String plan_date = DateAssistant.getToday(); + Object userId = arg0.getTrigger().getJobDataMap().get("CurUserId"); + String curUserId = userId == null ? "system" : userId.toString(); + String ss = DOM4JcreateToVoucher(); + } /** @@ -99,58 +72,22 @@ public class VoucherToNCforVoucherPZ implements Job{ * @return */ public String sendVoucherData(JBOTransaction tx) { - String returns="false"; - String returns1=""; - String returns2=""; - String SUBJECTID=null; - String SUBJECTNAME=null; - String receiver=null; - String pk_accountingbook=null; - String pk_org=null; - /** - * 深圳主体 - */ - try { - SUBJECTID="aa740e4111c111eaaa0000163e0e11e6"; - SUBJECTNAME="安鹏国际融资租赁（深圳）有限公司"; - receiver="807001002001"; - pk_accountingbook="807001002001-0001"; - pk_org="807001002001"; - returns1 = DOM4JcreateToVoucher(SUBJECTID,SUBJECTNAME,receiver,pk_accountingbook,pk_org); - System.out.println("深圳主体凭证传输状态："+returns1); - } catch (Exception e) { - new Exception("《《《《《《《《《深圳主体凭证传输失败》》》》》》》》》"); - } - /** - * 天津主体 - */ - try { - SUBJECTID="d989246c11c111eaaa0000163e0e11e6"; - SUBJECTNAME="安鹏国际融资租赁（天津）有限公司"; - receiver="807001003"; - pk_accountingbook="807001003-0001"; - pk_org="807001003"; - returns2 = DOM4JcreateToVoucher(SUBJECTID,SUBJECTNAME,receiver,pk_accountingbook,pk_org); - System.out.println("天津主体凭证传输状态："+returns2); - } catch (Exception e) { - new Exception("《《《《《《《《《天津主体凭证传输失败》》》》》》》》》"); - } - if("true".equals(returns1) || "true".equals(returns2)) { - returns="true"; - } - return returns; + String ss = DOM4JcreateToVoucher(); + return ss; } /** * 凭证信息生成， 每100条一个xml文件 * @throws Exception */ - private static String DOM4JcreateToVoucher(String SUBJECTID,String SUBJECTNAME,String receiver,String pk_accountingbook,String pk_org){ + private static String DOM4JcreateToVoucher(){ JBOTransaction tx=null; JBOTransaction tx1=null; Transaction Sqlca = null; Transaction Sqlca1 = null; String returns="true"; + + FileInputStream in = null; // 用于记录异常 File file1 = null; PrintStream stream = null; @@ -166,6 +103,11 @@ public class VoucherToNCforVoucherPZ implements Job{ // 明细表时间记录 String year_month_days = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); try { + tx = JBOFactory.createJBOTransaction(); + tx1 = JBOFactory.createJBOTransaction(); + Sqlca = Transaction.createTransaction(tx); + Sqlca1 = Transaction.createTransaction(tx1); + Map map = new HashMap(); /** * 读取配置文件信息 * */ @@ -178,6 +120,7 @@ public class VoucherToNCforVoucherPZ implements Job{ String groupcode = VouchersPropertiesUtil.get("voucher_groupcode"); // 系统参数 String isexchange = VouchersPropertiesUtil.get("voucher_isexchange"); + String receiver = VouchersPropertiesUtil.get("voucher_receiver"); // 外系统编码 String sender = VouchersPropertiesUtil.get("voucher_sender"); // 系统参数 @@ -188,22 +131,18 @@ public class VoucherToNCforVoucherPZ implements Job{ String pk_system = VouchersPropertiesUtil.get("voucher_pk_system"); // 凭证类型值 String voucherkind = VouchersPropertiesUtil.get("voucher_voucherkind"); + String pk_accountingbook = VouchersPropertiesUtil.get("voucher_pk_accountingbook"); // 制单人 String pk_prepared = VouchersPropertiesUtil.get("voucher_pk_prepared"); + String pk_org = VouchersPropertiesUtil.get("voucher_pk_org"); // 所属集团 String pk_group = VouchersPropertiesUtil.get("voucher_pk_group"); // 币种 String pk_currtype = VouchersPropertiesUtil.get("voucher_pk_currtype"); // 传输xml文件存放路径 String LOCALHOST_URL = VouchersPropertiesUtil.get("LOCALHOST_URL"); + ERROR_URL = VouchersPropertiesUtil.get("ERROR_URL"); // 错误信息存放路径 - ERROR_URL = VouchersPropertiesUtil.get("ERROR_URL"); - tx= JBOFactory.createJBOTransaction(); - tx1= JBOFactory.createJBOTransaction(); - Sqlca = Transaction.createTransaction(tx); - Sqlca1 = Transaction.createTransaction(tx1); - Map map = new HashMap(); - List conList=new ArrayList(); /** * 定义全局变量 */ @@ -228,7 +167,7 @@ public class VoucherToNCforVoucherPZ implements Job{ // 定义新增语句对象 String insertSql=""; // 查询凭证视图, 获取每条凭证 - String sql = "SELECT id,f3,f60,ID,MODULE_NAME,DEPT_NAME,F1,F15,V8_STATUS,F5,GENERATE_DATE FROM VI_VOUCHER_V8 WHERE F3 NOT IN(SELECT TABLE_NUM FROM NCXML_DETAIL_RECORDS WHERE FLAG = '1' AND XML_TYPE='"+type+"') AND F49='"+SUBJECTID+"' AND F50='"+SUBJECTNAME+"' AND DATE_FORMAT(f1,'%Y-%m')>DATE_FORMAT('2019-02-11','%Y-%m')"; + String sql = "SELECT id,f3,f60,ID,MODULE_NAME,DEPT_NAME,F1,F15,V8_STATUS,F5,GENERATE_DATE FROM VI_VOUCHER_V8 WHERE F3 NOT IN(SELECT TABLE_NUM FROM NCXML_DETAIL_RECORDS WHERE FLAG = '1' AND XML_TYPE='" + type + "') AND DATE_FORMAT(f1,'%Y-%m')>DATE_FORMAT('2019-02-11','%Y-%m')"; List> list = DataOperatorUtil.getDataBySql(Sqlca, sql, null);// 将所有凭证号封装到list集合中 // v8视图总数据量/ xml中生成的总条数 @@ -263,6 +202,7 @@ public class VoucherToNCforVoucherPZ implements Job{ for (int x = i * b; x < (i + 1) * b && x < a; x++) { // 决定当前xml生成的数据量 // 获取凭证编号 String F3=list.get(x).get("f3"); + String F60 = (String)((Map)list.get(x)).get("f60"); map.clear(); map.put("F3",F3); @@ -585,8 +525,6 @@ public class VoucherToNCforVoucherPZ implements Job{ }else { // 统计旧批次 String batch1= record.getAttribute("BATCH").getString(); - // 记录当前旧批次id - conList.add(uuid); // 初始化将就数据描述信息变更为: 传输失败 , 请联系管理员 String updSql="UPDATE NCXML_DETAIL_RECORDS SET FLAG='2',ERR_DESCRIBE='传输失败 , 请联系管理员 !',CREATE_TIME='"+year_month_days+"' WHERE BILLID='"+uuid+"' AND XML_TYPE= '"+type+"' AND BATCH='"+batch1+"'"; Sqlca1.executeSQL(updSql); @@ -607,15 +545,25 @@ public class VoucherToNCforVoucherPZ implements Job{ writer.setEscapeText(false);// 字符是否转义,默认true writer.write(document); writer.close(); - try { - InterActionToNC(Sqlca,URL,type,batch,count,conList,batchList); - } catch (Exception e) { - e.printStackTrace(); - } + InterActionToNC(Sqlca,URL,type,batch,count,batchList); Sqlca.commit(); } } catch (Exception e) { logger.info("凭证xml传输失败"); + try{ + Sqlca.rollback(); + if ((batch != null) || (!"".equals(batch))) + { + logger.debug("凭证xml传输失败"); + String insertSql = "INSERT INTO NCXML_TOTAL_RECORDS(ID,BATCH,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,ERR_DESCRIBE,CREATETIME) VALUES('" + UUID.randomUUID().toString().replace("-", "") + "','" + batch + "','" + type + "','N','" + count + "','" + count + "','" + e.toString() + "','" + year_month_days + "')"; + Sqlca1.executeSQL(insertSql); + Sqlca1.commit(); + } + } + catch (Exception e2) + { + e2.printStackTrace(); + } // 异常记录路径 file1=new File(ERROR_URL+"NC_ERROR-VOUCHER-"+year_month_day+".txt"); try { @@ -653,7 +601,7 @@ public class VoucherToNCforVoucherPZ implements Job{ /** * 向NC传输xml, 获取NC回执xml信息, 根据回执信息更改状态 */ - public static void InterActionToNC(Transaction Sqlca,String inputURL,String type,String batch,int count,List conList,List batchList) throws Exception { + public static void InterActionToNC(Transaction Sqlca,String inputURL,String type,String batch,int count,List batchList) throws Exception { String updSql=""; // 更新历史记录 String updateSql = ""; // 更新sql对象 String insertSql = ""; // 新增SQL对象 @@ -664,14 +612,8 @@ public class VoucherToNCforVoucherPZ implements Job{ String account = VouchersPropertiesUtil.get("account"); // 账套 String groupcode = VouchersPropertiesUtil.get("groupcode"); // 集团编码 String RECEIVE_URL = VouchersPropertiesUtil.get("RECEIVE_URL"); // 回执信息存放路径 - String ERROR_URL = VouchersPropertiesUtil.get("ERROR_URL"); // 错误信息存放路径 - String year_month_day = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); // 用于文件名凭借 - String year_month_days = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());// 明细表时间记录 - String xmlString = ""; - /** - * 传输有问题，继续传剩下的 - */ - try { + + /** * 获取对方post连接 */ @@ -703,7 +645,7 @@ public class VoucherToNCforVoucherPZ implements Job{ InputStream inputStream = connection.getInputStream(); InputStreamReader isr = new InputStreamReader(inputStream,"UTF-8"); BufferedReader bufreader = new BufferedReader(isr); - + String xmlString = ""; String b=null; while((b=bufreader.readLine()) !=null) { xmlString+=b; @@ -712,37 +654,6 @@ public class VoucherToNCforVoucherPZ implements Job{ System.out.println("-------------获取回执信息完成--------------"); System.out.println(xmlString); bufreader.close(); - }catch (Exception e) { - e.printStackTrace(); - logger.info("凭证xml传输失败"); - try { - if(batch!=null && !"".equals(batch)){ - logger.debug("凭证xml传输失败"); - insertSql="INSERT INTO NCXML_TOTAL_RECORDS(ID,BATCH,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,ERR_DESCRIBE,CREATETIME) VALUES('"+UUID.randomUUID().toString().replace("-", "")+"','"+batch+"','"+type+"','N','"+count+"','"+count+"','"+e.toString()+"','"+year_month_days+"')"; - Sqlca.executeSQL(insertSql); - Sqlca.commit(); - } - } catch (Exception e2) { - e2.printStackTrace(); - } - /*try { - new PrintWriter(new BufferedWriter(new FileWriter("E:/log.txt",true)),true).println(e.toString()); - } catch (IOException e1) { - e1.printStackTrace(); - }*/ - // 异常记录路径 - File file=new File(ERROR_URL+"NC_ERROR-VOUCHER-"+year_month_day+".txt"); - PrintStream stream =null; - try { - stream = new PrintStream(file); - } catch (FileNotFoundException e1) { - e1.printStackTrace(); - } - e.printStackTrace(stream); - stream.flush(); - stream.close(); - throw new Exception("推送失败!"); - } /** * 将获取到的回执信息生成本地xml */ @@ -817,7 +728,7 @@ public class VoucherToNCforVoucherPZ implements Job{ } // 判断集合为否为null, 不为空遍历集合, 获取旧数据的批次号 - if(batchList.size()>0) { + if(batchList!=null || batchList.size()>0) { // 定义当前批次, 错误记录数 for (String old_batch : batchList) { int con=0; @@ -871,26 +782,12 @@ public class VoucherToNCforVoucherPZ implements Job{ Sqlca.executeSQL(insertSql1); } // 判断集合为否为null, 不为空遍历集合, 获取旧数据的批次号 - if(batchList.size()>0) { - // 变更传输状态 - for(String billid : conList){ - updSql="UPDATE NCXML_DETAIL_RECORDS SET FLAG='1',ERR_DESCRIBE='传输成功 !' WHERE XML_TYPE= '"+type+"' AND BILLID='"+billid+"'"; - Sqlca.executeSQL(updSql); - } + if(batchList != null) { // 定义当前批次, 错误记录数 for (String old_batch : batchList) { - int con=0; - // 查询集合, 获取旧批次的失败总数 - String selectSql="SELECT BATCH,COUNT(BILLID) CON FROM ncxml_detail_records WHERE flag !=1 AND xml_type='"+type+"' AND BATCH='"+old_batch+"' GROUP BY BATCH"; - List> dataList=DataOperatorUtil.getDataBySql(Sqlca, selectSql,null); - if(dataList!=null && dataList.size()>0) { - con=Integer.valueOf(dataList.get(0).get("CON")); - } - if(con==0) { - updateSql="UPDATE NCXML_TOTAL_RECORDS SET FLAG_='Y',FAILED_COUNT='0',ERR_DESCRIBE='"+resultdescription+"',CREATETIME='"+formatter2.format(new Date())+"' WHERE XML_TYPE='"+type+"' AND BATCH='"+old_batch+"'"; - }else { - updateSql="UPDATE NCXML_TOTAL_RECORDS SET FAILED_COUNT='"+con+"',ERR_DESCRIBE='"+resultdescription+"',CREATETIME='"+formatter2.format(new Date())+"' WHERE XML_TYPE='"+type+"' AND BATCH='"+old_batch+"'"; - } + updateSql = " UPDATE NCXML_DETAIL_RECORDS SET FLAG='1',ERR_DESCRIBE='传输成功 !' WHERE XML_TYPE= '" + type + "' AND BATCH='" + old_batch + "'"; + Sqlca.executeSQL(updateSql); + updateSql="UPDATE NCXML_TOTAL_RECORDS SET FLAG_='Y',FAILED_COUNT='0',ERR_DESCRIBE='"+resultdescription+"',CREATETIME='"+formatter2.format(new Date())+"' WHERE XML_TYPE='"+type+"' AND BATCH='"+old_batch+"'"; Sqlca.executeSQL(updateSql); } } diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index c6697ea17..bb4e149c4 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -6,14 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - - - - -import jbo.app.VOUCHER_V8; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; -import jbo.sys.ORG_INFO; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,6 +18,8 @@ import com.tenwa.reckon.util.DateUtil; import com.tenwa.reckon.util.Tools; import com.tenwa.voucher.service.VoucherService; +import jbo.app.VOUCHER_V8; + /** * *

。

diff --git a/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java b/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java index 57494a39a..42006a4f4 100644 --- a/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java +++ b/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java @@ -4,12 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; -import jbo.com.tenwa.entity.comm.flow.FLOW_MUTEX_CONFIG; -import jbo.sys.FLOW_CATALOG; -import jbo.sys.FLOW_MODEL; -import jbo.ui.system.CODE_LIBRARY; - import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.amarsoft.amarscript.Any; @@ -20,11 +14,18 @@ import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.BizObjectQuery; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.are.util.json.JSONDecoder; import com.amarsoft.awe.util.Transaction; import com.amarsoft.dict.als.manage.CodeManager; import com.amarsoft.dict.als.object.Item; import com.tenwa.officetempalte.util.FileOperatorUtil; +import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; +import jbo.com.tenwa.entity.comm.flow.FLOW_MUTEX_CONFIG; +import jbo.sys.FLOW_CATALOG; +import jbo.sys.FLOW_MODEL; +import jbo.ui.system.CODE_LIBRARY; + public class FlowBussionAction extends CommonAction { private String FlowUnid; private String ProjectId; diff --git a/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java b/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java index b40f3e303..441040840 100644 --- a/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java +++ b/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java @@ -5,20 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jbo.app.tenwa.calc.LC_PROJ_CONDITION; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; -import jbo.app.tenwa.doc.LB_DOCATTRIBUTE; -import jbo.app.tenwa.doc.LB_DOCLIBRARY; -import jbo.app.tenwa.doc.LB_DOCRELATIVE; -import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; -import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; -import jbo.com.tenwa.lease.carbrand.VI_CONTRACTMAKEPRINTLIST; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_STATUS; -import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; -import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; -import jbo.sys.CHANNEL_SUBMIT_APPLICATIONS; - -import com.amarsoft.app.als.bizobject.customer.CustomerManager; import com.amarsoft.app.util.ProductParamUtil; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; @@ -37,6 +23,16 @@ import com.tenwa.channelportal.action.ContractSignAction; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import common.Logger; +import jbo.app.tenwa.calc.LC_PROJ_CONDITION; +import jbo.app.tenwa.doc.LB_DOCATTRIBUTE; +import jbo.app.tenwa.doc.LB_DOCLIBRARY; +import jbo.app.tenwa.doc.LB_DOCRELATIVE; +import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; +import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; +import jbo.com.tenwa.lease.carbrand.VI_CONTRACTMAKEPRINTLIST; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_STATUS; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; /** * 合同签约 * @author tenwa518 @@ -591,22 +587,5 @@ public String setProjectStatus(JBOTransaction tx) throws Exception{ return "1"; } } - public String isSign(JBOTransaction tx){ - try { - BizObjectManager caManage = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME, tx); - BizObject ca = caManage.createQuery( " project_id=:projectId " ).setParameter("projectId", ProjectId).getSingleResult(false); - if(ca != null){ - if("Y".equals(ca.getAttribute("sign_status").toString())){ - return "success"; - }else{ - return "该银行卡未未签约，请先提示客户进行签约！"; - } - }else{ - return "没有查询到对应的扣款卡信息，请联系管理员！"; - } - } catch (JBOException e) { - e.printStackTrace(); - } - return "获取签约失败！"; - } + } diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java index 72b955219..fd74b31b0 100644 --- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java +++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java @@ -10,20 +10,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.jdbc.object.SqlCall; - -import jbo.app.tenwa.calc.LC_RENT_PLAN; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; -import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; -import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO; -import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO; -import jbo.com.tenwa.lease.comm.LB_BUCKLE_LOG; -import jbo.com.tenwa.lease.comm.LB_CLEAR_FILE_RECORD; -import jbo.com.tenwa.lease.comm.LB_INTFACE_FILE_RECORD; -import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN; -import jbo.sys.CODE_LIBRARY; - -import com.amarsoft.app.als.sys.tools.DateTool; import com.amarsoft.app.awe.config.InitCollectConfig; import com.amarsoft.app.util.StringUtil; import com.amarsoft.are.jbo.BizObject; @@ -37,10 +23,20 @@ import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.gnete.security.crypt.Crypt; import com.gnete.security.crypt.CryptException; -import com.ibm.sslight.tools.mainExit; import com.tenwa.comm.util.date.DateAssistant; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import jbo.app.tenwa.calc.LC_RENT_PLAN; +import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; +import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; +import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO; +import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO; +import jbo.com.tenwa.lease.comm.LB_BUCKLE_LOG; +import jbo.com.tenwa.lease.comm.LB_CLEAR_FILE_RECORD; +import jbo.com.tenwa.lease.comm.LB_INTFACE_FILE_RECORD; +import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN; +import jbo.sys.CODE_LIBRARY; + public class CollectAuditInfoCache { private String id; @@ -799,14 +795,10 @@ public class CollectAuditInfoCache { BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME); BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME); //这里对天津与深圳的数据进行拆分 - List bolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.SUBJECTID from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+") and O.SUBJECTID='aa740e4111c111eaaa0000163e0e11e6'").getResultList(false); - List tianjinbolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.SUBJECTID from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+") and O.SUBJECTID='d989246c11c111eaaa0000163e0e11e6'").getResultList(false); + List bolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false); if (bolist.size() != 0) { singleBatchCollectMoeny(tx, bolist); } - if (tianjinbolist.size() != 0) { - singleBatchCollectMoeny(tx, tianjinbolist); - } return "系统正在处理中，请稍后"; } @@ -828,7 +820,7 @@ public class CollectAuditInfoCache { parms.append(",'"+str+"'"); } } - List bolist = bm.createQuery("select distinct O.BATCH_NO,O.BATCH_SN,O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.SUBJECTID from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false); + List bolist = bm.createQuery("select distinct O.BATCH_NO,O.BATCH_SN,O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false); for (BizObject bo : bolist) { String query_sn = bo.getAttribute("BATCH_NO").toString(); String sn = bo.getAttribute("BATCH_SN").toString(); @@ -887,9 +879,9 @@ public class CollectAuditInfoCache { .setParameter("COLLECT_MSG", "批量代收,收款成功") .setParameter("BATCH_STATUS", "complete")//更新批量处理状态-完成 .setParameter("id", bo.getAttribute("id").toString()).executeUpdate(); - BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", id).getSingleResult(false); + BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", bo.getAttribute("id").toString()).getSingleResult(false); if(boDDI!=null){ - this.writeBackDistributor(id,Sqlca); + this.writeBackDistributor(bo.getAttribute("id").toString(),Sqlca); } bo.setAttributeValue("COLLECT_STATUS", "批量收款"); bo.setAttributeValue("COLLECT_MSG", "批量代收,收款成功"); @@ -927,9 +919,9 @@ public class CollectAuditInfoCache { .setParameter("COLLECT_MSG", "批量代收,收款成功") .setParameter("BATCH_STATUS", "complete")//更新批量处理状态-完成 .setParameter("id", bo.getAttribute("id").toString()).executeUpdate(); - BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", id).getSingleResult(false); + BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", bo.getAttribute("id").toString()).getSingleResult(false); if(boDDI!=null){ - this.writeBackDistributor(id,Sqlca); + this.writeBackDistributor( bo.getAttribute("id").toString(),Sqlca); } bo.setAttributeValue("COLLECT_STATUS", "批量收款"); bo.setAttributeValue("COLLECT_MSG", "批量代收,收款成功"); @@ -1015,9 +1007,6 @@ public class CollectAuditInfoCache { String month = currentDateTime.substring(5,7); String day = currentDateTime.substring(8,10); String merchantNumber = InitCollectConfig.MERCHANTID; - if(bo!=null&&bo.getAttribute("SUBJECTID")!=null&&"".equals(bo.getAttribute("SUBJECTID").getString())){ - merchantNumber=InitCollectConfig.TIANJIN_MERCHANTID; - } String flag = InitCollectConfig.FLAG; String version = InitCollectConfig.C_VERSION; String date = currentYear+month+day;//提交日期 @@ -1034,7 +1023,7 @@ public class CollectAuditInfoCache { } String req_sn = System.currentTimeMillis()+"";//当日批次号 batch_title = merchantNumber+"_"+flag+version+date+"_"+req_sn; - StringBuffer strbuff = queryBatchXML(merchantNumber,req_sn, query_sn, sn); + StringBuffer strbuff = queryBatchXML(req_sn, query_sn,sn); // queryBatchXML(req_sn, query_sn, sn); //响应报文 String strResp = cp.CollectAuditPayReq(strbuff,file.getAbsolutePath(), batch_title); @@ -1044,52 +1033,7 @@ public class CollectAuditInfoCache { return map; } - /** - * 按商户号获取查询报文 - * @param merchantNumber - * @param req_sn - * @param query_sn - * @param sn - * @return - */ - private StringBuffer queryBatchXML(String merchantNumber, String req_sn, String query_sn, String sn) { - StringBuffer strbuff = new StringBuffer(); - if(InitCollectConfig.MERCHANTID.equals(merchantNumber)){ - strbuff = queryBatchXML(req_sn, query_sn, sn); - }else{ - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - Info info = new Info(); - info.setTRX_CODE("200001"); - info.setVERSION(InitCollectConfig.C_VERSION); - info.setDATA_TYPE(InitCollectConfig.C_DATATYPE); - info.setREQ_SN(req_sn); - info.setUSER_NAME(InitCollectConfig.TIANJIN_USERNAME); - info.setUSER_PASS(InitCollectConfig.TIANJIN_USERPASS); - info.setSIGNED_MSG(""); - strbuff.append(EntityTransform.toXml(info)); - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(query_sn);//要查询的交易流水 - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(sn);//交易明细号 - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - strbuff.append(""); - } - return strbuff; - } + /** * 批量查询接口--回笼租金 @@ -1208,9 +1152,6 @@ public class CollectAuditInfoCache { String month = currentDateTime.substring(5,7); String day = currentDateTime.substring(8,10); String merchantNumber = InitCollectConfig.MERCHANTID; - if(list.get(0).getAttribute("SUBJECTID")!=null&&"d989246c11c111eaaa0000163e0e11e6".equals(list.get(0).getAttribute("SUBJECTID").getString())){ - merchantNumber = InitCollectConfig.TIANJIN_MERCHANTID; - } String flag = InitCollectConfig.FLAG; String version = InitCollectConfig.C_VERSION; String date = currentYear+month+day;//提交日期 @@ -1313,10 +1254,6 @@ public class CollectAuditInfoCache { info.setUSER_PASS(InitCollectConfig.USERPASS); info.setREQ_SN(req_sn); info.setSIGNED_MSG(""); - if(list.get(0).getAttribute("SUBJECTID")!=null&&"d989246c11c111eaaa0000163e0e11e6".equals(list.get(0).getAttribute("SUBJECTID").getString())){ - info.setUSER_NAME(InitCollectConfig.TIANJIN_USERNAME); - info.setUSER_PASS(InitCollectConfig.TIANJIN_USERPASS); - } strbuff.append(EntityTransform.toXml(info)); strbuff.append(""); strbuff.append(""); diff --git a/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java b/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java deleted file mode 100644 index e5c971c81..000000000 --- a/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.tenwa.customer.controller.group; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import com.amarsoft.are.jbo.JBOTransaction; -import com.tenwa.reckon.util.Conn; - -public class CheckPoundegeDate { - - private String chargeChannel;//扣款渠道 - private String chargeWay;//扣款方式 - private String startDate;//开始时间 - private String expiryDate;//结束时间 - private String id; - public String getChargeChannel() { - return chargeChannel; - } - public void setChargeChannel(String chargeChannel) { - this.chargeChannel = chargeChannel; - } - public String getChargeWay() { - return chargeWay; - } - public void setChargeWay(String chargeWay) { - this.chargeWay = chargeWay; - } - public String getStartDate() { - return startDate; - } - public void setStartDate(String startDate) { - this.startDate = startDate; - } - public String getExpiryDate() { - return expiryDate; - } - public void setExpiryDate(String expiryDate) { - this.expiryDate = expiryDate; - } - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - - - //校验扣款手续费维护日期 - public String checkPoundegeDate(JBOTransaction tx) throws Exception{ - Conn conn = new Conn(tx); - String sql = "SELECT id FROM LPOUNDAGE_MAINTENANCE where charge_channel=? AND charge_way=? AND DATE_FORMAT(expiry_date,'%Y/%m/%d')>DATE_FORMAT(?,'%Y/%m/%d')"; - List> results = conn.executeQuery(sql, chargeChannel,chargeWay,startDate); - if(id==null &&results.size()>0){ - return "开始时间大于已有数据的结束时间！！"; - } - - String endSql = "SELECT a.expiry_date FROM LPOUNDAGE_MAINTENANCE AS a WHERE expiry_date = (SELECT MAX(expiry_date) FROM LPOUNDAGE_MAINTENANCE WHERE a.charge_channel=charge_channel AND a.charge_way=charge_way) and a.charge_channel=? AND a.charge_way=?"; - List> endtime = conn.executeQuery(endSql, chargeChannel,chargeWay); - if(id==null && endtime.size()>0){ - String enddate = endtime.get(0).get("expiry_date"); - DateFormat df = new SimpleDateFormat("yyyy/MM/dd"); - Date startdate = df.parse(startDate); - Date endTime = df.parse(enddate); - long days = (startdate.getTime() - endTime.getTime()) / 1000 / 3600 / 24; - if(days!=1){ - return "开始时间比上一条数据结束时间相差大于1天！"; - } - } - - - return "true"; - - } -} diff --git a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java index 8db6a72f1..3f0dbd2c0 100644 --- a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java @@ -1,24 +1,17 @@ package com.tenwa.customer.controller.group; -import java.util.List; -import java.util.Map; - -import jbo.app.tenwa.customer.CUSTOMER_GROUP_COMPANY; -import jbo.app.tenwa.customer.DISTRIBUTOR_GROUP_COMPANY; -import jbo.app.tenwa.customer.DISTRIBUTOR_GROUP_RELATION; -import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; -import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP; -import jbo.com.tenwa.entity.comm.own.COUNTRY_DISTRICT_INFO; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; -import jbo.sys.CODE_LIBRARY; - import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.BizObjectQuery; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; -import com.amarsoft.awe.dw.ui.page.body.imp.Integer; -import com.tenwa.reckon.util.Conn; + +import jbo.app.tenwa.customer.CUSTOMER_GROUP_COMPANY; +import jbo.app.tenwa.customer.DISTRIBUTOR_GROUP_COMPANY; +import jbo.app.tenwa.customer.DISTRIBUTOR_GROUP_RELATION; +import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; +import jbo.com.tenwa.entity.comm.own.COUNTRY_DISTRICT_INFO; +import jbo.sys.CODE_LIBRARY; public class CustomerGroupCompanyController { @@ -29,7 +22,6 @@ public class CustomerGroupCompanyController { private String flowunid; private String ITEMNO = ""; private String SORTNO = ""; - private String contractId; public String getITEMNO() { return ITEMNO; @@ -88,13 +80,6 @@ public class CustomerGroupCompanyController { this.group_no = group_no; } - public String getContractId() { - return contractId; - } - - public void setContractId(String contractId) { - this.contractId = contractId; - } /** @@ -232,22 +217,5 @@ public class CustomerGroupCompanyController { } } - //校验经销商额度是否足够 - public String checkTotal(JBOTransaction tx) throws Exception{ - Conn conn = new Conn(tx); - String sql = "SELECT IFNULL(di.total,0)-IFNULL(lcc.CLEAN_LEASE_MONEY,0) total,di.CHANNELTYPE FROM lb_contract_info lci LEFT JOIN DISTRIBUTOR_INFO di ON di.distributor_no=lci.distributor_id LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id=lci.id WHERE lci.id=? "; - List> results = conn.executeQuery(sql, this.contractId); - String istotal = results.get(0).get("total"); - String channeltype = results.get(0).get("channeltype"); - if("01".equals(channeltype) && new Double(istotal) <= 0){ - return "经销商额度不足！"; - } - return "true"; - - } - - - - } \ No newline at end of file diff --git a/src_tenwa/com/tenwa/flow/fund/copyebank/AdvanceCopyEbankTempToFormal.java b/src_tenwa/com/tenwa/flow/fund/copyebank/AdvanceCopyEbankTempToFormal.java index d244ec4cb..8daae6dd5 100644 --- a/src_tenwa/com/tenwa/flow/fund/copyebank/AdvanceCopyEbankTempToFormal.java +++ b/src_tenwa/com/tenwa/flow/fund/copyebank/AdvanceCopyEbankTempToFormal.java @@ -34,29 +34,16 @@ public class AdvanceCopyEbankTempToFormal extends BaseBussiness{ Sqlca.executeSQL(so); Map fromCondtion = new HashMap(); Map toCondition = new HashMap(); - Map otherProperty = new HashMap(); LeaseFlowBaseService service=new LeaseFlowBaseServiceImp(); BizObjectManager letManage = JBOFactory.getBizObjectManager(LC_EBANK_TEMP.CLASS_NAME,Sqlca); List lets = letManage.createQuery("flowunid=:flowunid").setParameter("flowunid", sFlowUnid).getResultList(false); for (BizObject let : lets) { - BizObjectManager leManage = JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME,Sqlca); - BizObject le = leManage.createQuery(" EBANK_SN=:ebanksn ").setParameter("ebanksn", let.getAttribute("EBANK_SN").getString()).getSingleResult(false); fromCondtion.clear(); fromCondtion.put("FLOWUNID", sFlowUnid); fromCondtion.put("EBANK_SN", let.getAttribute("EBANK_SN").getString()); toCondition.clear(); toCondition.put("EBANK_SN", let.getAttribute("EBANK_SN").getString()); - otherProperty.clear(); - String had_money = null; - if(le.getAttribute("HAD_MONEY").getString()==null||le.getAttribute("HAD_MONEY").getString()==""){ - had_money = let.getAttribute("HAD_MONEY").getString(); - }else{ - BigDecimal tempHanMoney = new BigDecimal(let.getAttribute("HAD_MONEY").getString()); - BigDecimal HanMoney = new BigDecimal(le.getAttribute("HAD_MONEY").getString()); - had_money =tempHanMoney.add(HanMoney).toString(); - } - otherProperty.put("HAD_MONEY", had_money); - service.copyEbankInfo(Sqlca, fromCondtion, toCondition, otherProperty, ServiceOperatorEnum.TempToFormal); + service.copyEbankInfo(Sqlca, fromCondtion, toCondition, null, ServiceOperatorEnum.TempToFormal); } String sMessage="true"; return sMessage; diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java index 61e37f0e6..35e87c7e9 100644 --- a/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java +++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java @@ -276,26 +276,7 @@ public class FundPayment { boEquipAmt.setAttributeValue("IS_FLOWING", 0); bomLFIT.saveObject(boEquipAmt); - String getProductSQL = "select PRODUCT_ID from O where O.id='"+boLFPAMT.getAttribute("CONTRACT_ID").getString()+"'"; - BizObject boLCI = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,tx).createQuery(getProductSQL).getSingleResult(false); - String productId = boLCI.getAttribute("PRODUCT_ID").toString(); - String isBalance = ProductParamUtil.getProductParameterValue(productId, "PRD0315", "UNITE_MONEY", "isBalance"); - if("yes".equals(isBalance)){ - - BizObject boUniteMoney = bomLFIT.newObject(); - // boUniteMoney.setAttributeValue("QUOT_ID", boLFP.getAttribute("QUOT_ID").getString()); - // boUniteMoney.setAttributeValue("CUST_ID", boLFP.getAttribute("CUST_ID").getString()); - boUniteMoney.setAttributeValue("PROJECT_ID", boLFPAMT.getAttribute("PROJECT_ID").getString()); - boUniteMoney.setAttributeValue("RELATIVE_ID", incomeID); - boUniteMoney.setAttributeValue("PROJECT_PLAN_NUMBER", boLFPAMT.getAttribute("PROJECT_PLAN_NUMBER").getString()); - boUniteMoney.setAttributeValue("CONTRACT_ID", boLFPAMT.getAttribute("CONTRACT_ID").getString()); - boUniteMoney.setAttributeValue("CONTRACT_PLAN_NUMBER", boLFPAMT.getAttribute("CONTRACT_PLAN_NUMBER").getString()); - boUniteMoney.setAttributeValue("PAYMENT_NUMBER", boLFPAMT.getAttribute("PAYMENT_NUMBER").getString()); - // boUniteMoney.setAttributeValue("PLAN_ID", planID); - // boUniteMoney.setAttributeValue("PLAN_LIST", boLFPAMT.getAttribute("PLAN_LIST").getString()); - boUniteMoney.setAttributeValue("PAY_TYPE", "pay_type_in"); - boUniteMoney.setAttributeValue("FEE_TYPE", "feetype10"); - boUniteMoney.setAttributeValue("SETTLE_METHOD", "settlemethod11"); + // List boLCFI = JBOFactory.createBizObjectQuery(LC_FUND_INCOME.CLASS_NAME, "PLAN_ID=:PLAN_ID and ROLL_BACK='0' and PAY_STATUS<>'apply_return'").setParameter("PLAN_ID", planID) // .getResultList(false); // List boLCFIT = JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME, "PLAN_ID=:PLAN_ID and pay_type='pay_type_out' and IS_FLOWING = '0' and ROLL_BACK='0' and PAY_STATUS is null").setParameter("PLAN_ID", planID) @@ -306,26 +287,7 @@ public class FundPayment { // boUniteMoney.setAttributeValue("BANK", boLLI.getAttribute("LEASE_ACC_BANK").toString()); // boUniteMoney.setAttributeValue("ACCOUNT", boLLI.getAttribute("LEASE_ACC_NAME").toString()); // boUniteMoney.setAttributeValue("ACC_NUMBER", boLLI.getAttribute("LEASE_ACC_NUMBER").toString()); - boUniteMoney.setAttributeValue("CLIENT_BANK", boLTI.getAttribute("CLIENT_ACC_BANK").toString()); - boUniteMoney.setAttributeValue("CLIENT_ACCOUNT", boLTI.getAttribute("CLIENT_ACC_NAME").toString()); - boUniteMoney.setAttributeValue("CLIENT_ACCNUMBER", boLTI.getAttribute("CLIENT_ACC_NUMBER").toString()); - boUniteMoney.setAttributeValue("FACT_DATE", StringFunction.getToday()); - boUniteMoney.setAttributeValue("ACCOUNTING_DATE", StringFunction.getToday()); - BizObject boLCC = JBOFactory.createBizObjectQuery(LC_CALC_CONDITION.CLASS_NAME, "CONTRACT_ID=:CONTRACT_ID").setParameter("CONTRACT_ID",boLFPAMT.getAttribute("CONTRACT_ID").getString()).getSingleResult(false); - boUniteMoney.setAttributeValue("FACT_MONEY", boLCC.getAttribute("UNITE_MONEY").toString()); - boUniteMoney.setAttributeValue("FEE_ADJUST", 0); - //boLFITOut.setAttributeValue("FACT_OBJECT", boLFPAMT.getAttribute("PAY_OBJ").getString()); - // boUniteMoney.setAttributeValue("APPLYPAY_DATE", boLFP.getAttribute("PLAN_DATE").getString()); - boUniteMoney.setAttributeValue("APPLY_PERSON", userId); - boUniteMoney.setAttributeValue("APPLY_DEPT", orgId); - boUniteMoney.setAttributeValue("MEMO", "联合出资差额放款"); - boUniteMoney.setAttributeValue("ROLL_BACK", 0); - boUniteMoney.setAttributeValue("FLOWUNID", flowunid); - boUniteMoney.setAttributeValue("IS_FLOWING", 0); - - bomLFIT.saveObject(boUniteMoney); - } Map fromCondtion = new HashMap<>(); fromCondtion.put("PAYMENT_NUMBER", boLFPAMT.getAttribute("PAYMENT_NUMBER").getString()); fromCondtion.put("FEE_TYPE", boLFPAMT.getAttribute("FEE_TYPE").getString()); diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/SubmitAgainLabel.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/SubmitAgainLabel.java deleted file mode 100644 index 3622d334f..000000000 --- a/src_tenwa/com/tenwa/flow/fund/flowpayment/SubmitAgainLabel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.tenwa.flow.fund.flowpayment; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; -import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; -import jbo.sys.FLOW_TASK; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.lang.DataElement; -import com.amarsoft.awe.util.Transaction; -import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; -import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; -import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; -/** - * 拷贝合同数据到临时表 - * @author zhulh - * - */ - -public class SubmitAgainLabel extends BaseBussiness{ - public Object run(Transaction Sqlca) throws Exception{ - this.initBussinessParam(Sqlca.getTransaction()); - String sFlowUnid = (String)this.getAttribute("ObjectNo"); - BizObjectManager ftManage = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME); - List resultList = ftManage.createQuery(" objectno=:flowUnid and phaseno='0010' ").setParameter("flowUnid", sFlowUnid).getResultList(false); - if(resultList.size()>1){ - BizObjectManager fboManage = JBOFactory.getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME); - BizObject fbo = fboManage.createQuery("flow_unid=:flowUnid ").setParameter("flowUnid", sFlowUnid).getSingleResult(true); - if( fbo!= null){ - String proj_name = fbo.getAttribute("proj_name").toString(); - if(proj_name.indexOf("再次提交")<0){ - fbo.setAttributeValue("proj_name", proj_name+"_"+resultList.size()+"次提交"); - }else{ - fbo.setAttributeValue("proj_name", proj_name.substring(0,proj_name.indexOf("次提交")-1)+resultList.size()+"次提交"); - } - - fboManage.saveObject(fbo); - } - } - - return "true"; - } -} diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index 110161ae1..5806b77bc 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -6,16 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jbo.app.tenwa.calc.LC_EBANK_PROCESS; -import jbo.app.tenwa.calc.LC_EBANK_TEMP; -import jbo.app.tenwa.calc.LC_FUND_INCOME; -import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; -import jbo.app.tenwa.calc.LC_FUND_PLAN; -import jbo.app.tenwa.calc.VI_LC_FUND_PLAN; -import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; -import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; - import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOException; @@ -28,6 +18,15 @@ import com.amarsoft.awe.util.Transaction; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.flow.bussinessapprove.BussinessStatusAndDetailAction; +import jbo.app.tenwa.calc.LC_EBANK_PROCESS; +import jbo.app.tenwa.calc.LC_EBANK_TEMP; +import jbo.app.tenwa.calc.LC_FUND_INCOME; +import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; +import jbo.app.tenwa.calc.LC_FUND_PLAN; +import jbo.app.tenwa.calc.VI_LC_FUND_PLAN; +import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; + public class FundIncomeMethod { private String planIDs; @@ -299,7 +298,7 @@ public class FundIncomeMethod { } boLFIT.setAttributeValue("FEE_ADJUST", 0); boLFIT.setAttributeValue("FACT_OBJECT", boVLF.getAttribute("PAY_OBJ").getString()); - boLFIT.setAttributeValue("EBANK_NUMBER", boEb.getAttribute("EBANK_NUMBER").getString()); + boLFIT.setAttributeValue("EBANK_NUMBER", boEb.getAttribute("ID").getString()); boLFIT.setAttributeValue("BANK", boEb.getAttribute("OWN_BANK").getString()); boLFIT.setAttributeValue("ACCOUNT", boEb.getAttribute("OWN_ACCOUNT").getString()); boLFIT.setAttributeValue("ACC_NUMBER", boEb.getAttribute("OWNACC_NUMBER").getString()); @@ -359,11 +358,8 @@ public class FundIncomeMethod { public String createActualPayment(JBOTransaction tx) throws JBOException{ try{ //获取深圳本方账户 - BizObject boOAS = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME,tx) - .createQuery("account_purpose='default' and state_='0010' and FbSdk='Y' and own_id='aa740e4111c111eaaa0000163e0e11e6' ").getSingleResult(false); - //获取天津本方账户 - BizObject boOAT = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME,tx) - .createQuery("account_purpose='default' and state_='0010' and FbSdk='Y' and own_id='d989246c11c111eaaa0000163e0e11e6' ").getSingleResult(false); + BizObject boOA = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME,tx) + .createQuery("account_purpose='default' and state_='0010' and FbSdk='Y'").getSingleResult(false); for(String contractId : contractIds.split("@")){ @SuppressWarnings("unchecked") List bos = JBOFactory.getBizObjectManager(LC_FUND_INCOME.CLASS_NAME) @@ -372,8 +368,6 @@ public class FundIncomeMethod { BigDecimal totalMoney = new BigDecimal("0"); int contractCount = 0; if(bos.size() > 0){ - BizObject lci = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,tx) - .createQuery(" id=:id ").setParameter("id", contractId).getSingleResult(false); Map fromCondition = new HashMap(); Map otherProperty = new HashMap(); for(BizObject bo:bos){ @@ -384,15 +378,11 @@ public class FundIncomeMethod { otherProperty.put("FlowUnid", flowunid); otherProperty.put("IS_FLOWING", "0"); otherProperty.put("ACCOUNTING_DATE", StringFunction.getTodayNow().split(" ")[0]); - if(lci != null && "aa740e4111c111eaaa0000163e0e11e6".equals(lci.getAttribute("SUBJECTID").toString())){ - otherProperty.put("BANK", boOAS.getAttribute("ACC_BANK").getString()); - otherProperty.put("ACCOUNT", boOAS.getAttribute("ACC_NAME").getString()); - otherProperty.put("ACC_NUMBER", boOAS.getAttribute("ACC_NUMBER").getString()); - }else if(lci != null && "d989246c11c111eaaa0000163e0e11e6".equals(lci.getAttribute("SUBJECTID").toString())){ - otherProperty.put("BANK", boOAT.getAttribute("ACC_BANK").getString()); - otherProperty.put("ACCOUNT", boOAT.getAttribute("ACC_NAME").getString()); - otherProperty.put("ACC_NUMBER", boOAT.getAttribute("ACC_NUMBER").getString()); - } + + otherProperty.put("BANK", boOA.getAttribute("ACC_BANK").getString()); + otherProperty.put("ACCOUNT", boOA.getAttribute("ACC_NAME").getString()); + otherProperty.put("ACC_NUMBER", boOA.getAttribute("ACC_NUMBER").getString()); + otherProperty.put("INCOME_ID", bo.getAttribute("ID").getString()); otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "03"); if("0020".equals(payType)||"0030".equals(payType)){ @@ -481,19 +471,4 @@ public class FundIncomeMethod { } return "1"; } - - public String paymentReturn(JBOTransaction tx){ - try { - Transaction sqlTran = Transaction.createTransaction(tx); - sqlTran.executeSQL(new SqlObject("delete from lc_fund_income where CONTRACT_ID='"+CONTRACT_ID+"'")); - sqlTran.commit(); - return "success"; - } catch (Exception e) { - e.printStackTrace(); - return "系统错误！"; - } - - - } - } diff --git a/src_tenwa/com/tenwa/flow/lease/check/contract/IsNullCheck.java b/src_tenwa/com/tenwa/flow/lease/check/contract/IsNullCheck.java deleted file mode 100644 index 384eac8c9..000000000 --- a/src_tenwa/com/tenwa/flow/lease/check/contract/IsNullCheck.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.tenwa.flow.lease.check.contract; - -import java.util.List; - -import jbo.app.tenwa.calc.LC_EBANK; -import jbo.app.tenwa.calc.LC_EBANK_TEMP; -import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; -import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP; -import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.JBOException; -import com.amarsoft.are.jbo.JBOFactory; - -public class IsNullCheck { - private String EBANK_SN; - private String flowUnid; - - public String getCustomerId() throws JBOException{ - List boRent=JBOFactory.createBizObjectQuery(LC_RENT_INCOME_TEMP.CLASS_NAME, "FLOWUNID='"+flowUnid+"' group by CONTRACT_ID").getResultList(false); - List boFund=JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME, "FLOWUNID='"+flowUnid+"' group by CONTRACT_ID").getResultList(false); - String contractId=""; - if(boRent.size()==1&&boFund.size()==1){ - contractId = boRent.get(0).getAttribute("CONTRACT_ID").toString(); - String contractId2 = boFund.get(0).getAttribute("CONTRACT_ID").toString(); - if(contractId!=""&&contractId!=null&&contractId.equals(contractId2)){ - - }else{ - return "N"; - } - } - if((boRent.size()+boFund.size())==1){ - if(boRent.size()==1){ - contractId = boRent.get(0).getAttribute("CONTRACT_ID").toString(); - } - if(boFund.size()==1){ - contractId = boFund.get(0).getAttribute("CONTRACT_ID").toString(); - } - } - if(contractId!=""&&contractId!=null){ - BizObject boC = JBOFactory.createBizObjectQuery(LB_UNION_LESSEE.CLASS_NAME, "CONTRACT_ID='"+contractId+"' and is_main='Y'").getSingleResult(false); - String customerId = boC.getAttribute("CUSTOMER_ID").toString(); - String customerName = boC.getAttribute("CUSTOMER_NAME").toString(); - return customerId+"@"+customerName; - } - - return "N"; - - } - - public String CustomerIdIsNullCheck() throws JBOException{ - BizObject bo=JBOFactory.createBizObjectQuery(LC_EBANK.CLASS_NAME, "EBANK_SN='"+EBANK_SN+"'").getSingleResult(false); - if(bo!=null&&bo.getAttribute("CUSTOMER_ID")!=null){ - String customerId = bo.getAttribute("CUSTOMER_ID").toString(); - if(customerId==null||"".equals(customerId)){ - return "Y"; - }else{ - return "N"; - } - } - return "error"; - } - - public String CustomerIdIsNullCheckTemp() throws JBOException{ - BizObject bo=JBOFactory.createBizObjectQuery(LC_EBANK_TEMP.CLASS_NAME, "FLOWUNID='"+flowUnid+"'").getSingleResult(false); - if(bo!=null&&bo.getAttribute("CUSTOMER_ID")!=null){ - String customerId = bo.getAttribute("CUSTOMER_ID").toString(); - if(customerId==null||"".equals(customerId)){ - return "Y"; - }else{ - return "N"; - } - } - return "error"; - } - - public String getFlowUnid() { - return flowUnid; - } - - public void setFlowUnid(String flowUnid) { - this.flowUnid = flowUnid; - } - - public String getEBANK_SN() { - return EBANK_SN; - } - - public void setEBANK_SN(String eBANK_SN) { - EBANK_SN = eBANK_SN; - } -} diff --git a/src_tenwa/com/tenwa/gps/GpsController.java b/src_tenwa/com/tenwa/gps/GpsController.java index 97632fc28..5c88508bb 100644 --- a/src_tenwa/com/tenwa/gps/GpsController.java +++ b/src_tenwa/com/tenwa/gps/GpsController.java @@ -169,8 +169,7 @@ public class GpsController { * 天易--根据车架号查询工单 * @throws Exception */ - public boolean queryOrderToVin(Transaction Sqlca){ - try{ + public boolean queryOrderToVin(Transaction Sqlca) throws Exception { String url = GPSConfigure.get("TYQueryOrderToVin"); System.err.println("***************天易--根据车架号查询工单URL*****************"); @@ -200,10 +199,6 @@ public class GpsController { logMap.put("CALL_STATUS",resultMap.get("status")); GpsCommon.callRecord(logMap, Sqlca); return GpsCommon.tyQueryToVinDataPersistence(data,Sqlca); - }catch(Exception e){ - e.printStackTrace(); - return false; - } } diff --git a/src_tenwa/com/tenwa/gps/HttpClientSUtil.java b/src_tenwa/com/tenwa/gps/HttpClientSUtil.java index fabcb2237..9200fab41 100644 --- a/src_tenwa/com/tenwa/gps/HttpClientSUtil.java +++ b/src_tenwa/com/tenwa/gps/HttpClientSUtil.java @@ -198,6 +198,7 @@ public class HttpClientSUtil { } url = builder.build().toString(); } + System.out.println("天易URL地址=" + url); //创建HPPTGet对象 HttpGet get = new HttpGet(url); @@ -210,7 +211,6 @@ public class HttpClientSUtil { Map resultMap = new HashMap(); resultMap.put("data",EntityUtils.toString(response.getEntity(),"UTF-8")); resultMap.put("status",String.valueOf(response.getStatusLine().getStatusCode())); - System.err.println(resultMap); return resultMap; } } diff --git a/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoSelect.java b/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoSelect.java deleted file mode 100644 index 515f1ed20..000000000 --- a/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoSelect.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.tenwa.handler; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import jbo.app.tenwa.calc.LC_CALC_CONDITION; -import jbo.app.tenwa.calc.LC_FUND_INCOME; -import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP; - -import com.amarsoft.app.util.ProductParamUtil; -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.jbo.JBOTransaction; -import com.amarsoft.awe.dw.handler.impl.CommonHandler; -import com.amarsoft.dict.als.cache.CodeCache; -import com.amarsoft.dict.als.object.Item; - -public class LCFundPaymentTempInfoSelect extends CommonHandler { - @Override - protected void initDisplayForEdit(BizObject bo) throws Exception { - String productId = this.asPage.getParameter("ProductId"); - String ContractId = this.asPage.getParameter("ContractId"); - System.out.print(ContractId); - - //获取坐扣项 - Map> params = ProductParamUtil.getProductComponentType(productId, "PRD0315"); - List deductFeeType = new ArrayList(); - for(Entry> feeTypes : params.entrySet()) { - if(!feeTypes.getValue().containsKey("isBalance")) { - continue; - } - String isBalance = feeTypes.getValue().get("isBalance"); - if("yes".equals(isBalance)) { - deductFeeType.add(feeTypes.getKey()); - } - } - - Item[] items = CodeCache.getItems("FeeType"); - String fundList = ""; - for(Item item : items) { - for(String feetype : deductFeeType) { - if(feetype.equals(item.getRelativeCode())) { - if(fundList.length() != 0) { - fundList += ","; - } - fundList += "'" + item.getItemNo() + "'"; - break; - } - } - } - if(fundList==null||"".equals(fundList)){ - fundList="0"; - } - //安鹏贴息不抵扣 - //北汽的有的产品可以贴息差额放款 - /*if(fundList.length() > 0) { - fundList += ","; - } - fundList += "'feetype27'";*/ - - @SuppressWarnings("unchecked") - List boLFITs = JBOFactory.createBizObjectQuery(LC_CALC_CONDITION.CLASS_NAME, - "SELECT o.CONTRACT_ID,lf.FACT_MONEY,O.CLEAN_LEASE_MONEY,O.HANDLING_CHARGE_MONEY,O.CAUTION_MONEY,o.GPS_FEE,lf.fee_type FROM o LEFT JOIN jbo.app.tenwa.calc.LC_FUND_INCOME lf ON o.PROJECT_ID=lf.PROJECT_ID where o.CONTRACT_ID = '" + ContractId + "' and lf.fee_type in (" + fundList + ") ").getResultList(false); - BigDecimal cleanLeaseMoney = new BigDecimal("0"); - cleanLeaseMoney = cleanLeaseMoney.add(new BigDecimal(bo.getAttribute("CLEAN_LEASE_MONEY").getString())); - for(BizObject boLFIT : boLFITs) { - BigDecimal factMoney = new BigDecimal(boLFIT.getAttribute("FACT_MONEY").getString()); - String feeType = boLFIT.getAttribute("FEE_TYPE").getString(); - if(factMoney.compareTo(BigDecimal.ZERO) > 0) { - switch(feeType) { - case "feetype1": - cleanLeaseMoney = cleanLeaseMoney.subtract(factMoney); - bo.setAttributeValue("HANDLING_CHARGE_MONEY", factMoney); - this.asDataObject.setVisible("HANDLING_CHARGE_MONEY", true); - break; - case "feetype2": - cleanLeaseMoney = cleanLeaseMoney.subtract(factMoney); - bo.setAttributeValue("CAUTION_MONEY", factMoney); - this.asDataObject.setVisible("CAUTION_MONEY", true); - break; - case "feetype24": - cleanLeaseMoney = cleanLeaseMoney.subtract(factMoney); - bo.setAttributeValue("GPS_FEE", factMoney); - this.asDataObject.setVisible("GPS_FEE", true); - break; - case "feetype27": - cleanLeaseMoney = cleanLeaseMoney.add(factMoney); - bo.setAttributeValue("DEALER_DISCOUNT", factMoney); - this.asDataObject.setVisible("DEALER_DISCOUNT", true); - break; - } - - } - } - bo.setAttributeValue("FACT_MONEY", cleanLeaseMoney); - } -} diff --git a/src_tenwa/com/tenwa/httpclient/PyConfig.java b/src_tenwa/com/tenwa/httpclient/PyConfig.java index ee9e4cef8..f8e123a30 100644 --- a/src_tenwa/com/tenwa/httpclient/PyConfig.java +++ b/src_tenwa/com/tenwa/httpclient/PyConfig.java @@ -27,10 +27,11 @@ public class PyConfig { // 请求内容样本文件，实际中可使用具体对象组装 public final static String QUERY_XML_FILE = "d:/sample.xml"; - - public final static String KEYSTORE_FILE = "D1:/tenwaWork/apzl/08年度2019鹏元/03执行/01接口文档资料/鹏元测试证书/pytest.jks"; + public static final String KEYSTORE_FILE = "C:/Users/luojian/Desktop/安鹏/接口/01接口文档资料/鹏元测试证书/pytest.jks"; +// public final static String KEYSTORE_FILE = "D1:/tenwaWork/apzl/08年度2019鹏元/03执行/01接口文档资料/鹏元测试证书/pytest.jks"; public final static String KEYSTORE_PASSWORD = "123456"; - public final static String TRUSTSTORE_FILE = "D1:/tenwaWork/apzl/08年度2019鹏元/03执行/01接口文档资料/鹏元测试证书/pytest2.jks"; + public static final String TRUSTSTORE_FILE = "C:/Users/luojian/Desktop/安鹏/接口/01接口文档资料/鹏元测试证书/pytest2.jks"; +// public final static String TRUSTSTORE_FILE = "D1:/tenwaWork/apzl/08年度2019鹏元/03执行/01接口文档资料/鹏元测试证书/pytest2.jks"; public final static String TRUSTSTORE_PASSWORD = "123456"; public final static String AES_KEY = ""; diff --git a/src_tenwa/com/tenwa/httpclient/PyUtils.java b/src_tenwa/com/tenwa/httpclient/PyUtils.java index a8d73d54a..4e7988eb3 100644 --- a/src_tenwa/com/tenwa/httpclient/PyUtils.java +++ b/src_tenwa/com/tenwa/httpclient/PyUtils.java @@ -62,7 +62,6 @@ public class PyUtils { //正式环境经过前置nginx转发后https就变为了http请求，所以webservice wsdl中的https地址做一次替换为http操作 theString = theString.replaceAll("https://www.pycredit.com:8443", "http://www.pycredit.com:8443"); //theString = theString.replaceAll("https://test.pycredit.com:6443", "http://www.pycredit.com:6443"); - System.out.println("转换后的wsdl:" + theString); client = new Client(new ByteArrayInputStream(theString.getBytes()), null); // client = new Client(conn.getInputStream(), null); diff --git a/src_tenwa/com/tenwa/httpclient/controller/BigDataController.java b/src_tenwa/com/tenwa/httpclient/controller/BigDataController.java index 77b3f18a9..3cf13a2b7 100644 --- a/src_tenwa/com/tenwa/httpclient/controller/BigDataController.java +++ b/src_tenwa/com/tenwa/httpclient/controller/BigDataController.java @@ -106,7 +106,7 @@ public class BigDataController { return htmlFile == null ? "" : htmlFile; } System.out.println("==================" + table + "@" + type + "获取数据===================="); - String result = this.getQueryReport(params, type,CurPage.getAttribute("SubjectId").toString()); + String result = this.getQueryReport(params, type); System.err.println(result); System.out.println("==================" + table + "@" + type + "获取数据===================="); @@ -181,7 +181,7 @@ public class BigDataController { } System.out.println("==================" + table + "@" + type + "获取数据===================="); - String xmlResult = this.getQueryReport(params, type,CurPage.getAttribute("SubjectId").toString()); + String xmlResult = this.getQueryReport(params, type); System.out.println("==================" + table + "@" + type + "获取数据===================="); String xmlPath = HttpClientUtil.queryReport(xmlResult, type, fileSavePath + "xml" + File.separator + applyId + File.separator); @@ -865,41 +865,25 @@ public class BigDataController { return toUpperCase ? key.toUpperCase() : key; } - public String getQueryReport(Map params, String type, String SubjectId) throws Exception { + public String getQueryReport(Map params, String type) throws Exception { System.out.println("========================鹏元请求参数=================="); System.out.println(params); String queryCondition = HttpClientUtil.getQueryCondition(params); System.out.println(queryCondition); - Object[] para =null; - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - para = new Object[]{ - BigDataPropertiesUtil.get("t_userId"), - BigDataPropertiesUtil.get("t_password"), - queryCondition, - type}; - }else { - para = new Object[]{ - BigDataPropertiesUtil.get("userId"), - BigDataPropertiesUtil.get("password"), - queryCondition, - type}; - } + Object[] para = { + BigDataPropertiesUtil.get("userId"), + BigDataPropertiesUtil.get("password"), + queryCondition, + type}; System.out.println(para); System.out.println("========================鹏元请求参数=================="); String result = ""; try{ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - result = PyUtils.requestApi( - BigDataPropertiesUtil.get("t_pengyuanUrl")+BigDataPropertiesUtil.get("t_pengyuanServer"), - BigDataPropertiesUtil.get("t_methodType"), - para); - }else{ - result = PyUtils.requestApi( - BigDataPropertiesUtil.get("pengyuanUrl")+BigDataPropertiesUtil.get("pengyuanServer"), - BigDataPropertiesUtil.get("methodType"), - para); - } + result = PyUtils.requestApi( + BigDataPropertiesUtil.get("pengyuanUrl")+BigDataPropertiesUtil.get("pengyuanServer"), + BigDataPropertiesUtil.get("methodType"), + para); System.out.println(result); } catch(Exception e) { e.printStackTrace(); diff --git a/src_tenwa/com/tenwa/httpclient/resources/WechatPropertiesUtil.java b/src_tenwa/com/tenwa/httpclient/resources/WechatPropertiesUtil.java deleted file mode 100644 index 352878476..000000000 --- a/src_tenwa/com/tenwa/httpclient/resources/WechatPropertiesUtil.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.tenwa.httpclient.resources; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URLDecoder; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -/** - * 1: 微信推送消息配置 - */ -public class WechatPropertiesUtil { - private static String CONFIG_FILE_NAME = "/Wechat.properties"; - private static final Map configMap = new HashMap(); - public static String getConfigValue(String propertyName) { - if (0 == configMap.size()) { - FileInputStream fis = null; - try { - fis = new FileInputStream(URLDecoder.decode(Thread.currentThread().getContextClassLoader().getResource(CONFIG_FILE_NAME).getFile(),"UTF-8")); - Properties pro = new Properties(); - pro.load(fis); - for (Object key : pro.keySet()) { - String valString = pro.get(key).toString().trim(); - String keyString = key.toString(); - configMap.put(keyString, valString); - } - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - if (null != fis) { - fis.close(); - fis = null; - } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return configMap.get(propertyName); - } - public static void main(String[] args) { - System.out.println(WechatPropertiesUtil.getConfigValue("WechatMenuURL")); - } -} diff --git a/src_tenwa/com/tenwa/lease/app/carbrand/CarBrandService.java b/src_tenwa/com/tenwa/lease/app/carbrand/CarBrandService.java index 813b869c1..9d88f7df5 100644 --- a/src_tenwa/com/tenwa/lease/app/carbrand/CarBrandService.java +++ b/src_tenwa/com/tenwa/lease/app/carbrand/CarBrandService.java @@ -1,5 +1,8 @@ package com.tenwa.lease.app.carbrand; +import java.io.BufferedReader; +import java.util.List; + import org.apache.log4j.Logger; import jbo.app.LB_CAR_BRAND; @@ -84,7 +87,7 @@ public class CarBrandService { public String loadDefaultBrandSeries(JBOTransaction txs)throws Exception { String sql="select O.INTERFACEID, O.SERIESNAME from O left join "+LB_CAR_BRAND.CLASS_NAME+" car on O.BRANDID=car.id where O.ISSHOW='Y' and car.INTERFACTID=:BRANDID order by sortno"; - Listcars=JBOFactory.createBizObjectQuery(LB_CAR_BRANDSERIES.CLASS_NAME, sql).setParameter("BRANDID", this.getBrandId()).getResultList(false); + Listcars=JBOFactory.createBizObjectQuery("jbo.LB_CAR_BRANDSERIES", sql).setParameter("BRANDID", this.getBrandId()).getResultList(false); JSONObject jsonCars = JSONObject.createArray(); for(BizObject car:cars){ JSONObject jsonCar=JSONObject.createObject(); diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java index 67f5a6718..7a0ef4d1c 100644 --- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java +++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java @@ -110,8 +110,6 @@ public class EbankUse { String ownnumber = ""; // 银行名称 String OWN_BANK = ""; - // 本方账户 - String OWN_ACCOUNT = ""; // 科目编码 String EBANK_SUBJECTS = ""; // 流水号 @@ -139,8 +137,6 @@ public class EbankUse { ownnumber = bo.getAttribute("ownacc_number").getString(); // 网银流水号 EBANK_SN=bo.getAttribute("EBANK_SN").getString(); - // 本方账户 - OWN_ACCOUNT=bo.getAttribute("OWN_ACCOUNT").getString(); // 根据银行名称获取银行科目 BizObject lsc=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME, "SUBJECTS_NAME='"+OWN_BANK+"'").getSingleResult(false); EBANK_SUBJECTS=lsc.getAttribute("SUBJECTS_CODE").getString(); @@ -177,7 +173,6 @@ public class EbankUse { param.put("FACT_DATE", fact_date); param.put("ACC_NUMBER", ownnumber); param.put("EBANK_SN", EBANK_SN); - param.put("OWN_ACCOUNT", OWN_ACCOUNT); param.put("EBANK_SUBJECTS", EBANK_SUBJECTS); // 根据客商类型判断现金流编码 @@ -244,8 +239,6 @@ public class EbankUse { String EBANK_SUBJECTS = ""; // 流水号 String EBANK_SN=""; - // 本方账户 - String OWN_ACCOUNT = ""; // 业务类型 String BUSINESS_TYPE=""; // 客商类型 @@ -269,8 +262,6 @@ public class EbankUse { ownnumber = bo.getAttribute("ownacc_number").getString(); // 网银流水号 EBANK_SN=bo.getAttribute("EBANK_SN").getString(); - // 本方账户 - OWN_ACCOUNT=bo.getAttribute("OWN_ACCOUNT").getString(); // 根据银行名称获取银行科目 BizObject lsc=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME, "SUBJECTS_NAME='"+OWN_BANK+"'").getSingleResult(false); EBANK_SUBJECTS=lsc.getAttribute("SUBJECTS_CODE").getString(); @@ -307,7 +298,6 @@ public class EbankUse { param.put("FACT_DATE", fact_date); param.put("ACC_NUMBER", ownnumber); param.put("EBANK_SN", EBANK_SN); - param.put("OWN_ACCOUNT", OWN_ACCOUNT); param.put("EBANK_SUBJECTS", EBANK_SUBJECTS); // 根据客商类型判断现金流编码 diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java b/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java index 30cd84e43..e59084a79 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java @@ -1,19 +1,10 @@ package com.tenwa.lease.app.quartzmession; -import java.util.ArrayList; import java.util.List; -import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP; -import jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST; -import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN; -import jbo.sys.FLOW_OBJECT; - import org.quartz.Job; -import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; -import org.quartz.JobKey; -import org.quartz.Trigger; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOException; @@ -38,42 +29,14 @@ public class AutoBuckle implements Job { // tx = JBOFactory.createJBOTransaction(); //and (O.rent<>'' or O.rent<>'0' or O.rent<>'0.0') - List bos = JBOFactory.getBizObjectManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME, tx).createQuery("O.COLLECT_STATUS IN ('未收款', '部分收款','代偿') and O.PLAN_DATE <= '"+plan_date+"' and ( O.BATCH_STATUS<>'process' or o.BATCH_STATUS IS NULL ) and O.distributor_id not in (select dealers_number from DEDUCTIONS_WAY where Whether_to_enable='Y') ").getResultList(true); - List bol = JBOFactory.createBizObjectQuery(LC_OCCUPY_RENT_LIST.CLASS_NAME,"FLOW_NAME in ('网银收款','微信银联收款','微信支付收款')").getResultList(false); - //获取租金占用表里的数据有哪些是网银收款占用的 - List planIDs = new ArrayList(); - if(bol.size()>0){ - for(int i=0;i bof = JBOFactory.createBizObjectQuery(LC_RENT_INCOME_TEMP.CLASS_NAME,"FLOWUNID=:flowunid").setParameter("flowunid", flowunid).getResultList(false); - if(bof.size()>0){ - for(int j=0;j bos = JBOFactory.getBizObjectManager("jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN", tx).createQuery("O.COLLECT_STATUS IN ('未收款', '部分收款','代偿') and O.PLAN_DATE <= '" + plan_date + "' and ( O.BATCH_STATUS<>'process' or o.BATCH_STATUS IS NULL ) ").getResultList(true); + + StringBuffer ids = new StringBuffer(); if(bos.size()>0){ - a:for(BizObject bo : bos){ - String pid = bo.getAttribute("id").getString(); - if(planIDs.size()>0){ - for(int i=0;i>>>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<动态池明细数据跑批定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<动态池明细数据跑批定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } -} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/DynamicPoolTotalRunBatch.java b/src_tenwa/com/tenwa/lease/app/quartzmession/DynamicPoolTotalRunBatch.java deleted file mode 100644 index 8be4c3367..000000000 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/DynamicPoolTotalRunBatch.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.tenwa.lease.app.quartzmession; - -import java.text.SimpleDateFormat; -import java.util.Date; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import com.amarsoft.are.jbo.JBOException; -import com.amarsoft.awe.util.Transaction; - - -/** - * 1:动态池数总表跑批 - * @author xiezhiwen - */ -public class DynamicPoolTotalRunBatch implements Job{ - private static final Logger logger = LogManager.getLogger(DynamicPoolTotalRunBatch.class);// 引入logger日志 - - public void execute(JobExecutionContext arg0) throws JobExecutionException { - Transaction Sqlca=null; - try{ - Sqlca = Transaction.createTransaction("als"); - String create_time = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss").format(new Date()); - // 删除当月跑批记录 - String deleteSql="DELETE FROM LV_DYNAMIC_POOL_TOTAL WHERE DATE_FORMAT(CREATE_TIME,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m')"; - Sqlca.executeSQL(deleteSql); - // 将当月跑批数据插入静态池表 - String insertSql="INSERT INTO LV_DYNAMIC_POOL_TOTAL(SELECT REPLACE(UUID(), '-', '') AS ID,DATE_FORMAT(NOW(),'%Y/%m/%d') AS F1,SUM(IFNULL(LRP1.QB_LOAN_SURPLUS_MONEY,0.00)) AS F2,SUM(IFNULL(LRP2.ZC_LOAN_SURPLUS_MONEY,0.00)) AS F3,SUM(CASE WHEN VOC1.CONTRACT_ID IS NOT NULL THEN IFNULL(LRP1.QB_LOAN_SURPLUS_MONEY,0.00) ELSE 0 END) AS F4,SUM(CASE WHEN VOC2.CONTRACT_ID IS NOT NULL THEN IFNULL(LRP1.QB_LOAN_SURPLUS_MONEY,0.00) ELSE 0 END) AS F5,SUM(CASE WHEN VOC3.CONTRACT_ID IS NOT NULL THEN IFNULL(LRP1.QB_LOAN_SURPLUS_MONEY,0.00) ELSE 0 END) AS F6,SUM(CASE WHEN VOC4.CONTRACT_ID IS NOT NULL THEN IFNULL(LRP1.QB_LOAN_SURPLUS_MONEY,0.00) ELSE 0 END) AS F7,SUM(CASE WHEN VOC5.CONTRACT_ID IS NOT NULL THEN IFNULL(LRP1.QB_LOAN_SURPLUS_MONEY,0.00) ELSE 0 END) AS F8,SUM(CASE WHEN VOC6.CONTRACT_ID IS NOT NULL THEN IFNULL(LRP1.QB_LOAN_SURPLUS_MONEY,0.00) ELSE 0 END) AS F9,SUM(CASE WHEN VOC7.CONTRACT_ID IS NOT NULL THEN IFNULL(LRP1.QB_LOAN_SURPLUS_MONEY,0.00) ELSE 0 END) AS F10,DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') AS CREATE_TIME FROM (SELECT CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype10' AND EBANK_STATUS = '05' GROUP BY CONTRACT_ID) LFI LEFT JOIN (SELECT LRP.CONTRACT_ID,SUM(LRP.CORPUS)-SUM(IFNULL(LRI.CORPUS,0)) AS QB_LOAN_SURPLUS_MONEY FROM (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS,SUM(IFNULL(PENALTY,0)) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID)LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID GROUP BY LRP.CONTRACT_ID)LRP1 ON LRP1.CONTRACT_ID=LFI.CONTRACT_ID LEFT JOIN (SELECT LRP.CONTRACT_ID,SUM(LRP.CORPUS)-SUM(IFNULL(LRI.CORPUS,0)) AS ZC_LOAN_SURPLUS_MONEY FROM LC_RENT_PLAN LRP LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST WHERE DATE_FORMAT(LRP.PLAN_DATE,'%Y/%m/%d')>=DATE_FORMAT(NOW(),'%Y/%m/%d') AND LRP.CORPUS-IFNULL(LRI.CORPUS,0)<>0 AND NOT EXISTS(SELECT 1 FROM VI_OVERDUE_CONTRACT VOC WHERE VOC.CONTRACT_ID=LRP.CONTRACT_ID)GROUP BY LRP.CONTRACT_ID)LRP2 ON LRP2.CONTRACT_ID=LFI.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MAX(OVERDUE_DAY) AS OVERDUE_DAY FROM VI_OVERDUE_CONTRACT WHERE OVERDUE_DAY BETWEEN 1 AND 30 GROUP BY CONTRACT_ID)VOC1 ON VOC1.CONTRACT_ID=LRP1.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MAX(OVERDUE_DAY) AS OVERDUE_DAY FROM VI_OVERDUE_CONTRACT WHERE OVERDUE_DAY BETWEEN 31 AND 60 GROUP BY CONTRACT_ID)VOC2 ON VOC2.CONTRACT_ID=LRP1.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MAX(OVERDUE_DAY) AS OVERDUE_DAY FROM VI_OVERDUE_CONTRACT WHERE OVERDUE_DAY BETWEEN 61 AND 90 GROUP BY CONTRACT_ID)VOC3 ON VOC3.CONTRACT_ID=LRP1.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MAX(OVERDUE_DAY) AS OVERDUE_DAY FROM VI_OVERDUE_CONTRACT WHERE OVERDUE_DAY BETWEEN 91 AND 120 GROUP BY CONTRACT_ID)VOC4 ON VOC4.CONTRACT_ID=LRP1.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MAX(OVERDUE_DAY) AS OVERDUE_DAY FROM VI_OVERDUE_CONTRACT WHERE OVERDUE_DAY BETWEEN 121 AND 150 GROUP BY CONTRACT_ID)VOC5 ON VOC5.CONTRACT_ID=LRP1.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MAX(OVERDUE_DAY) AS OVERDUE_DAY FROM VI_OVERDUE_CONTRACT WHERE OVERDUE_DAY BETWEEN 151 AND 180 GROUP BY CONTRACT_ID)VOC6 ON VOC6.CONTRACT_ID=LRP1.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MAX(OVERDUE_DAY) AS OVERDUE_DAY FROM VI_OVERDUE_CONTRACT WHERE OVERDUE_DAY>180 GROUP BY CONTRACT_ID)VOC7 ON VOC7.CONTRACT_ID=LRP1.CONTRACT_ID ) "; - int con = Sqlca.executeSQL(insertSql); - Sqlca.commit(); - logger.info("动态池汇总数据跑批成功,《《《条数："+con+"《《《《时间:"+create_time+"《《《"+insertSql); - }catch(Exception e){ - logger.info("<<<<<<<<<<<<<<<<<<<<<<动态池汇总数据跑批定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<动态池汇总数据跑批定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<动态池汇总数据跑批定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } -} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/StaticDataRunBatch.java b/src_tenwa/com/tenwa/lease/app/quartzmession/StaticDataRunBatch.java deleted file mode 100644 index 6c1772ee5..000000000 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/StaticDataRunBatch.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.tenwa.lease.app.quartzmession; - -import java.text.SimpleDateFormat; -import java.util.Date; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import com.amarsoft.are.jbo.JBOException; -import com.amarsoft.awe.util.Transaction; - -/** - * 每月跑批静态池数据 - * @author xiezhiwen - */ -public class StaticDataRunBatch implements Job{ - private static final Logger logger = LogManager.getLogger(StaticDataRunBatch.class);// 引入logger日志 - - public void execute(JobExecutionContext arg0) throws JobExecutionException { - Transaction Sqlca=null; - try{ - // Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - Sqlca = Transaction.createTransaction("als"); - String create_time = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss").format(new Date()); - String deleteSql="DELETE FROM LV_STATIC_POOL WHERE DATE_FORMAT(CREATE_TIME,'%Y/%m')=DATE_FORMAT(NOW(),'%Y/%m')"; - Sqlca.executeSQL(deleteSql); - // 将当月跑批数据插入静态池表 - String insertSql="INSERT INTO LV_STATIC_POOL (SELECT REPLACE(UUID(),'-',''),LFI.FACT_DATE AS F1,B1.REPORT_MONTH AS F2,CASE WHEN LFI.FACT_DATE = DATE_FORMAT(NOW(), '%Y/%m') THEN IFNULL(LFI.NEW_CORPUS, 0.00) ELSE '0.00' END AS F3,CASE WHEN LFI.FACT_DATE = DATE_FORMAT(NOW(), '%Y/%m') THEN IFNULL(LFI.NEW_CORPUS_SUM,0) ELSE '0' END AS F4,IFNULL(LFI.YMWCBJ, 0.00) AS F5,IFNULL(LFI.OVER_CON, 0) AS F6,IFNULL(LFI.ZCDKYE, 0.00) AS F7,IFNULL(LFI.YQ_1_30_MONEY, 0.00) AS F8,IFNULL(LFI.YQ_1_30_SUM, 0) AS F9,IFNULL(LFI.YQ_31_60_MONEY, 0.00) AS F10,IFNULL(LFI.YQ_31_60_SUM, 0) AS F11,IFNULL(LFI.YQ_61_90_MONEY, 0.00) AS F12,IFNULL(LFI.YQ_61_90_SUM, 0) AS F13,IFNULL(LFI.YQ_91_120_MONEY, 0.00) AS F14,IFNULL(LFI.YQ_91_120_SUM, 0) AS F15,IFNULL(LFI.YQ_121_150_MONEY, 0.00) AS F16,IFNULL(LFI.YQ_121_150_SUM, 0) AS F17,IFNULL(LFI.YQ_151_180_MONEY, 0.00) AS F18,IFNULL(LFI.YQ_151_180_SUM, 0) AS F19,IFNULL(LFI.YQ_180_MONEY, 0.00) AS F20,IFNULL(LFI.YQ_180_SUM, 0) AS F21,IFNULL(LFI.YNBJHSK, 0.00) AS F22,IFNULL(LFI.YNBFZCJE, 0.00) AS F23,IFNULL(LFI.YNQBZCJE, 0.00) AS F24,IFNULL(LFI.XNBJCHJE, 0.00) AS F25,'0.00' AS F26,'0.00' AS F27,'0.00' AS F28,IFNULL(LFI.DYHSKZE, 0.00) AS F29,'0.00' AS F30,'"+create_time+"' AS CREATE_TIME FROM (SELECT DATE_FORMAT(NOW(), '%Y/%m') AS REPORT_MONTH FROM DUAL)B1 LEFT JOIN (SELECT DATE_FORMAT(LFI.FACT_DATE, '%Y/%m') FACT_DATE,SUM(IFNULL(LRP.CORPUS, 0)) AS NEW_CORPUS,SUM(IFNULL(LRP.CORPUS, 0)) - SUM(IFNULL(LRI.CORPUS, 0)) AS YMWCBJ,COUNT(LFI.CONTRACT_ID) AS NEW_CORPUS_SUM,COUNT(LCI.ID) AS OVER_CON,SUM(LRP2.CORPUS) AS ZCDKYE,SUM(IFNULL(LRP3.YQ_1_30_MONEY, 0.00)) AS YQ_1_30_MONEY,SUM(IFNULL(LRP3.YQ_1_30_SUM, 0)) AS YQ_1_30_SUM,SUM(IFNULL(LRP4.YQ_31_60_MONEY, 0.00)) AS YQ_31_60_MONEY,SUM(IFNULL(LRP4.YQ_31_60_SUM, 0)) AS YQ_31_60_SUM,SUM(IFNULL(LRP5.YQ_61_90_MONEY, 0.00)) AS YQ_61_90_MONEY,SUM(IFNULL(LRP5.YQ_61_90_SUM, 0)) AS YQ_61_90_SUM,SUM(IFNULL(LRP6.YQ_91_120_MONEY, 0.00)) AS YQ_91_120_MONEY,SUM(IFNULL(LRP6.YQ_91_120_SUM, 0)) AS YQ_91_120_SUM,SUM(IFNULL(LRP7.YQ_121_150_MONEY, 0.00)) AS YQ_121_150_MONEY,SUM(IFNULL(LRP7.YQ_121_150_SUM, 0)) AS YQ_121_150_SUM,SUM(IFNULL(LRP8.YQ_151_180_MONEY, 0.00)) AS YQ_151_180_MONEY,SUM(IFNULL(LRP8.YQ_151_180_SUM, 0)) AS YQ_151_180_SUM,SUM(IFNULL(LRP9.YQ_180_MONEY, 0.00)) AS YQ_180_MONEY,SUM(IFNULL(LRP9.YQ_180_SUM, 0)) AS YQ_180_SUM,SUM(IFNULL(LRP10.YNBJHSK, 0.00)) AS YNBJHSK,SUM(IFNULL(LRI2.YNBFZCJE, 0.00)) AS YNBFZCJE,SUM(IFNULL(LFRA.YNQBZCJE, 0.00)) AS YNQBZCJE,SUM(IFNULL(LRI3.XNBJCHJE, 0.00)) AS XNBJCHJE,SUM(IFNULL(LRI4.DYHSKZE, 0.00)) AS DYHSKZE FROM (SELECT CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype10' AND EBANK_STATUS = '05' GROUP BY CONTRACT_ID) LFI LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = LFI.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME WHERE DATE_FORMAT(HIRE_DATE,'%Y/%m')<=DATE_FORMAT(NOW(),'%Y/%m') GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT ID FROM LB_CONTRACT_INFO WHERE (CONTRACT_STATUS = '31' OR (CONTRACT_STATUS = '100' AND EXISTS(SELECT 1 FROM LC_FUND_RENT_ADJUST WHERE DATE_FORMAT(PAYDAY_ADJUST,'%Y/%m')>DATE_FORMAT(NOW(),'%Y/%m')))) GROUP BY ID ) LCI ON LCI.ID = LFI.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN LRP WHERE NOT EXISTS (SELECT 1 FROM VI_OVERDUE_CONTRACT VOC WHERE VOC.CONTRACT_ID = LRP.CONTRACT_ID) AND LRP.PLAN_DATE >= DATE_FORMAT(NOW(), '%Y/%m/%d') GROUP BY LRP.CONTRACT_ID) LRP2 ON LRP2.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT VOC.CONTRACT_ID,SUM(IFNULL(LRP.CORPUS, 0)) - SUM(IFNULL(LRI.CORPUS, 0)) AS YQ_1_30_MONEY,COUNT(VOC.CONTRACT_ID) AS YQ_1_30_SUM FROM VI_OVERDUE_CONTRACT VOC LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = VOC.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID WHERE VOC.OVERDUE_DAY BETWEEN 1 AND 30 GROUP BY VOC.CONTRACT_ID) LRP3 ON LRP3.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT VOC.CONTRACT_ID,SUM(IFNULL(LRP.CORPUS, 0)) - SUM(IFNULL(LRI.CORPUS, 0)) AS YQ_31_60_MONEY,COUNT(VOC.CONTRACT_ID) AS YQ_31_60_SUM FROM VI_OVERDUE_CONTRACT VOC LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = VOC.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID WHERE VOC.OVERDUE_DAY BETWEEN 31 AND 60 GROUP BY VOC.CONTRACT_ID) LRP4 ON LRP4.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT VOC.CONTRACT_ID,SUM(IFNULL(LRP.CORPUS, 0)) - SUM(IFNULL(LRI.CORPUS, 0)) AS YQ_61_90_MONEY,COUNT(VOC.CONTRACT_ID) AS YQ_61_90_SUM FROM VI_OVERDUE_CONTRACT VOC LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = VOC.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID WHERE VOC.OVERDUE_DAY BETWEEN 61 AND 90 GROUP BY VOC.CONTRACT_ID) LRP5 ON LRP5.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT VOC.CONTRACT_ID,SUM(IFNULL(LRP.CORPUS, 0)) - SUM(IFNULL(LRI.CORPUS, 0)) AS YQ_91_120_MONEY,COUNT(VOC.CONTRACT_ID) AS YQ_91_120_SUM FROM VI_OVERDUE_CONTRACT VOC LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = VOC.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID WHERE VOC.OVERDUE_DAY BETWEEN 91 AND 120 GROUP BY VOC.CONTRACT_ID) LRP6 ON LRP6.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT VOC.CONTRACT_ID,SUM(IFNULL(LRP.CORPUS, 0)) - SUM(IFNULL(LRI.CORPUS, 0)) AS YQ_121_150_MONEY,COUNT(VOC.CONTRACT_ID) AS YQ_121_150_SUM FROM VI_OVERDUE_CONTRACT VOC LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = VOC.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID WHERE VOC.OVERDUE_DAY BETWEEN 121 AND 150 GROUP BY VOC.CONTRACT_ID) LRP7 ON LRP7.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT VOC.CONTRACT_ID,SUM(IFNULL(LRP.CORPUS, 0)) - SUM(IFNULL(LRI.CORPUS, 0)) AS YQ_151_180_MONEY,COUNT(VOC.CONTRACT_ID) AS YQ_151_180_SUM FROM VI_OVERDUE_CONTRACT VOC LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = VOC.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID WHERE VOC.OVERDUE_DAY BETWEEN 151 AND 180 GROUP BY VOC.CONTRACT_ID) LRP8 ON LRP8.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT VOC.CONTRACT_ID,SUM(IFNULL(LRP.CORPUS, 0)) - SUM(IFNULL(LRI.CORPUS, 0)) AS YQ_180_MONEY,COUNT(VOC.CONTRACT_ID) AS YQ_180_SUM FROM VI_OVERDUE_CONTRACT VOC LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = VOC.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID WHERE VOC.OVERDUE_DAY > 180 GROUP BY VOC.CONTRACT_ID) LRP9 ON LRP9.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(CORPUS) AS YNBJHSK FROM LC_RENT_PLAN WHERE DATE_FORMAT(PLAN_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') GROUP BY CONTRACT_ID) LRP10 ON LRP10.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT LRI.CONTRACT_ID,SUM(LRI.CORPUS) AS YNBFZCJE FROM(SELECT CONTRACT_ID,PLAN_LIST,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME WHERE DATE_FORMAT(HIRE_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') GROUP BY CONTRACT_ID,PLAN_LIST) LRI LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRI.CONTRACT_ID AND LRP.PLAN_LIST = LRI.PLAN_LIST WHERE DATE_FORMAT(LRP.PLAN_DATE, '%Y/%m') > DATE_FORMAT(NOW(), '%Y/%m') GROUP BY LRI.CONTRACT_ID) LRI2 ON LRI2.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT LFRA.CONTRACT_ID,SUM(IFNULL(LRI2.CORPUS, 0))-SUM(IFNULL(HIS.CORPUS, 0)) AS YNQBZCJE FROM LC_FUND_RENT_ADJUST LFRA LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID) LRI ON LRI.CONTRACT_ID = LFRA.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,HIRE_DATE,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,HIRE_DATE) LRI2 ON LRI2.CONTRACT_ID = LRI.CONTRACT_ID AND DATE_FORMAT(LRI2.HIRE_DATE,'%Y/%m')=DATE_FORMAT(LRI.HIRE_DATE,'%Y/%m') LEFT JOIN (SELECT CONTRACT_ID,PLAN_DATE,SUM(CORPUS) AS CORPUS FROM LC_RENT_PLAN_HIS GROUP BY CONTRACT_ID,PLAN_DATE)HIS ON HIS.CONTRACT_ID=LRI2.CONTRACT_ID AND DATE_FORMAT(HIS.PLAN_DATE,'%Y/%m')=DATE_FORMAT(LRI2.HIRE_DATE,'%Y/%m') WHERE DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') GROUP BY LFRA.CONTRACT_ID) LFRA ON LFRA.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT LRP.CONTRACT_ID,SUM(IFNULL(LRI.CORPUS, 0.00)) AS XNBJCHJE FROM(SELECT CONTRACT_ID,PLAN_LIST,SUM(CORPUS) AS CORPUS FROM LC_RENT_INCOME WHERE DATE_FORMAT(HIRE_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') GROUP BY CONTRACT_ID,PLAN_LIST) LRI LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRI.CONTRACT_ID AND LRP.PLAN_LIST = LRI.PLAN_LIST WHERE DATE_FORMAT(LRP.PLAN_DATE, '%Y/%m') < DATE_FORMAT(NOW(), '%Y/%m') GROUP BY LRP.CONTRACT_ID) LRI3 ON LRI3.CONTRACT_ID = LRP.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(IFNULL(CORPUS, 0)) AS DYHSKZE FROM LC_RENT_INCOME WHERE DATE_FORMAT(HIRE_DATE, '%Y/%m') = DATE_FORMAT(NOW(), '%Y/%m') GROUP BY CONTRACT_ID) LRI4 ON LRI4.CONTRACT_ID = LRP.CONTRACT_ID GROUP BY DATE_FORMAT(LFI.FACT_DATE, '%Y/%m')) LFI ON LFI.FACT_DATE <= B1.REPORT_MONTH)"; - int con = Sqlca.executeSQL(insertSql); - Sqlca.commit(); - logger.info("静态池数据跑批成功,《《《条数："+con+"《《《《时间:"+create_time+"《《《"+insertSql); - }catch(Exception e){ - logger.info("<<<<<<<<<<<<<<<<<<<<<<静态池数据跑批定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<静态池数据跑批定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<静态池数据跑批定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } -} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java b/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java deleted file mode 100644 index c17d1d44e..000000000 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java +++ /dev/null @@ -1,284 +0,0 @@ -package com.tenwa.lease.app.quartzmession; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.UUID; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import com.alibaba.fastjson.JSONObject; -import com.amarsoft.are.jbo.JBOException; -import com.amarsoft.awe.util.ASResultSet; -import com.amarsoft.awe.util.SqlObject; -import com.amarsoft.awe.util.Transaction; -import com.amarsoft.dict.als.cache.CacheLoaderFactory; -import com.tenwa.httpclient.resources.WechatPropertiesUtil; -import com.tenwa.util.SerialNumberUtil; - -/** - * 1:微信公众号信息推送 - * @author xiezhiwen - */ -public class WechatMessagePush implements Job{ - private static final Logger logger = LogManager.getLogger(WechatMessagePush.class);// 引入logger日志 - - public void execute(JobExecutionContext arg0) throws JobExecutionException { - Transaction Sqlca=null; - try{ - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - // 执行还款消息推送 - String result1 = RefundRemindPush(Sqlca); - String result2 = OverdueRefundRemindPush(Sqlca); - Sqlca.commit(); - - logger.info("还款提醒发送状态<<<<<<<<<<<<<: "+result1); - logger.info("逾期还款提醒发送状态<<<<<<<<<<: "+result2); - }catch(Exception e){ - logger.info("<<<<<<<<<<<<<<<<<<<<<<微信推送定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<微信推送定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<微信推送定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * 1: 还款提醒发送 - * @return - * @throws Exception - */ - public String RefundRemindPush(Transaction Sqlca) throws Exception { - // 定义全局对象 - String contract_number=null;// 合同名称 - String customer_num=null; // 客户编码 - String cust_name=null; // 客户名称 - String plan_list=null; // 客户名称 - String mobile=null; // 手机号 - String contract_id=null; // 合同id - String customer_id=null; // 客户id - String openid=null; // 微信标识 - String link=null; // 详情链接 - String type="1"; // 类型 - String keyword1=null;// 还款日期 - String keyword2=null;// 还款期次 - String keyword3=null;// 还款金额 - String keyword4=null;// - String uuid=null; // 记录表id - String first="尊敬的客户您好，本期还款信息如下：";// 内容头 - String remark="请您在还款日前完成还款，感谢您的支持与配合，祝您生活愉快！";// 备注 - String updSql=""; - String insertSql=""; - String msgid =null; - String result="推送成功"; - String batch=SerialNumberUtil.getWechatBatchNumber(Sqlca); - int con=0; - - // 查询所有需要发送还款提醒的数据 - String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT('第', LRP.PLAN_LIST, '期') KEYWORD2,CONCAT(LRP.RENT, '元') KEYWORD3 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LCI.ID WHERE WUI.BINDING_STATUS = 'Y' AND (TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) <=3 AND TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) >=0) AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '1' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') LIMIT 0, 50000 "; - ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); - - while(rs.next()) { - // 获取接口推送所需数据 - con++; - uuid = UUID.randomUUID().toString().replace("-", ""); - openid=rs.getString("openid"); - link=rs.getString("link"); - keyword1=rs.getString("keyword1"); - keyword2=rs.getString("keyword2"); - keyword3=rs.getString("keyword3"); - contract_number=rs.getString("contract_number"); - customer_num=rs.getString("customer_num"); - cust_name=rs.getString("cust_name"); - mobile=rs.getString("mobile_"); - plan_list=rs.getString("plan_list"); - contract_id=rs.getString("contract_id"); - customer_id=rs.getString("customerid"); - - // 查寻当条是否是历史失败的 - selSql="SELECT openid FROM wechat_message_record WHERE OPENID='"+openid+"' AND CONTRACT_NUMBER='"+contract_number+"' AND PLAN_LIST='"+plan_list+"' AND SEND_TYPE='1'"; - ASResultSet rs1 = Sqlca.getASResultSet(new SqlObject(selSql)); - - if(!rs1.next()) { - insertSql="INSERT INTO WECHAT_MESSAGE_RECORD(ID,BATCH,OPENID,CONTRACT_NUMBER,CUSTOMER_NUM,CUST_NAME,PLAN_LIST,MODILE,SEND_DATE,SEND_TYPE,SEND_CONTENT,SEND_STATUS,CONTRACT_ID,CUSTOMER_ID) VALUES('"+uuid+"',CONCAT('"+batch+"','-','"+con+"'),'"+openid+"','"+contract_number+"','"+customer_num+"','"+cust_name+"','"+plan_list+"','"+mobile+"',DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'),'1',CONCAT('"+first+"','还款日期： ','"+keyword1+"','，还款期数： ','"+keyword2+"','，还款金额： ','"+keyword3+"',', ','"+remark+"'),'N','"+contract_id+"','"+customer_id+"')"; - Sqlca.executeSQL(new SqlObject(insertSql)); - } - try { - msgid = WechatMessagePush.WechatPush(openid,link,type,first,keyword1,keyword2,keyword3,keyword4,remark); - System.out.println(con); - } catch (Exception e) { - result="推送失败"; - e.printStackTrace(); - } - // 成功改状态, 失败改时间 - if(msgid!=null) { - updSql="UPDATE wechat_message_record SET MSGID='"+msgid+"',SEND_DATE=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'),SEND_STATUS='Y' WHERE OPENID='"+openid+"' AND CONTRACT_NUMBER='"+contract_number+"' AND PLAN_LIST='"+plan_list+"' AND SEND_TYPE='1'"; - Sqlca.executeSQL(new SqlObject(updSql)); - }else { - result="推送失败"; - updSql="UPDATE wechat_message_record SET SEND_DATE=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'),SEND_STATUS='N' WHERE OPENID='"+openid+"' AND CONTRACT_NUMBER='"+contract_number+"' AND PLAN_LIST='"+plan_list+"' AND SEND_TYPE='1'"; - Sqlca.executeSQL(new SqlObject(updSql)); - } - } - return result+String.valueOf(con); - } - - /** - * 2: 逾期 还款提醒发送 - * @return - * @throws Exception - */ - public String OverdueRefundRemindPush(Transaction Sqlca) throws Exception { - // 定义全局对象 - String contract_number=null;// 合同名称 - String customer_num=null; // 客户编码 - String cust_name=null; // 客户名称 - String plan_list=null; // 客户名称 - String mobile=null; // 手机号 - String contract_id=null; // 合同id - String customer_id=null; // 客户id - String openid=null; // 微信标识 - String link=null; // 详情链接 - String type="2"; // 类型 - String keyword1=null; // 还款日期 - String keyword2=null; // 应还金额 - String keyword3=null; // 逾期金额 - String keyword4=null; // 罚息金额 - String uuid=null; // 记录表id - String first="亲爱的用户您好，您本期应还金额尚未归还，以下是您的账单信息："; // 内容头 - String remark="您已逾期，逾期会产生利息并影响您的个人信用。为了更好地维护您的相关权益，请尽快还款。如需协商 ,请联系客服。"; // 备注 - String updSql=""; - String insertSql=""; - String msgid =null; - String result="推送成功"; - String batch=SerialNumberUtil.getWechatBatchNumber(Sqlca); - int con=0; - - // 查询所有需要发送还款提醒的数据 - String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty (LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,DATE_FORMAT(NOW(), '%y/%m/%d')),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT-IFNULL(LRI.RENT,0)), '元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty (LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,DATE_FORMAT(NOW(), '%y/%m/%d')),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY,0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST)LRP ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY,0)) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST WHERE WUI.BINDING_STATUS='Y' AND (IFNULL(LRP.RENT,0)+IFNULL(LRP.PENALTY,0)-IFNULL(LRI.RENT,0)-IFNULL(LRI.PENALTY,0))<>0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE='2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0,50000 "; - ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); - // 循环, 逐条发送 - while(rs.next()) { - con++; - // 获取接口推送所需数据 - uuid = UUID.randomUUID().toString().replace("-", ""); - openid=rs.getString("openid"); - link=rs.getString("link"); - keyword1=rs.getString("keyword1"); - keyword2=rs.getString("keyword2"); - keyword3=rs.getString("keyword3"); - keyword4=rs.getString("keyword4"); - contract_number=rs.getString("contract_number"); - customer_num=rs.getString("customer_num"); - cust_name=rs.getString("cust_name"); - mobile=rs.getString("mobile_"); - plan_list=rs.getString("plan_list"); - contract_id=rs.getString("contract_id"); - customer_id=rs.getString("customerid"); - - // 查寻当条是否是历史失败的 - selSql="SELECT openid FROM wechat_message_record WHERE OPENID='"+openid+"' AND CONTRACT_NUMBER='"+contract_number+"' AND PLAN_LIST='"+plan_list+"' AND SEND_TYPE='1'"; - ASResultSet rs1 = Sqlca.getASResultSet(new SqlObject(selSql)); - - if(!rs1.next()) { - insertSql="INSERT INTO WECHAT_MESSAGE_RECORD(ID,BATCH,OPENID,CONTRACT_NUMBER,CUSTOMER_NUM,CUST_NAME,PLAN_LIST,MODILE,SEND_DATE,SEND_TYPE,SEND_CONTENT,SEND_STATUS,CONTRACT_ID,CUSTOMER_ID) VALUES('"+uuid+"',CONCAT('"+batch+"','-','"+con+"'),'"+openid+"','"+contract_number+"','"+customer_num+"','"+cust_name+"','"+plan_list+"','"+mobile+"',DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'),'2',CONCAT('"+first+"','还款日期： ','"+keyword1+"','，还款金额： ','"+keyword2+"','，逾期金额： ','"+keyword3+"','，罚息金额： ','"+keyword4+"','，','"+remark+"'),'N','"+contract_id+"','"+customer_id+"')"; - Sqlca.executeSQL(new SqlObject(insertSql)); - } - try { - msgid = WechatMessagePush.WechatPush(openid,link,type,first,keyword1,keyword2,keyword3,keyword4,remark); - System.out.println(con); - } catch (Exception e) { - result="推送失败"; - e.printStackTrace(); - } - // 成功改状态, 失败改时间 - if(msgid!=null) { - updSql="UPDATE wechat_message_record SET MSGID='"+msgid+"',SEND_DATE=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'),SEND_STATUS='Y' WHERE OPENID='"+openid+"' AND CONTRACT_NUMBER='"+contract_number+"' AND PLAN_LIST='"+plan_list+"' AND SEND_TYPE='2'"; - Sqlca.executeSQL(new SqlObject(updSql)); - }else { - result="推送失败"; - updSql="UPDATE wechat_message_record SET SEND_DATE=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'),SEND_STATUS='N' WHERE OPENID='"+openid+"' AND CONTRACT_NUMBER='"+contract_number+"' AND PLAN_LIST='"+plan_list+"' AND SEND_TYPE='2'"; - Sqlca.executeSQL(new SqlObject(updSql)); - } - } - return result+String.valueOf(con); - } - - /** - * 3: 调用消息推送接口 - */ - public synchronized static String WechatPush(String openid,String link,String type,String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark) throws Exception { - String strURL = WechatPropertiesUtil.getConfigValue("WechatURL"); - URL url = new URL(strURL); - HttpURLConnection httpConn = (HttpURLConnection) url.openConnection(); - httpConn.setDoOutput(true); - httpConn.setDoInput(true); - httpConn.setRequestProperty("Content-Type", "application/json"); - httpConn.setRequestMethod("POST"); - httpConn.connect(); - OutputStreamWriter out = new OutputStreamWriter(httpConn.getOutputStream(), "UTF-8"); - - // 发送请求参数 - JSONObject json = new JSONObject(); - json.put("openid", openid);// 微信的uuid - json.put("type", type);// 推送类型 - json.put("link", link);// 推送详情的连接,绑定成功的推送参数为空 - JSONObject data = new JSONObject(); - data.put("first", first);// 推送的头部 - data.put("keyword1", keyword1);// 关键字1 - data.put("keyword2", keyword2);// 关键字2 - data.put("keyword3", keyword3);// 关键字3 - data.put("keyword4", keyword4);// 关键字4 - data.put("remark", remark);// 备注 - json.put("data", data); - - out.write(json.toString()); - out.flush(); - out.close(); - - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader(httpConn.getInputStream())); - } catch (Exception e) { - e.printStackTrace(); - logger.info("<<<<<<<<<<<<<<<获取回执信息失败>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<获取回执信息失败>>>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<获取回执信息失败>>>>>>>>>>>>>>>>>>>"); - throw new Exception("推送失败!"); - } - String line; - StringBuffer buffer = new StringBuffer(); - while ((line = reader.readLine()) != null) { - buffer.append(line); - } - reader.close(); - httpConn.disconnect(); - - logger.info("微信接口返回信息" + buffer.toString()); - JSONObject resultjson = JSONObject.parseObject(buffer.toString()); - String msgid = null; - if (resultjson.get("errcode").toString().equals("0")) {// 推送成功 - msgid = resultjson.get("msgid").toString(); - } else {// 推送失败 - throw new Exception("推送失败"); - } - return msgid; - } -} diff --git a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java index 73e8292f2..c9ea03b95 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBInitContractStatusBusiness.java @@ -1,24 +1,22 @@ package com.tenwa.lease.flow.contract.commbusiness; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; - import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.util.StringFunction; import com.amarsoft.awe.util.Transaction; import com.tenwa.flow.baseBussion.BaseBussiness; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; + public class LBInitContractStatusBusiness extends BaseBussiness { @Override public Object run(Transaction Sqlca) throws Exception { this.initBussinessParam(Sqlca); - String endTime = StringFunction.getTodayNow(); String contractId=this.getAttribute("ContractId").toString(); String contractStatus=this.getAttribute("ContractStatus").toString(); BizObjectManager bom=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME); Sqlca.join(bom); - bom.createQuery("update O set CONTRACT_STATUS=:contractstatus,ACTUAL_END_DATE=:ACTUAL_END_DATE where id=:contractid").setParameter("contractstatus", contractStatus).setParameter("ACTUAL_END_DATE", endTime).setParameter("contractid",contractId).executeUpdate(); + bom.createQuery("update O set CONTRACT_STATUS=:contractstatus where id=:contractid").setParameter("contractstatus", contractStatus).setParameter("contractid", contractId).executeUpdate(); String sMessage="true"; return sMessage; } diff --git a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java index e975b5edd..a89fa54f9 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java @@ -1,12 +1,8 @@ package com.tenwa.lease.flow.contract.contractapproval; -import java.util.HashMap; -import java.util.Map; import java.util.UUID; -import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; - import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.BizObjectQuery; @@ -15,6 +11,8 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.tenwa.flow.action.comm.BaseFlowStartAction; import com.tenwa.util.SerialNumberUtil; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; + /** * 合同审批初始化 * @author jyshen @@ -34,9 +32,8 @@ public class ContractApprovalStartAction extends BaseFlowStartAction{ String productid=bo.getAttribute("PRODUCT_ID").getString(); String deptid=bo.getAttribute("PROJECT_DEPT").getString(); String area_code=bo.getAttribute("AREA_CODE").getString(); - String subjectid=bo.getAttribute("subjectid").getString(); String contractno=""; - String dept="BQAP("; + String dept=""; /* if(deptid.equals("8000900020001")){//cx dept+="cx"; @@ -64,11 +61,6 @@ public class ContractApprovalStartAction extends BaseFlowStartAction{ }else{//回租 dept+="H"; } - if("d989246c11c111eaaa0000163e0e11e6".equals(subjectid)){ - dept+=")TJ"; - }else{ - dept+=")SZ"; - } contractno=SerialNumberUtil.getContractSerialNaumber(dept,area_code, tx); // } this.FlowParam.put("ContractNo", contractno); diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java index a47659aa1..e59c1a4d7 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java @@ -44,7 +44,6 @@ public class CustomerInfoCheck { private String id; private String projectNo; private String FULLNAME; - private String SubjectId; public String getFULLNAME() { return FULLNAME; @@ -78,13 +77,6 @@ public class CustomerInfoCheck { this.custname = custname; } - public String getSubjectId() { - return SubjectId; - } - - public void setSubjectId(String subjectId) { - SubjectId = subjectId; - } public String checkName(JBOTransaction tx) throws JBOException{//校验姓名是否存在 if(customerType.equals("03")){//自然人 @@ -495,17 +487,5 @@ public class CustomerInfoCheck { } return "false"; } - //根据当前系统时间获取主题id和名称 - public String selectTitleName(JBOTransaction tx){ - try { - BizObjectManager ciManage = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME, tx); - BizObject ci = ciManage.createQuery(" codeno='ManySubject' and itemno=:SubjectId ").setParameter("SubjectId", SubjectId).getSingleResult(false); - return ci == null ? "error@没有查询符合要求的多主体！":"success@"+ci.getAttribute("itemname").toString(); - } catch (JBOException e) { - e.printStackTrace(); - return "error@系统异常！"; - - } - } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/BusinessApplicationPfToTemp.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/BusinessApplicationPfToTemp.java deleted file mode 100644 index 10c668004..000000000 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/BusinessApplicationPfToTemp.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.tenwa.lease.flow.project.commbusiness; - -import jbo.sys.CODE_LIBRARY; -import jbo.sys.PF_CUSTOMER_ADDRESS; -import jbo.sys.PF_CUSTOMER_FAMILY; -import jbo.sys.PF_CUSTOMER_PERSON; -import jbo.sys.PF_PROJECT_INFO; -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.tenwa.flow.baseBussion.BaseBussiness; - -/** - * 业务申请接口平台初始化数据 - */ -public class BusinessApplicationPfToTemp extends BaseBussiness { - - /**自然人客户基本信息 - * @throws Exception - * @throws JBOException */ - public static void savePerson(BizObject boCRT,String serial) throws Exception{ - BizObject customerBo = JBOFactory.createBizObjectQuery(PF_CUSTOMER_PERSON.CLASS_NAME,"SERIAL=:serial").setParameter("serial",serial).getSingleResult(false); - boCRT.setAttributeValue("mobile",customerBo.getAttribute("mobile").toString()); - boCRT.setAttributeValue("LICENSENAME",customerBo.getAttribute("LICENSENAME").toString()); - boCRT.setAttributeValue("Mailing_Address",customerBo.getAttribute("Mailing_Address").toString()); - boCRT.setAttributeValue("NATIVEPLACE",customerBo.getAttribute("NATIVEPLACE").toString()); - boCRT.setAttributeValue("MARRIAGE",customerBo.getAttribute("MARRIAGE").toString()); - boCRT.setAttributeValue("POPULATION",customerBo.getAttribute("POPULATION").toString()); - boCRT.setAttributeValue("childrens_number",customerBo.getAttribute("childrens_number").toString()); - boCRT.setAttributeValue("EDUEXPERIENCE",customerBo.getAttribute("EDUEXPERIENCE").toString()); - boCRT.setAttributeValue("Property_type",customerBo.getAttribute("Property_type").toString()); - boCRT.setAttributeValue("WORKCORP",customerBo.getAttribute("WORKCORP").toString()); - boCRT.setAttributeValue("WORKADD",customerBo.getAttribute("WORKADD").toString()); - boCRT.setAttributeValue("WORKTEL",customerBo.getAttribute("WORKTEL").toString()); - boCRT.setAttributeValue("ENTRYTIME",customerBo.getAttribute("ENTRYTIME").toString()); - boCRT.setAttributeValue("Unit_nature",customerBo.getAttribute("Unit_nature").toString()); - boCRT.setAttributeValue("main_income",customerBo.getAttribute("main_income").toString()); - boCRT.setAttributeValue("FAMILYMONTHINCOME",customerBo.getAttribute("FAMILYMONTHINCOME").toString()); - boCRT.setAttributeValue("EMERGENCY_CONTACT_PERSON",customerBo.getAttribute("EMERGENCY_CONTACT_PERSON").toString()); - boCRT.setAttributeValue("EMPLOYRECORD",customerBo.getAttribute("EMPLOYRECORD").toString()); - boCRT.setAttributeValue("EMERGENCY_CONTACT_TEL",customerBo.getAttribute("EMERGENCY_CONTACT_TEL").toString()); - boCRT.setAttributeValue("INTRO",customerBo.getAttribute("INTRO").toString()); - boCRT.setAttributeValue("EDUDEGREE",customerBo.getAttribute("EDUDEGREE").toString()); - boCRT.setAttributeValue("REMARK",customerBo.getAttribute("REMARK").toString()); - } - - /**法人客户基本信息 - * @throws Exception - * @throws JBOException */ - public static void saveCompany(BizObject boCRT,String serial) throws Exception{ - BizObject customerBo = JBOFactory.createBizObjectQuery(PF_CUSTOMER_PERSON.CLASS_NAME,"SERIAL=:serial").setParameter("serial",serial).getSingleResult(false); - boCRT.setAttributeValue("company_name",customerBo.getAttribute("company_name").toString()); - boCRT.setAttributeValue("enterprisename",customerBo.getAttribute("enterprisename").toString()); - boCRT.setAttributeValue("custkind",customerBo.getAttribute("custkind").toString()); - boCRT.setAttributeValue("certid",customerBo.getAttribute("certid").toString()); - boCRT.setAttributeValue("provincecode",customerBo.getAttribute("provincecode").toString()); - boCRT.setAttributeValue("citycode",customerBo.getAttribute("citycode").toString()); - boCRT.setAttributeValue("registercapital",customerBo.getAttribute("registercapital").toString()); - boCRT.setAttributeValue("establish_date",customerBo.getAttribute("establish_date").toString()); - boCRT.setAttributeValue("reg_address",customerBo.getAttribute("reg_address").toString()); - boCRT.setAttributeValue("operat_address",customerBo.getAttribute("operat_address").toString()); - boCRT.setAttributeValue("tel",customerBo.getAttribute("tel").toString()); - boCRT.setAttributeValue("wealth_name",customerBo.getAttribute("wealth_name").toString()); - boCRT.setAttributeValue("wealth_tel",customerBo.getAttribute("wealth_tel").toString()); - boCRT.setAttributeValue("company_tel",customerBo.getAttribute("company_tel").toString()); - boCRT.setAttributeValue("business_income",customerBo.getAttribute("business_income").toString()); - boCRT.setAttributeValue("unit_properties",customerBo.getAttribute("unit_properties").toString()); - } - - /**自然人客户居住地址 - * @throws Exception - * @throws JBOException */ - public static void saveCustomerAddress(BizObject boCA,String serial) throws Exception{ - BizObject caBo = JBOFactory.createBizObjectQuery(PF_CUSTOMER_ADDRESS.CLASS_NAME,"SERIAL=:serial").setParameter("serial",serial).getSingleResult(false); - BizObject clBo = JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"codeno='AreaCode' and itemno=:itemno").setParameter("itemno",caBo.getAttribute("province").toString()).getSingleResult(false); - boCA.setAttributeValue("addtype","0060"); - boCA.setAttributeValue("isadd","yes"); - boCA.setAttributeValue("isnew","yes"); - boCA.setAttributeValue("country","CHN"); - boCA.setAttributeValue("province",caBo.getAttribute("province").toString()); - boCA.setAttributeValue("dressdetail",caBo.getAttribute("dressdetail").toString()); - boCA.setAttributeValue("zipcode",caBo.getAttribute("zipcode").toString()); - boCA.setAttributeValue("FULLADDRESS",clBo.getAttribute("itemname").toString()+caBo.getAttribute("dressdetail").toString()); - } - - /** - * 自然人客户配偶信息 - */ - public static void saveSpouseInformation(BizObject boCFT,String serial) throws Exception{ - BizObject pcfBo = JBOFactory.createBizObjectQuery(PF_CUSTOMER_FAMILY.CLASS_NAME,"SERIAL=:serial and Spouse_='Y'").setParameter("serial",serial).getSingleResult(false); - boCFT.setAttributeValue("certtype",pcfBo.getAttribute("certtype").toString()); - boCFT.setAttributeValue("certid",pcfBo.getAttribute("certid").toString()); - boCFT.setAttributeValue("name",pcfBo.getAttribute("name").toString()); - boCFT.setAttributeValue("relative","01"); - boCFT.setAttributeValue("tel",pcfBo.getAttribute("tel").toString()); - boCFT.setAttributeValue("workunit",pcfBo.getAttribute("workunit").toString()); - boCFT.setAttributeValue("status","status"); - boCFT.setAttributeValue("Spouse_","Y"); - boCFT.setAttributeValue("Partner_",pcfBo.getAttribute("Partner_").toString()); - boCFT.setAttributeValue("shukou",pcfBo.getAttribute("shukou").toString()); - boCFT.setAttributeValue("suname",pcfBo.getAttribute("suname").toString()); - boCFT.setAttributeValue("suphone",pcfBo.getAttribute("suphone").toString()); - boCFT.setAttributeValue("sposition",pcfBo.getAttribute("sposition").toString()); - boCFT.setAttributeValue("smincome",pcfBo.getAttribute("smincome").toString()); - boCFT.setAttributeValue("SEX",pcfBo.getAttribute("SEX").toString()); - } - - /** - * 项目基本信息 - */ - public static void saveProjInfo(BizObject bo,String serial) throws Exception{ - BizObject ppiBo = JBOFactory.createBizObjectQuery(PF_PROJECT_INFO.CLASS_NAME,"SERIAL=:serial").setParameter("serial",serial).getSingleResult(false); - bo.setAttributeValue("inputName",ppiBo.getAttribute("inputName").toString()); - bo.setAttributeValue("inputTel",ppiBo.getAttribute("inputTel").toString()); - bo.setAttributeValue("IS_NETCAR",ppiBo.getAttribute("IS_NETCAR").toString()); - if("0".equals(ppiBo.getAttribute("IS_NETCAR").toString())) return ; - - bo.setAttributeValue("IS_OPERATION",ppiBo.getAttribute("IS_OPERATION").toString()); - bo.setAttributeValue("IS_AFFILIATED",ppiBo.getAttribute("IS_AFFILIATED").toString()); - bo.setAttributeValue("IS_OPERATION_QUALIFICATION",ppiBo.getAttribute("IS_OPERATION_QUALIFICATION").toString()); - bo.setAttributeValue("AFFILIATEDNAME",ppiBo.getAttribute("AFFILIATEDNAME").toString()); - bo.setAttributeValue("TRANSPORTCERTID",ppiBo.getAttribute("TRANSPORTCERTID").toString()); - bo.setAttributeValue("TRANSPORTDATE",ppiBo.getAttribute("TRANSPORTDATE").toString()); - bo.setAttributeValue("NETCERTID",ppiBo.getAttribute("NETCERTID").toString()); - bo.setAttributeValue("LEGALPERSONNAME",ppiBo.getAttribute("LEGALPERSONNAME").toString()); - bo.setAttributeValue("LEGALPERSONID",ppiBo.getAttribute("LEGALPERSONID").toString()); - bo.setAttributeValue("AFFILIATEDDATE",ppiBo.getAttribute("AFFILIATEDDATE").toString()); - bo.setAttributeValue("AFFILIATEDENDDATE",ppiBo.getAttribute("AFFILIATEDENDDATE").toString()); - bo.setAttributeValue("REGISTEREDMONEY",ppiBo.getAttribute("REGISTEREDMONEY").toString()); - bo.setAttributeValue("AFFILIATEDACTUALADDRESS",ppiBo.getAttribute("AFFILIATEDACTUALADDRESS").toString()); - bo.setAttributeValue("AFFILIATEDADDRESS",ppiBo.getAttribute("AFFILIATEDADDRESS").toString()); - } - - /**共同申请人 - * @param cftbo - * @param cftbom - * @param tx - * @param customerId */ - public static void savePartner(BizObject cftbo,BizObjectManager cftbom,String serial) throws Exception{ - BizObject pcfBo = JBOFactory.createBizObjectQuery(PF_CUSTOMER_FAMILY.CLASS_NAME,"SERIAL=:serial and Spouse_ IS NULL").setParameter("serial",serial).getSingleResult(false); - if(pcfBo==null)return; - - cftbo.setAttributeValue("name",pcfBo.getAttribute("name").toString()); - cftbo.setAttributeValue("ASSURE_RELATION",pcfBo.getAttribute("ASSURE_RELATION").toString()); - cftbo.setAttributeValue("certtype",pcfBo.getAttribute("certtype").toString()); - cftbo.setAttributeValue("certid",pcfBo.getAttribute("certid").toString()); - cftbo.setAttributeValue("SEX",pcfBo.getAttribute("SEX").toString()); - cftbo.setAttributeValue("tel",pcfBo.getAttribute("tel").toString()); - cftbo.setAttributeValue("Partner_",pcfBo.getAttribute("Partner_").toString()); - cftbo.setAttributeValue("shukou",pcfBo.getAttribute("shukou").toString()); - cftbo.setAttributeValue("suname",pcfBo.getAttribute("suname").toString()); - cftbo.setAttributeValue("suphone",pcfBo.getAttribute("suphone").toString()); - cftbo.setAttributeValue("smincome",pcfBo.getAttribute("smincome").toString()); - cftbo.setAttributeValue("sposition",pcfBo.getAttribute("sposition").toString()); - cftbo.setAttributeValue("workunit",pcfBo.getAttribute("workunit").toString()); - cftbom.saveObject(cftbo); - } -} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java index 9a29a63fb..58e319b57 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java @@ -103,7 +103,7 @@ public class CreateFiveGradeDataAction { newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.DEPOSITRATIO,BoDI.getAttribute("MARGIN_SCALE_SET")); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.AGREEMENT,BoDI.getAttribute("LIMIT_END_DATE")); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_FINANCING_AMOUNT,new BigDecimal(Double.parseDouble(FINANCING_AMOUNT_LOSS)+Double.parseDouble(FINANCING_AMOUNT_SUSPICIOUS)+Double.parseDouble(FINANCING_AMOUNT_SECONDARY)+Double.parseDouble(FINANCING_AMOUNT_ATTENTION)+Double.parseDouble(FINANCING_AMOUNT_NORMAL)).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); - newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.THE_REMAINING_AMOUNT,new BigDecimal(Double.parseDouble(BoDI.getAttribute("TOTAL").getString())-TOTAL_OUTSTANDING_PRINCIPAL).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.THE_REMAINING_AMOUNT, new BigDecimal(Double.parseDouble(BoDI.getAttribute("TOTAL").getString()) - (Double.parseDouble(this.FINANCING_AMOUNT_LOSS) + Double.parseDouble(this.FINANCING_AMOUNT_SUSPICIOUS) + Double.parseDouble(this.FINANCING_AMOUNT_SECONDARY) + Double.parseDouble(this.FINANCING_AMOUNT_ATTENTION) + Double.parseDouble(this.FINANCING_AMOUNT_NORMAL))).setScale(2, 4).toPlainString()); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_PRINCIPAL,new BigDecimal(TOTAL_OVERDUE_PRINCIPAL).setScale(2, BigDecimal.ROUND_HALF_UP)); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_INTEREST,new BigDecimal(TOTAL_OVERDUE_INTEREST).setScale(2, BigDecimal.ROUND_HALF_UP)); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java index d86466207..5644fe444 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java @@ -1,38 +1,21 @@ package com.tenwa.lease.flow.project.commbusiness; import java.util.HashMap; -import java.util.List; import java.util.Map; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_HIS; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP; -import jbo.app.tenwa.customer.CUSTOMER_FAMILY; -import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; -import jbo.app.tenwa.customer.CUSTOMER_PERSON; -import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; -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; -import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP; -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_UNION_LESSEE_TEMP; - import com.amarsoft.are.jbo.BizObject; import com.amarsoft.awe.util.Transaction; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; -import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; -import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; -import com.tenwa.lease.flow.project.businessapply.CustomerCompare; + +import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; +import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_HIS; +import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP; public class LBCustomerAccountChangeToFormalBusiness extends BaseBussiness{ @Override public Object run(Transaction Sqlca) throws Exception { this.initBussinessParam(Sqlca); - String status = "N";//默认签约状态 String flowunid = this.getAttribute("ObjectNo").toString(); //如果是扣款卡信息变更从正式表倒到临时表中 String flowname=(String)this.getAttribute("FlowName"); @@ -55,16 +38,15 @@ public class LBCustomerAccountChangeToFormalBusiness extends BaseBussiness{ fromCond.put("BANK_NAME", cat.getAttribute("BANK_NAME").getString()); fromCond.put("MOBILE", cat.getAttribute("MOBILE").getString()); fromCond.put("PROJECT_ID", this.getAttribute("ProjectId").toString()); - List cahs = DataOperatorUtil.getSetJBO(CUSTOMER_ACCOUNT_HIS.CLASS_NAME, fromCond, Sqlca); - for (BizObject cah : cahs) { - if("Y".equals(cah.getAttribute("SIGN_STATUS").getString())){ - status = "Y"; - break; - } + + BizObject cah = DataOperatorUtil.getSingleJBO("jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_HIS", fromCond, Sqlca); + if (cah == null) { + other.put("sign_status", "N"); + } else { + other.put("sign_status", cah.getAttribute("SIGN_STATUS").getString()); } } } - other.put(CUSTOMER_ACCOUNT.sign_status, status); Map fromCondtion = new HashMap(); fromCondtion.put("flowunid", flowunid); Map toCondtion = new HashMap(); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountFormalToChangeBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountFormalToChangeBusiness.java index 0bf805360..638b7823b 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountFormalToChangeBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountFormalToChangeBusiness.java @@ -23,7 +23,8 @@ public class LBCustomerAccountFormalToChangeBusiness extends BaseBussiness{ other.put("flowunid",flowunid); fromCondtion.put(CUSTOMER_ACCOUNT.contract_id, ContractId); DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, null, other, Sqlca); - DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT_HIS.CLASS_NAME, null, other, Sqlca); - return "true"; + + String sMessage = "true"; + return sMessage; } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountHisToFormal.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountHisToFormal.java deleted file mode 100644 index 5a5333670..000000000 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountHisToFormal.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.tenwa.lease.flow.project.commbusiness; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jbo.app.WECHAT_ADVANCE_SETTLE; -import jbo.app.WECHAT_BANKNUMBER_CHANGE; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_HIS; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP; -import jbo.app.tenwa.customer.CUSTOMER_FAMILY; -import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; -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; -import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP; -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_UNION_LESSEE_TEMP; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.util.Transaction; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; -import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; -import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; -import com.tenwa.lease.flow.project.businessapply.CustomerCompare; - -public class LBCustomerAccountHisToFormal extends BaseBussiness{ - @Override - public Object run(Transaction Sqlca) throws Exception { - this.initBussinessParam(Sqlca); - String flowunid = this.getAttribute("ObjectNo").toString(); - String flowName = this.getAttribute("FlowName").toString(); - String ContractId = this.getAttribute("ContractId").toString(); - Map fromCondtion = new HashMap(); - Map other = new HashMap(); - if("扣款信息变更审核".equals(flowName)){ - fromCondtion.put("flowunid",flowunid); - other.put(CUSTOMER_ACCOUNT.contract_id, ContractId); - DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT_HIS.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT.CLASS_NAME, other, null, Sqlca); - - BizObjectManager wbcMange = JBOFactory.getBizObjectManager(WECHAT_BANKNUMBER_CHANGE.CLASS_NAME,Sqlca); - BizObject wbc = wbcMange.createQuery("flowUnid=:flowUnid " ).setParameter("flowUnid", flowunid).getSingleResult(true); - if(wbc != null){ - wbc.setAttributeValue("flowStatus", "流程取消"); - wbc.setAttributeValue("flowUnid", ""); - wbcMange.saveObject(wbc); - } - }else if ("提前结清".equals(flowName)){ - BizObjectManager wasMange = JBOFactory.getBizObjectManager(WECHAT_ADVANCE_SETTLE.CLASS_NAME,Sqlca); - BizObject aws = wasMange.createQuery(" flowUnid=:flowUnid " ).setParameter("flowUnid", flowunid).getSingleResult(true); - if(aws != null){ - aws.setAttributeValue("flowStatus", "流程取消"); - aws.setAttributeValue("flowUnid", ""); - wasMange.saveObject(aws); - } - } - return "true"; - } -} diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java index 51129974a..102d623ed 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java @@ -48,7 +48,6 @@ public class LBCustomerRelaTempToFormalBusiness extends BaseBussiness { String certType = this.getAttribute("certtype").toString(); //String certId = this.getAttribute("certNo").toString(); String certId = this.getAttribute("certid").toString(); - String flowName = this.getAttribute("FlowName").toString(); BizObjectManager bomCT1 = JBOFactory.getBizObjectManager(CUSTOMER_CERT.CLASS_NAME,Sqlca); BizObjectManager bomCTT1 = JBOFactory.getBizObjectManager(CUSTOMER_TYPE.CLASS_NAME,Sqlca); //客户类型临时表 List boCT1 = bomCT1.createQuery("certtype='"+certType+"' and certid='"+certId+"'").getResultList(false); @@ -172,11 +171,9 @@ public class LBCustomerRelaTempToFormalBusiness extends BaseBussiness { //配偶信息不考虑存量客户 fromCondtion.clear(); fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); - otherProperty.clear(); - if("业务变更流程".equals(flowName)){ - otherProperty.put("project_id",this.getAttribute("ProjectId").toString()); - } - DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, null, otherProperty, null, Sqlca); + fromCondtion.put("project_id",this.getAttribute("ProjectId").toString()); + + DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, null, null, null, Sqlca); String sMessage="true"; return sMessage; } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java index 902521fc5..a02aeb136 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java @@ -38,7 +38,6 @@ public class LBProCustomerRelaTempToFormalBusiness extends BaseBussiness { @Override public Object run(Transaction Sqlca) throws Exception { this.initBussinessParam(Sqlca); - String flowName = this.getAttribute("FlowName").toString(); MapfromCondtion=new HashMap(); fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); List lults= DataOperatorUtil.getSetJBO(LB_UNION_LESSEE_TEMP.CLASS_NAME, fromCondtion, Sqlca); @@ -60,11 +59,8 @@ public class LBProCustomerRelaTempToFormalBusiness extends BaseBussiness { DataOperatorUtil.copyJBOSet(CUSTOMER_COMPANY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_COMPANY.CLASS_NAME, toCondtion, null, cc, Sqlca); } DataOperatorUtil.copyJBOSet(CUSTOMER_CERT_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_CERT.CLASS_NAME, toCondtion, null, cc, Sqlca); - DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS.CLASS_NAME, toCondtion, null, cc, Sqlca); - if("业务变更流程".equals(flowName)){ - toCondtion.put("project_id", this.getAttribute("ProjectId").toString()); - } DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, toCondtion, null, cc, Sqlca); + DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS.CLASS_NAME, toCondtion, null, cc, Sqlca); } String sMessage="true"; return sMessage; 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 c096542c6..1e2d2c131 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -325,8 +325,6 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { bo.setAttributeValue("source_type",this.getAttribute("sourcetype"));//申请类型 bo.setAttributeValue("HaveCommission",haveCommission); bo.setAttributeValue("is_netcar",isNetCar == null ? "" : isNetCar); - bo.setAttributeValue("subjectid",this.getAttribute("SubjectId")); - bo.setAttributeValue("subjectname",this.getAttribute("SubjectName")); bomLPI.saveObject(bo); }catch (Exception e){ tx.rollback(); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractBusiness.java index 4c3238198..d9948cc97 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractBusiness.java @@ -25,8 +25,6 @@ public class LBProjectIntoTempToContractBusiness extends BaseBussiness { // otherProperty.put("CONTRACT_NUMBER",this.getAttribute("ContractNo").toString()); otherProperty.put("Project_Id", this.getAttribute("ProjectId").toString()); - otherProperty.put("subjectid", this.getAttribute("SubjectId").toString()); - otherProperty.put("subjectname", this.getAttribute("SubjectName").toString()); service.copyOrLoadProjectInfoToContract(Sqlca, fromCondtion, null,otherProperty, ServiceOperatorEnum.FormalToTemp); String sMessage="true"; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/ClcNumberCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/ClcNumberCheck.java index aafbd28e2..ac9d113fd 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/ClcNumberCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/ClcNumberCheck.java @@ -18,12 +18,6 @@ public class ClcNumberCheck extends DefaultBussinessCheck { //自动获得传入的参数值 String flowunid=this.getAttribute("ObjectNo").toString();//获取流程编号 if(flowunid == null) flowunid = ""; - String productId = Sqlca.getString("select product_id from lb_project_info_temp where flowunid='"+flowunid+"'"); - if("currentProduct".equals(productId)){ - setPass(true); - putMsg("通用产品"); - return null; - } //定义变量 String sSql = ""; ASResultSet rs=null; diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java index 17e542f5f..8fc0043e7 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java @@ -33,7 +33,6 @@ public class IdentityVerification { private String relations; private String fullNames; private String customertype; - private String SubjectId; public String getFlowUnid() { return FlowUnid; @@ -83,14 +82,6 @@ public class IdentityVerification { this.customertype = customertype; } - public String getSubjectId() { - return SubjectId; - } - - public void setSubjectId(String subjectId) { - SubjectId = subjectId; - } - public String doIdentityVerification(JBOTransaction tx){ System.err.println(UserName+"@"+OrgName+"@"+FlowUnid); try { @@ -145,25 +136,21 @@ public class IdentityVerification { String inConditions = ""; //if("03".equals(borrowerResult.getAttribute("customertype").toString())){ if("03".equals(customertype)){ - inConditions = SoapRequest.FirstXMLConfiguration(borrowerResult,coborrowerResult,guarantorResultList,SubjectId); + inConditions = SoapRequest.FirstXMLConfiguration(borrowerResult,coborrowerResult,guarantorResultList); //}else if("01".equals(borrowerResult.getAttribute("customertype").toString())){ }else if("01".equals(customertype)){ if(coborrowerResult == null && guarantorResultList.size()<=0 ){ return "共同申请人与担保人信息都为空!"; }else{ - inConditions = SoapRequest.SecondXMLConfiguration(coborrowerResult,guarantorResultList,SubjectId); + inConditions = SoapRequest.SecondXMLConfiguration(coborrowerResult,guarantorResultList); } } System.err.println(inConditions); //读取授权文件 - String license = null; - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - license =ValidatePropertiesUtil.get("t_key"); - }else{ - license =ValidatePropertiesUtil.get("key"); - } + String license =ValidatePropertiesUtil.get("key"); + String decode = new String(new BASE64Decoder().decodeBuffer(license)); - String result = NciicClient.executeClient("NciicServices",decode,inConditions,SubjectId); + String result = NciicClient.executeClient("NciicServices",decode,inConditions); System.out.println("result:="+result); //使用Document解析返回的响应XML Document document = DocumentHelper.parseText(result); diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/NciicClient.java b/src_tenwa/com/tenwa/lease/flow/project/validate/NciicClient.java index 325c1e87b..0bb8bb2dd 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/validate/NciicClient.java +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/NciicClient.java @@ -1,9 +1,6 @@ package com.tenwa.lease.flow.project.validate; -import java.io.BufferedReader; -import java.io.File; import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; import java.lang.reflect.Proxy; import java.net.MalformedURLException; @@ -22,7 +19,6 @@ import org.codehaus.xfire.util.dom.DOMOutHandler; public class NciicClient { public static final String SERVICE_URL = "https://ws.nciic.org.cn:8084/nciic_ws/services/"; - public static final String T_SERVICE_URL = "https://ws.nciic.org.cn:8084/nciic_ws/services/"; /*public NciicClient() { }*/ @@ -39,15 +35,8 @@ public class NciicClient { e.printStackTrace(); } } - public static String executeClient(String serviceName, String license, String condition,String SubjectId) + public static String executeClient(String serviceName, String license, String condition) throws MalformedURLException { - String url = null ; - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - url = T_SERVICE_URL; - }else { - url = SERVICE_URL; - } - long time = System.currentTimeMillis(); //调用生产环境接口时，需要采用https ProtocolSocketFactory easy = new EasySSLProtocolSocketFactory(); @@ -57,7 +46,7 @@ public class NciicClient { Protocol.registerProtocol("https", protocol); //--核心服务NciicServices Service serviceModel = new ObjectServiceFactory().create(ServiceInf.class, serviceName, null, null); - ServiceInf service = (ServiceInf) new XFireProxyFactory().create(serviceModel, url + serviceName); + ServiceInf service = (ServiceInf) new XFireProxyFactory().create(serviceModel, "https://ws.nciic.org.cn:8084/nciic_ws/services/" + serviceName); Client client = ((XFireProxy) Proxy.getInvocationHandler(service)).getClient(); client.addOutHandler(new DOMOutHandler()); client.setProperty(CommonsHttpMessageSender.GZIP_ENABLED, Boolean.TRUE); diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/OnlineClient.java b/src_tenwa/com/tenwa/lease/flow/project/validate/OnlineClient.java index be6a9f45a..cb4dd1339 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/validate/OnlineClient.java +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/OnlineClient.java @@ -45,21 +45,11 @@ public class OnlineClient { private static String app_name =TelOnLineConfigure.get("com.tenwa.jianghd.app_name"); private static String biz_code = TelOnLineConfigure.get("com.tenwa.jianghd.biz_code"); - //天津参数 - private static String t_partner_code = TelOnLineConfigure.get("com.tenwa.jianghd.t_partner_code"); - private static String t_url1 = TelOnLineConfigure.get("com.tenwa.jianghd.t_url1"); - private static String t_url2 = TelOnLineConfigure.get("com.tenwa.jianghd.t_url2"); - private static String t_url3 = TelOnLineConfigure.get("com.tenwa.jianghd.t_url3"); - private static String T_ENCODING =TelOnLineConfigure.get("com.tenwa.jianghd.t_encode"); - private static String t_partner_key = TelOnLineConfigure.get("com.tenwa.jianghd.t_partner_key"); - private static String t_app_name =TelOnLineConfigure.get("com.tenwa.jianghd.t_app_name"); - private static String t_biz_code = TelOnLineConfigure.get("com.tenwa.jianghd.t_biz_code"); private String flowunid; private String projectId; private String userId; private String certids; - private String SubjectId; private String onLineId; public static void main(String[] org0) throws ClientProtocolException, IOException, URISyntaxException{ @@ -91,29 +81,18 @@ public class OnlineClient { // response2.close(); // } } - public static URI getUri(String subjectId) throws URISyntaxException{ - URI uri = null; - if("d989246c11c111eaaa0000163e0e11e6".equals(subjectId)){ - uri = URIUtils.createURI(t_url1, t_url2, -1, t_url3, - "partner_code="+t_partner_code+"&partner_key="+t_partner_key+"&app_name="+t_app_name, null); - }else{ - uri = URIUtils.createURI(url1, url2, -1, url3, + public static URI getUri() throws URISyntaxException{ + URI uri = URIUtils.createURI(url1, url2, -1, url3, "partner_code="+partner_code+"&partner_key="+partner_key+"&app_name="+app_name, null); - } - return uri; } public String postOnLine(String phone,String nextService,String onLineId) throws Exception{ CloseableHttpClient httpclient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost(getUri(SubjectId)); + HttpPost httpPost = new HttpPost(getUri()); List nvps = new ArrayList (); - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - nvps.add(new BasicNameValuePair("biz_code", t_biz_code)); - }else{ - nvps.add(new BasicNameValuePair("biz_code", biz_code)); - } + nvps.add(new BasicNameValuePair("biz_code", biz_code)); //重试 if("RETRY".equals(nextService)){ @@ -123,12 +102,7 @@ public class OnlineClient { //首发 nvps.add(new BasicNameValuePair("account_mobile", phone)); } - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - httpPost.setEntity(new UrlEncodedFormEntity(nvps,T_ENCODING)); - }else{ - httpPost.setEntity(new UrlEncodedFormEntity(nvps,ENCODING)); - - } + httpPost.setEntity(new UrlEncodedFormEntity(nvps,ENCODING)); CloseableHttpResponse response2 = httpclient.execute(httpPost); try { @@ -296,12 +270,6 @@ public class OnlineClient { public void setCertids(String certids) { this.certids = certids; } - public String getSubjectId() { - return SubjectId; - } - public void setSubjectId(String subjectId) { - SubjectId = subjectId; - } diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java index 4b51f9bdb..b16a08fac 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java @@ -6,16 +6,12 @@ import com.amarsoft.are.jbo.BizObject; public class SoapRequest { //自然人拼接请求XML方法 - public static String FirstXMLConfiguration(BizObject biz1,BizObject biz2,List bizList,String SubjectId) throws Exception { + public static String FirstXMLConfiguration(BizObject biz1,BizObject biz2,List bizList) throws Exception { StringBuffer sb = new StringBuffer(""); sb.append(""); sb.append(""); sb.append(""); - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - sb.append("安鹏天津国际融资租赁有限公司");//更新生成环境需要修改成天津 - }else { - sb.append("安鹏国际融资租赁有限公司"); - } + sb.append("安鹏国际融资租赁有限公司"); sb.append(""); sb.append(""); sb.append("公民身份号码"); @@ -23,11 +19,7 @@ public class SoapRequest { sb.append(""); //将申请人信息添加xml文件中 if(biz1!=null){ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - sb.append("");//更新生成环境需要修改成天津 - }else { - sb.append(""); - } + sb.append(""); //入参申请人身份证号码 sb.append(""+biz1.getAttribute("CERTID").getString()+""); //入参申请人姓名 @@ -36,11 +28,7 @@ public class SoapRequest { } //将共同申请人信息添加xml文件中 if(biz2!=null){ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - sb.append("");//更新生成环境需要修改成天津 - }else { - sb.append(""); - } + sb.append(""); //入参共同申请人身份证号码 sb.append(""+biz2.getAttribute("certid").getString()+""); //入参共同申请人姓名 @@ -50,11 +38,7 @@ public class SoapRequest { //将担保人信息添加xml文件中 if(bizList!=null && bizList.size()>0 ){ for(int i=0;i");//更新生成环境需要修改成天津 - }else { - sb.append(""); - } + sb.append(""); //入参共同申请人身份证号码 sb.append(""+bizList.get(i).getAttribute("CERTID").getString()+""); //入参共同申请人姓名 @@ -110,27 +94,19 @@ public class SoapRequest { return xmldata; } //法人拼接请求XML方法 - public static String SecondXMLConfiguration(BizObject biz2,List bizList,String SubjectId) throws Exception { + public static String SecondXMLConfiguration(BizObject biz2,List bizList) throws Exception { StringBuffer sb = new StringBuffer(""); sb.append(""); sb.append(""); sb.append(""); - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - sb.append("安鹏天津国际融资租赁有限公司");//更新生成环境需要修改成天津 - }else { - sb.append("安鹏国际融资租赁有限公司"); - } + sb.append("安鹏国际融资租赁有限公司"); sb.append(""); sb.append(""); sb.append("公民身份号码"); sb.append("姓名"); sb.append(""); if(biz2 != null){ - if("d989246c11c111eaaa0000163e0e11e6".equals(SubjectId)){ - sb.append("");//更新生成环境需要修改成天津 - }else { - sb.append(""); - } + sb.append(""); //入参共同申请人身份证号码 sb.append(""+biz2.getAttribute("certid").getString()+""); //入参共同申请人姓名 @@ -139,11 +115,7 @@ public class SoapRequest { } if(bizList != null){ for(int i=0;i");//更新生成环境需要修改成天津 - }else { - sb.append(""); - } + sb.append(""); //入参共同申请人身份证号码 sb.append(""+bizList.get(i).getAttribute("CERTID").getString()+""); //入参共同申请人姓名 diff --git a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/CopyLCEbankTempToForml.java b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/CopyLCEbankTempToForml.java deleted file mode 100644 index a4781604f..000000000 --- a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/CopyLCEbankTempToForml.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.tenwa.lease.flow.rent.rentreback; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jbo.app.tenwa.calc.LC_EBANK; -import jbo.app.tenwa.calc.LC_EBANK_TEMP; -import jbo.app.tenwa.calc.LC_FUND_INCOME; -import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; -import jbo.app.tenwa.calc.LC_RENT_INCOME; -import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP; -import jbo.com.tenwa.entity.comm.flow.LC_SPLITTING_PAY; -import jbo.com.tenwa.entity.comm.flow.LC_SPLITTING_PAY_TEMP; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.util.SqlObject; -import com.amarsoft.awe.util.Transaction; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; -import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; -import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; - -public class CopyLCEbankTempToForml extends BaseBussiness{ - public Object run(Transaction Sqlca) throws Exception{ - this.initBussinessParam(Sqlca); - String sFlowUnid = (String)this.getAttribute("ObjectNo"); - SqlObject so = new SqlObject("delete from lc_ebank_process where flowunid='"+sFlowUnid+"'"); - Sqlca.executeSQL(so); - List letArray = JBOFactory.createBizObjectQuery(LC_EBANK_TEMP.CLASS_NAME, "FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", sFlowUnid).getResultList(false); - for(BizObject bol:letArray){ - String id = bol.getAttribute("EBANK_NUMBER").toString(); - Map fromCondtion = new HashMap(); - fromCondtion.put("FLOWUNID", id); - fromCondtion.put("EBANK_NUMBER", id); - Map toCondition = new HashMap(); - toCondition.put("ID", id); - Map otherProperty = new HashMap(); - otherProperty.put("ID", id); - LeaseFlowBaseService service=new LeaseFlowBaseServiceImp(); - service.copyEbankInfo(Sqlca, fromCondtion, toCondition, otherProperty, ServiceOperatorEnum.TempToFormal); - } - String sMessage="true"; - return sMessage; - } -} - diff --git a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/CopyLCSplittingPayTempToForml.java b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/CopyLCSplittingPayTempToForml.java deleted file mode 100644 index 88707532f..000000000 --- a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/CopyLCSplittingPayTempToForml.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.tenwa.lease.flow.rent.rentreback; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jbo.app.tenwa.calc.LC_EBANK_TEMP; -import jbo.app.tenwa.calc.LC_FUND_INCOME; -import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; -import jbo.app.tenwa.calc.LC_RENT_INCOME; -import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP; -import jbo.com.tenwa.entity.comm.flow.LC_SPLITTING_PAY; -import jbo.com.tenwa.entity.comm.flow.LC_SPLITTING_PAY_TEMP; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.util.SqlObject; -import com.amarsoft.awe.util.Transaction; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; -import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; -import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; - -public class CopyLCSplittingPayTempToForml extends BaseBussiness{ - public Object run(Transaction Sqlca) throws Exception{ - this.initBussinessParam(Sqlca); - MapfromCondtion=new HashMap(); - fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); - DataOperatorUtil.copyJBOSet(LC_SPLITTING_PAY_TEMP.CLASS_NAME, fromCondtion,LC_SPLITTING_PAY.CLASS_NAME, null, null, null,Sqlca); - List lspArray = JBOFactory.createBizObjectQuery(LC_SPLITTING_PAY_TEMP.CLASS_NAME, "FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", this.getAttribute("FlowUnid").toString()).getResultList(false); - for(BizObject bo: lspArray){ - SqlObject so = new SqlObject("update LC_RENT_PLAN set splitting_status='Y' where id='"+bo.getAttribute("plan_id").toString()+"'"); - Sqlca.executeSQL(so); - } - String sMessage="true"; - return sMessage; - } -} - diff --git a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java deleted file mode 100644 index 85652a233..000000000 --- a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java +++ /dev/null @@ -1,231 +0,0 @@ -package com.tenwa.lease.flow.rent.rentreback; - -import java.math.BigDecimal; -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import jbo.app.tenwa.calc.LC_EBANK_PROCESS; -import jbo.app.tenwa.calc.LC_RENT_PLAN; -import jbo.app.tenwa.customer.LPOUNDAGE_MAINTENANCE; -import jbo.com.tenwa.entity.comm.flow.LC_SPLITTING_PAY_TEMP; - -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.util.StringFunction; -import com.amarsoft.awe.util.SqlObject; -import com.amarsoft.awe.util.Transaction; -import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; -import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; -import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; -import com.tenwa.quartz.DateUtil; - -public class OtherPayMethod { - - private String flowunid; - private String planIDs; - private String interestSPs; - private String serviceType; - private String ids; - private String mayopeMoney; - private String ebankNumbers; - - - - public String createSplittingPayTemp(JBOTransaction tx) throws JBOException{ - BigDecimal ratio = null; - String[] planID = planIDs.split("@"); - - for(int i=0;i fromCondtion = new HashMap(); - fromCondtion.put("id",idArray[i]); - Map otherProperty = new HashMap(); - otherProperty.put("FlowUnid", flowunid); - otherProperty.put("MAYOPE_MONEY", "0.00"); - otherProperty.put("RETURN_MONEY", m_Money[i]); - - LeaseFlowBaseService service=new LeaseFlowBaseServiceImp(); - try { - BizObjectManager bom = JBOFactory.getBizObjectManager(LC_EBANK_PROCESS.CLASS_NAME,tx); - tx.join(bom); - BizObject bo = bom.newObject(); - bo.setAttributeValue("EBANK_NUMBER", idArray[i]); - bo.setAttributeValue("FLOW_NAME" ,"其它支付"); - bo.setAttributeValue("FLOWUNID" ,flowunid); - bo.setAttributeValue("INPUTTIME", DateUtil.getDateTime(new Date())); - bom.saveObject(bo); - service.copyEbankInfo(tx, fromCondtion, null,otherProperty, ServiceOperatorEnum.FormalToTemp); - } catch (Exception e) { - e.printStackTrace(); - failNmber++; - } - } - if(failNmber==0){ - return "success"; - } - if(failNmber==idArray.length){ - return "操作失败"; - }else{ - return "部分操作成功"; - } - } - public String deleteProcess(JBOTransaction tx){ - if(ebankNumbers!=null||"".equals(ebankNumbers)){ - - if(ebankNumbers.endsWith("@")){ - ebankNumbers = ebankNumbers.substring(0, ebankNumbers.length()-1); - }; - String ebankNumber = ebankNumbers.replace("@", "','"); - try { - SqlObject so = new SqlObject("delete from lc_ebank_process where ebank_number in ('"+ebankNumber+"')"); - Transaction.createTransaction(tx).executeSQL(so); - } catch (Exception e) { - e.printStackTrace(); - return "error"; - } - } - return "success"; - } - public BigDecimal getRatio(JBOTransaction tx,String serviceType){ - SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd"); - String currentDate = df.format(new Date()); - BizObjectManager lm; - BigDecimal ratio = null; - try { - lm = JBOFactory.getBizObjectManager(LPOUNDAGE_MAINTENANCE.CLASS_NAME,tx); - String getServiceRatioSQL = "select rate from O where charge_way='"+serviceType+"' AND start_date<='"+currentDate+"' AND expiry_date>='"+currentDate+"'"; - BizObject boRatio = lm.createQuery(getServiceRatioSQL).getSingleResult(false); - String rate = boRatio.getAttribute("rate")==null?"0":boRatio.getAttribute("rate").toString(); - ratio = (new BigDecimal(rate)).divide(new BigDecimal("100"), 6, BigDecimal.ROUND_HALF_UP); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - return ratio; - } - public String getFlowunid() { - return flowunid; - } - public void setFlowunid(String flowunid) { - this.flowunid = flowunid; - } - public String getPlanIDs() { - return planIDs; - } - public void setPlanIDs(String planIDs) { - this.planIDs = planIDs; - } - public String getInterestSPs() { - return interestSPs; - } - public void setInterestSPs(String interestSPs) { - this.interestSPs = interestSPs; - } - public String getServiceType() { - return serviceType; - } - public void setServiceType(String serviceType) { - this.serviceType = serviceType; - } - - public String getIds() { - return ids; - } - - public void setIds(String ids) { - this.ids = ids; - } - public String getEbankNumbers() { - return ebankNumbers; - } - - public void setEbankNumbers(String ebankNumbers) { - this.ebankNumbers = ebankNumbers; - } - - public String getMayopeMoney() { - return mayopeMoney; - } - - public void setMayopeMoney(String mayopeMoney) { - this.mayopeMoney = mayopeMoney; - } - - - - - - - - -} diff --git a/src_tenwa/com/tenwa/leasing/serviceImpl/voucher/VoucherAction.java b/src_tenwa/com/tenwa/leasing/serviceImpl/voucher/VoucherAction.java index af735dbc2..cccc1e1b9 100644 --- a/src_tenwa/com/tenwa/leasing/serviceImpl/voucher/VoucherAction.java +++ b/src_tenwa/com/tenwa/leasing/serviceImpl/voucher/VoucherAction.java @@ -5,22 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jbo.app.VOUCHERASSSTACTS_INFO; -import jbo.app.VOUCHER_CONNECTION; -import jbo.app.VOUCHER_HELP; -import jbo.app.VOUCHER_V8; -import jbo.com.tenwa.entity.contract.CONTRACT_INFO; -import jbo.com.tenwa.entity.project.PROJ_EQUIP; -import jbo.com.tenwa.entity.project.PROJ_GUARANTEE_EQUIP; -import jbo.com.tenwa.entity.project.PROJ_GUARANTEE_METHOD; -import jbo.com.tenwa.entity.project.PROJ_INFO; -import jbo.lc.PROJ_CASH_DETAIL; -import jbo.lc.PROJ_CONDITION; -import jbo.lc.PROJ_FUND_FUND_PLAN; -import jbo.lc.PROJ_FUND_RENT_PLAN; -import jbo.lc.PROJ_OTHER_FUND; -import jbo.sys.USER_INFO; - import com.amarsoft.app.als.sys.tools.JBOHelper; import com.amarsoft.app.util.StringUtil; import com.amarsoft.are.jbo.BizObject; @@ -33,6 +17,11 @@ import com.tenwa.leasing.service.voucher.CreateVoucherService; import com.tenwa.reckon.util.DateUtils; import com.tenwa.reckon.util.Tools; +import jbo.app.VOUCHERASSSTACTS_INFO; +import jbo.app.VOUCHER_CONNECTION; +import jbo.app.VOUCHER_V8; +import jbo.sys.USER_INFO; + public class VoucherAction { private String f3; @@ -129,7 +118,7 @@ public class VoucherAction { public String controlCreate(JBOTransaction tx) throws Exception{ String mes=null; - int i = JBOHelper.executeUpdate(tx, VOUCHER_HELP.CLASS_NAME,"update o set is_create_voucher=:control_ where id='control_voucher_create' ", control_); + int i = JBOHelper.executeUpdate(tx, "jbo.app.VOUCHER_HELP","update o set is_create_voucher=:control_ where id='control_voucher_create' ", control_); if(i==1){ mes = "success"; }else{ @@ -203,7 +192,7 @@ public class VoucherAction { //F24-项目id F18-客户编码 proj_id = list.get(i).getAttribute("proj_id_tag").toString(); if("".equals(proj_id)){mes+="凭证"+f3+":刷新失败，承租人信息未关联到凭证信息中！
";} - BizObject boProj = JBOHelper.querySingle(PROJ_INFO.CLASS_NAME,"SELECT cust_voucher_code FROM o where o.id=:proj_id",proj_id); + BizObject boProj = JBOHelper.querySingle("jbo.com.tenwa.entity.project.PROJ_INFO","SELECT cust_voucher_code FROM o where o.id=:proj_id",proj_id); if(boProj!=null){ voucher_code = boProj.getAttribute("cust_voucher_code").toString(); list.get(i).setAttributeValue("F18", voucher_code); @@ -223,7 +212,7 @@ public class VoucherAction { //F22-项目id F21-项目编码 proj_id = list.get(i).getAttribute("proj_id_tag").toString(); if("".equals(proj_id)){mes+="凭证"+f3+":刷新失败，项目信息未关联到凭证信息中！
";} - BizObject boProj = JBOHelper.querySingle(PROJ_INFO.CLASS_NAME,"select voucher_code from o where o.id=:proj_id",proj_id); + BizObject boProj = JBOHelper.querySingle("jbo.com.tenwa.entity.project.PROJ_INFO","select voucher_code from o where o.id=:proj_id",proj_id); if(boProj!=null){ voucher_code = boProj.getAttribute("voucher_code").toString(); list.get(i).setAttributeValue("F21",voucher_code); @@ -245,7 +234,7 @@ public class VoucherAction { proj_id = list.get(i).getAttribute("proj_id_tag").toString(); if("".equals(proj_id)){mes+="凭证"+f3+":刷新失败，供应商信息未关联到凭证信息中！
";} //BizObject bosup = JBOHelper.querySingle(CUSTOMER_INFO.CLASS_NAME, "select o.customername,o.voucher_code from o where o.customerid=:sup_id", supp_id); - BizObject boProj = JBOHelper.querySingle(PROJ_INFO.CLASS_NAME,"select supp_voucher_code from o where o.id=:proj_id",proj_id); + BizObject boProj = JBOHelper.querySingle("jbo.com.tenwa.entity.project.PROJ_INFO","select supp_voucher_code from o where o.id=:proj_id",proj_id); if(boProj!=null){ voucher_code = boProj.getAttribute("supp_voucher_code").toString(); list.get(i).setAttributeValue("F19", voucher_code); @@ -267,7 +256,7 @@ public class VoucherAction { String contract_numbers = ""; String ids = ""; String contract_info = ""; - List listCon = JBOHelper.queryList(CONTRACT_INFO.CLASS_NAME, "select id,contract_number from o where o.proj_id=:proj_id", proj_id); + List listCon = JBOHelper.queryList("jbo.com.tenwa.entity.contract.CONTRACT_INFO", "select id,contract_number from o where o.proj_id=:proj_id", proj_id); for (int i = 0; i < listCon.size(); i++) { contract_numbers += listCon.get(i).getAttribute("contract_number").toString()+","; ids += listCon.get(i).getAttribute("id").toString()+","; @@ -305,14 +294,14 @@ public class VoucherAction { fromCondtion.put("proj_id", "2017052000000013"); otherProperty.put("proj_id", "2017052000000113"); - List list1 = DataOperatorUtil.copyJBOSet(PROJ_EQUIP.CLASS_NAME, fromCondtion, PROJ_EQUIP.CLASS_NAME, toCondtion, otherProperty, null, tx); - List list2 = DataOperatorUtil.copyJBOSet(PROJ_GUARANTEE_METHOD.CLASS_NAME, fromCondtion, PROJ_GUARANTEE_METHOD.CLASS_NAME, toCondtion, otherProperty, null, tx); - List list3 = DataOperatorUtil.copyJBOSet(PROJ_GUARANTEE_EQUIP.CLASS_NAME, fromCondtion, PROJ_GUARANTEE_EQUIP.CLASS_NAME, toCondtion, otherProperty, null, tx); - List list4 = DataOperatorUtil.copyJBOSet(PROJ_CONDITION.CLASS_NAME, fromCondtion, PROJ_CONDITION.CLASS_NAME, toCondtion, otherProperty, null, tx); - List list5 = DataOperatorUtil.copyJBOSet(PROJ_FUND_RENT_PLAN.CLASS_NAME, fromCondtion, PROJ_FUND_RENT_PLAN.CLASS_NAME, toCondtion, otherProperty, null, tx); - List list6 = DataOperatorUtil.copyJBOSet(PROJ_FUND_FUND_PLAN.CLASS_NAME, fromCondtion, PROJ_FUND_FUND_PLAN.CLASS_NAME, toCondtion, otherProperty, null, tx); - List list7 = DataOperatorUtil.copyJBOSet(PROJ_CASH_DETAIL.CLASS_NAME, fromCondtion, PROJ_CASH_DETAIL.CLASS_NAME, toCondtion, otherProperty, null, tx); - List list8 = DataOperatorUtil.copyJBOSet(PROJ_OTHER_FUND.CLASS_NAME, fromCondtion, PROJ_OTHER_FUND.CLASS_NAME, toCondtion, otherProperty, null, tx); +// List list1 = DataOperatorUtil.copyJBOSet(PROJ_EQUIP.CLASS_NAME, fromCondtion, PROJ_EQUIP.CLASS_NAME, toCondtion, otherProperty, null, tx); +// List list2 = DataOperatorUtil.copyJBOSet(PROJ_GUARANTEE_METHOD.CLASS_NAME, fromCondtion, PROJ_GUARANTEE_METHOD.CLASS_NAME, toCondtion, otherProperty, null, tx); +// List list3 = DataOperatorUtil.copyJBOSet(PROJ_GUARANTEE_EQUIP.CLASS_NAME, fromCondtion, PROJ_GUARANTEE_EQUIP.CLASS_NAME, toCondtion, otherProperty, null, tx); +// List list4 = DataOperatorUtil.copyJBOSet(PROJ_CONDITION.CLASS_NAME, fromCondtion, PROJ_CONDITION.CLASS_NAME, toCondtion, otherProperty, null, tx); +// List list5 = DataOperatorUtil.copyJBOSet(PROJ_FUND_RENT_PLAN.CLASS_NAME, fromCondtion, PROJ_FUND_RENT_PLAN.CLASS_NAME, toCondtion, otherProperty, null, tx); +// List list6 = DataOperatorUtil.copyJBOSet(PROJ_FUND_FUND_PLAN.CLASS_NAME, fromCondtion, PROJ_FUND_FUND_PLAN.CLASS_NAME, toCondtion, otherProperty, null, tx); +// List list7 = DataOperatorUtil.copyJBOSet(PROJ_CASH_DETAIL.CLASS_NAME, fromCondtion, PROJ_CASH_DETAIL.CLASS_NAME, toCondtion, otherProperty, null, tx); +// List list8 = DataOperatorUtil.copyJBOSet(PROJ_OTHER_FUND.CLASS_NAME, fromCondtion, PROJ_OTHER_FUND.CLASS_NAME, toCondtion, otherProperty, null, tx); } diff --git a/src_tenwa/com/tenwa/leasing/serviceImpl/voucher/VoucherToV8Impl.java b/src_tenwa/com/tenwa/leasing/serviceImpl/voucher/VoucherToV8Impl.java index a44a65fa5..f7ddc9482 100644 --- a/src_tenwa/com/tenwa/leasing/serviceImpl/voucher/VoucherToV8Impl.java +++ b/src_tenwa/com/tenwa/leasing/serviceImpl/voucher/VoucherToV8Impl.java @@ -6,31 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - - - - - - - - - -import jbo.app.CUSTOMER_INFO; -import jbo.app.VOUCHERASSSTACTS_INFO; -import jbo.app.VOUCHERASS_STACTS_CONFIG; -import jbo.app.VOUCHER_CONNECTION; -import jbo.app.VOUCHER_V8; -import jbo.com.tenwa.app.entity.ownInfo.OWN_ACCOUNT; -import jbo.com.tenwa.app.entity.ownInfo.OWN_INFO; -import jbo.com.tenwa.entity.contract.CONTRACT_INFO; -import jbo.com.tenwa.entity.contract.CONTRACT_SIGNATORY; -import jbo.com.tenwa.entity.contract.CONTRACT_SUPPLIER_INFO; -import jbo.com.tenwa.entity.project.PROJ_INFO; -import jbo.sys.ORG_INFO; -import jbo.sys.USER_INFO; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.springframework.dao.DataAccessException; import com.amarsoft.app.als.sys.tools.JBOHelper; import com.amarsoft.are.ARE; @@ -39,8 +15,7 @@ import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.log.Log; -import com.amarsoft.dict.als.manage.NameManager; -import com.tenwa.flow.util.DataOperatorUtil; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.leasing.service.voucher.IntereasVoucherheadService; import com.tenwa.leasing.service.voucher.VoucherToV8Service; import com.tenwa.reckon.util.DateUtils; @@ -48,6 +23,15 @@ import com.tenwa.reckon.util.MoneyUtils; import com.tenwa.reckon.util.NumberUtils; import com.tenwa.reckon.util.Tools; +import jbo.app.VOUCHERASSSTACTS_INFO; +import jbo.app.VOUCHERASS_STACTS_CONFIG; +import jbo.app.VOUCHER_CONNECTION; +import jbo.app.VOUCHER_V8; +import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT; +import jbo.com.tenwa.entity.comm.own.OWN_INFO; +import jbo.sys.ORG_INFO; +import jbo.sys.USER_INFO; + /** * *

。

@@ -164,11 +148,11 @@ public class VoucherToV8Impl implements VoucherToV8Service { condtion.put("contract_id", contract_id); BizObject sign=null; if(!"costSharing".equals(voucherType)){ - sign = DataOperatorUtil.getSingleJBO(CONTRACT_SIGNATORY.CLASS_NAME, condtion, tx); + sign = DataOperatorUtil.getSingleJBO("jbo.com.tenwa.entity.contract.CONTRACT_SIGNATORY", condtion, tx); }else if("costSharing".equals(voucherType)){ condtion.clear(); condtion.put("contract_id", list.get(0).get("contract_id")); - sign = DataOperatorUtil.getSingleJBO(CONTRACT_SIGNATORY.CLASS_NAME, condtion, tx); + sign = DataOperatorUtil.getSingleJBO("jbo.com.tenwa.entity.contract.CONTRACT_SIGNATORY", condtion, tx); } condtion.clear(); if(sign==null){ @@ -184,7 +168,7 @@ public class VoucherToV8Impl implements VoucherToV8Service { if(!Tools.isNullOrEmpty(headMap.get("oldContractid"))){ condtion.clear(); condtion.put("id", headMap.get("oldContractid")); - oldcontractinfo =DataOperatorUtil.getSingleJBO(CONTRACT_INFO.CLASS_NAME, condtion, tx); + oldcontractinfo =DataOperatorUtil.getSingleJBO("jbo.com.tenwa.entity.contract.CONTRACT_INFO", condtion, tx); } //网银、代收租金情况下不存在合同相关信息 @@ -193,7 +177,7 @@ public class VoucherToV8Impl implements VoucherToV8Service { condtion.clear(); condtion.put("id", contract_id); - contractInfo =DataOperatorUtil.getSingleJBO(CONTRACT_INFO.CLASS_NAME, condtion, tx); + contractInfo =DataOperatorUtil.getSingleJBO("jbo.com.tenwa.entity.contract.CONTRACT_INFO", condtion, tx); cont_id = contractInfo.getAttribute("contract_id").getString(); proj_id = contractInfo.getAttribute("proj_id").toString(); if(Tools.isNullOrEmpty(contractInfo.getAttribute("id"))){ @@ -270,7 +254,7 @@ public class VoucherToV8Impl implements VoucherToV8Service { F31 = accured_month;//计提月份 condtion.clear(); condtion.put("id", contract_id); - contractInfo =DataOperatorUtil.getSingleJBO(CONTRACT_INFO.CLASS_NAME, condtion, tx); + contractInfo =DataOperatorUtil.getSingleJBO("jbo.com.tenwa.entity.contract.CONTRACT_INFO", condtion, tx); cont_id = contractInfo.getAttribute("contract_id").getString(); proj_id = contractInfo.getAttribute("proj_id").toString(); if(Tools.isNullOrEmpty(contractInfo.getAttribute("id"))){ @@ -505,7 +489,7 @@ public class VoucherToV8Impl implements VoucherToV8Service { String f19 = map2.get("F19"); F25 = proj_id;//业务系统项目id- //BizObject bosup = JBOHelper.querySingle(CUSTOMER_INFO.CLASS_NAME, "select o.customername,o.voucher_code from o where o.customerid=:sup_id", f19); - BizObject boProj = JBOHelper.querySingle(PROJ_INFO.CLASS_NAME,"select supp_voucher_code from o where o.id=:proj_id",proj_id); + BizObject boProj = JBOHelper.querySingle("jbo.com.tenwa.entity.project.PROJ_INFO","select supp_voucher_code from o where o.id=:proj_id",proj_id); if(boProj!=null){ F19 = boProj.getAttribute("supp_voucher_code").toString(); //F66 = boProj.getAttribute("customername").toString(); @@ -554,7 +538,7 @@ public class VoucherToV8Impl implements VoucherToV8Service { } else { //F21 = contractInfo.getAttribute("id").toString(); F22 = proj_id;//业务系统项目id - BizObject boProj = JBOHelper.querySingle(PROJ_INFO.CLASS_NAME,"select project_name,voucher_code from o where o.id=:proj_id",proj_id); + BizObject boProj = JBOHelper.querySingle("jbo.com.tenwa.entity.project.PROJ_INFO","select project_name,voucher_code from o where o.id=:proj_id",proj_id); if(boProj!=null){ F21 = boProj.getAttribute("voucher_code").toString(); F67 = boProj.getAttribute("project_name").toString(); @@ -585,7 +569,7 @@ public class VoucherToV8Impl implements VoucherToV8Service { } else { //cust_id = contractInfo.getAttribute("cust_id").toString(); F24 = proj_id;//业务系统项目id - BizObject boProj = JBOHelper.querySingle(PROJ_INFO.CLASS_NAME,"SELECT getcustomername(o.cust_id)AS v.cust_name,cust_voucher_code FROM o where o.id=:proj_id",proj_id); + BizObject boProj = JBOHelper.querySingle("jbo.com.tenwa.entity.project.PROJ_INFO","SELECT getcustomername(o.cust_id)AS v.cust_name,cust_voucher_code FROM o where o.id=:proj_id",proj_id); //BizObject boCust = JBOHelper.querySingle(CUSTOMER_INFO.CLASS_NAME, "select customername,voucher_code from o where o.customerid=:cust_id", cust_id); if(boProj!=null){ F18 = boProj.getAttribute("cust_voucher_code").toString(); diff --git a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java index 6bbc28fad..da8fe62a8 100644 --- a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java +++ b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java @@ -1,533 +1,523 @@ -package com.tenwa.makeContract.util; - -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.util.json.JSONDecoder; -import com.amarsoft.are.util.json.JSONObject; -import com.amarsoft.awe.Configure; -import com.amarsoft.dict.als.manage.NameManager; -import com.caucho.hessian.client.HessianProxyFactory; -import com.sun.image.codec.jpeg.JPEGCodec; -import com.sun.image.codec.jpeg.JPEGEncodeParam; -import com.sun.image.codec.jpeg.JPEGImageEncoder; -import com.tenwa.app.dao.ContractSignInfo; -import com.tenwa.channelportal.action.ContractSignAction; -import com.tenwa.channelportal.action.generativecontract.WordToPDFUtil; -import com.tenwa.comm.exception.BusinessException; -import com.tenwa.comm.util.date.DateAssistant; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.doc.action.DocListAction; -import com.tenwa.doc.util.BASE64; -import com.tenwa.lease.app.service.HttpRequestAppService; -import com.tenwa.officetempalte.service.CreateOfficeService; -import com.tenwa.officetempalte.util.FileOperatorUtil; -import com.tenwa.reckon.util.UUIDUtil; - -import org.apache.log4j.Logger; -import org.jbarcode.JBarcode; -import org.jbarcode.encode.Code128Encoder; -import org.jbarcode.encode.InvalidAtributeException; -import org.jbarcode.paint.BaseLineTextPainter; -import org.jbarcode.paint.WidthCodedPainter; - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.MalformedURLException; -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 jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; -import jbo.app.tenwa.customer.CUSTOMER_INFO; -import jbo.app.tenwa.customer.CUSTOMER_PERSON; -import jbo.app.tenwa.doc.LB_DOCATTRIBUTE; -import jbo.app.tenwa.doc.LB_DOCRELATIVE; -import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; -import jbo.app.tenwa.doc.LB_ONEDIMENSIONALCODE; -import jbo.com.tenwa.entity.comm.officetempalte.BF_TEMPLATE; -import jbo.com.tenwa.lease.carbrand.LB_CONTRACT_SIGN_LOG; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_TEMPLATE; -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 jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; - -import com.itextpdf.text.Image; -import com.itextpdf.text.pdf.PdfContentByte; -import com.itextpdf.text.pdf.PdfReader; -import com.itextpdf.text.pdf.PdfStamper; - - -public class MakeOneCodeAndContractModel { - - private static Logger logger=Logger.getLogger(ContractSignAction.class); - public HessianProxyFactory factory = new HessianProxyFactory(); - public HttpRequestAppService requestService; - - public String MOneDimensionalCode(String contractNo,String contractId,String projectId,String diskPath,JBOTransaction tx) throws Exception{ - JBarcode localJBarcode = new JBarcode(Code128Encoder.getInstance(), WidthCodedPainter.getInstance(), BaseLineTextPainter.getInstance()); - localJBarcode.setEncoder(Code128Encoder.getInstance()); - localJBarcode.setPainter(WidthCodedPainter.getInstance()); - localJBarcode.setBarHeight(10); - localJBarcode.setTextPainter(BaseLineTextPainter.getInstance()); - localJBarcode.setShowCheckDigit(false); - - BufferedImage localBufferedImage = null; - localBufferedImage = localJBarcode.createBarcode(contractNo); - //鑾峰彇褰撳墠鏃堕棿锛屾牴鎹椂闂村垱寤轰竴缁寸爜瀛樻斁鐨勮矾寰 - Calendar now = Calendar.getInstance(); - String path = now.get(Calendar.YEAR)+"//"+(now.get(Calendar.MONTH) + 1) + "//"+now.get(Calendar.DAY_OF_MONTH); - File file = new File(diskPath+path); - if (!file.exists()) { - file.mkdirs(); - } - path=path+"//"+contractId+".jpg"; - OutputStream jos = null; - jos = new FileOutputStream(diskPath+path); - JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(jos); - JPEGEncodeParam jpegEP = JPEGCodec.getDefaultJPEGEncodeParam(localBufferedImage); - jpegEP.setQuality((float) 1, true); - try { - encoder.encode(localBufferedImage, jpegEP); - jos.flush(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - jos.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - BizObjectManager attrBm = JBOFactory.getBizObjectManager(LB_ONEDIMENSIONALCODE.CLASS_NAME,tx); -// BizObjectManager attrBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_ONEDIMENSIONALCODE"); - BizObject attr=attrBm.newObject(); - attr.setAttributeValue("PROJECT_ID", projectId); - attr.setAttributeValue("CONTRACT_ID", contractId); - attr.setAttributeValue("CONTRACT_NO", contractNo); - attr.setAttributeValue("FileName", contractId+".jpg"); - Date date= new Date(System.currentTimeMillis()); - String pattern="yyyy/MM/dd HH:mm:ss"; - SimpleDateFormat sdf= new SimpleDateFormat(pattern); - attr.setAttributeValue("InputTime",sdf.format(date)); - attr.setAttributeValue("objectType", "OneDimensionalCode"); - - attr.setAttributeValue("FilePath",path); - attr.setAttributeValue("FullPath",diskPath+path); - attr.setAttributeValue("Content_Type", "jpg"); -// tx.join(attrBm); - attrBm.saveObject(attr); - return diskPath+path; - } - /** - * 鐢熸垚word鏂囨。 - * @param sTemplateParam 鐢熸垚word鏂囨。鐨勫弬鏁 - * @param tempid 妯℃澘鐨刬d - * @param tx - * @return - * @throws Exception - */ - public String createBqWord(String sTemplateParam,String tempid,JBOTransaction tx) throws Exception{ - List message=new ArrayList(); - //鐢熸垚鍙傛暟 - //String sTemplateParam=this.getTemplateParam().replaceAll("@", ","); - JSONObject paramJson=JSONDecoder.decode(sTemplateParam); - MapsourceMap=FileOperatorUtil.getJsonObjectToMap(paramJson); - BqCreateOfficeService officeSer=new BqCreateOfficeService(tx); - if(tempid.length()>0){ - BizObjectManager bmbt = JBOFactory.getBizObjectManager(BF_TEMPLATE.CLASS_NAME); - tx.join(bmbt); - BizObject bobt=bmbt.createQuery("id=:id").setParameter("id",tempid).getSingleResult(false); - String TWO_CLASSIFY = bobt.getAttribute("TWOCLASSIFY").toString(); - String THREE_CLASSIFY = bobt.getAttribute("THREECLASSIFY").toString(); - String FOUR_CLASSIFY = bobt.getAttribute("FOURCLASSIFY").toString(); - String TEMPLATEVERSION = bobt.getAttribute("TEMPLATEVERSION").toString(); - if(bobt==null||TWO_CLASSIFY==null||THREE_CLASSIFY==null||FOUR_CLASSIFY==null||TEMPLATEVERSION==null){ - message.add(NameManager.getItemName("ProductContractTemplate", THREE_CLASSIFY)+"鏈壘鍒版ā鏉块厤缃紒"); - }else{ - // 淇濆瓨LB_CONTRACT_TEMPLATE琛 - BizObjectManager bm = JBOFactory.getBizObjectManager(LB_CONTRACT_TEMPLATE.CLASS_NAME); - tx.join(bm); - BizObject bo = bm.newObject(); - String id=UUIDUtil.getUUID(); - bo.setAttributeValue("id", id); - bo.setAttributeValue("ONE_CLASSIFY", TWO_CLASSIFY); - bo.setAttributeValue("TWO_CLASSIFY", THREE_CLASSIFY); - bo.setAttributeValue("THREE_CLASSIFY", FOUR_CLASSIFY); - bo.setAttributeValue("FOUR_CLASSIFY", TEMPLATEVERSION); - // bo.setAttributeValue("CONTRACT_NUMBER", boc.getAttribute("CONTRACT_NUMBER").getString()); - bo.setAttributeValue("CONTRACT_ID", sourceMap.get("CONTRACT_ID")); - bo.setAttributeValue("FLOWUNID", sourceMap.get("FLOW_UNID")); - bm.saveObject(bo); - bo.getKey(); - sourceMap.put("TEMPLATE_ID", id); - BizObject rela=JBOFactory.createBizObjectQuery(LB_DOCRELATIVE.CLASS_NAME,"TEMPLATE_ID=:tempid").setParameter("tempid", tempid).getSingleResult(false); - if(rela!=null){ - DocListAction doc=new DocListAction(); - doc.setRelativeId(rela.getAttribute("id").getString()); - doc.deleteRelative(tx); - } - officeSer.createOfficeByTemplateNo(bobt.getAttribute("id").getString(), sourceMap); - } - } - return message.toString(); - } - //word杞琾df - public String wordTopdf(String projectId,String contractId,JBOTransaction tx) throws Exception{ - String pdfPath=""; - BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); - BizObjectManager attrBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx); - BizObjectManager lulManage = JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME, tx); - BizObject lul = lulManage.createQuery("project_id=:projectid").setParameter("projectid", projectId).getSingleResult(false); - String customername = null; - String telephone = null; - String ids =null; - if(lul!=null){ - ids = lul.getAttribute("CUSTOMER_ID").toString(); - customername = lul.getAttribute("CUSTOMER_NAME").toString(); - BizObjectManager ciManage = JBOFactory.getBizObjectManager(CUSTOMER_INFO.CLASS_NAME, tx); - BizObject ci = ciManage.createQuery("customerid=:customerid").setParameter("customerid", lul.getAttribute("CUSTOMER_ID").getString()).getSingleResult(false); - BizObjectManager cpManage = JBOFactory.getBizObjectManager(CUSTOMER_PERSON.CLASS_NAME, tx); - BizObject cp = cpManage.createQuery("customerid=:customerid").setParameter("customerid", lul.getAttribute("CUSTOMER_ID").getString()).getSingleResult(false); - if(ci!=null&&"03".equals(ci.getAttribute("customertype").getString())){ - telephone = (cp==null?"":cp.getAttribute("mobile").getString()); - } - } - - WordToPDFUtil wordTopdf = new WordToPDFUtil(); - File file = null; - Boolean result = null; - List bo = contBom.createQuery("contract_id=:contractId and file_flag='yes' and process='1'").setParameter("contractId", contractId).getResultList(true); - if (bo != null) { - for (BizObject contBo : bo) { - String attrId = contBo.getAttribute("ATTRIBUTE_ID").toString(); - BizObject attrBo = attrBom.createQuery("id='" +attrId+"'").getSingleResult(true); - String path = attrBo.getAttribute("FULLPATH").toString(); - String lastFilePath = path.replace(".docx", ".pdf"); - File filePath = new File(path); - if(!filePath.exists()){ - logger.info("word杞崲pdf鐨勬簮鏂囦欢涓嶅瓨鍦"); - continue; - } - String lastFilePathpdf = filePath.getParent(); - try { - result = wordTopdf.Word2Pdf(path, lastFilePathpdf); - } catch (Exception e) { - result = false; - e.printStackTrace(); - } - if (result) { - file =new File(lastFilePath); - contBo.setAttributeValue("FULLPATH",lastFilePath); - contBo.setAttributeValue("FILENAME",contBo.getAttribute("FILENAME").toString().replace(".docx",".pdf" )); - contBo.setAttributeValue("FILEPATH",contBo.getAttribute("FILEPATH").toString().replace(".docx", ".pdf")); - contBo.setAttributeValue("CONTENT_TYPE","application/pdf"); - contBo.setAttributeValue("PROCESS","2"); - contBo.setAttributeValue("PROJECT_ID",projectId); - contBo.setAttributeValue("CUSTOMERNAME",customername); - contBo.setAttributeValue("TELEPHONE",telephone); - contBo.setAttributeValue("IDS",ids); - contBom.saveObject(contBo); - pdfPath=attrBo.getAttribute("FULLPATH").toString().replace(".docx", ".pdf"); - attrBo.setAttributeValue("FULLPATH",attrBo.getAttribute("FULLPATH").toString().replace(".docx", ".pdf")); - attrBo.setAttributeValue("FILENAME",attrBo.getAttribute("FILENAME").toString().replace(".docx", ".pdf")); - attrBo.setAttributeValue("FILEPATH",attrBo.getAttribute("FILEPATH").toString().replace(".docx", ".pdf")); - attrBo.setAttributeValue("FileSize",file.length()); - attrBo.setAttributeValue("CONTENT_TYPE","application/pdf"); - attrBom.saveObject(attrBo); - }else{ - contBo.setAttributeValue("PROCESS","3"); - contBom.saveObject(contBo); - } - } - } - return pdfPath; - } - /** - * 鍚憄df鎻掑叆涓缁寸爜鍥剧墖 - * @param outPdfFile 鎻掑叆鍚庤緭鍑虹殑璺緞 - * @param markImagePath 涓缁寸爜鐨勫浘鐗囪矾寰 - * @param tx 浜嬪姟 - * @return - * @throws Exception - */ - public String pdfAndMark(String outPdfFile, String markImagePath,String contractId,String leasform,JBOTransaction tx) throws Exception{ - - BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); - BizObjectManager attrBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx); - BizObjectManager loscBom = JBOFactory.getBizObjectManager(LB_ONEDIMENSIONALCODE.CLASS_NAME, tx); - BizObject losc = loscBom.createQuery("CONTRACT_ID=:contractId").setParameter("contractId", contractId).getSingleResult(true); - if(markImagePath.length()<=0){ - if(losc!=null){ - markImagePath = losc.getAttribute("FULLPATH").getString(); - } - } - BizObject cont = contBom.createQuery("contract_id=:contractId and file_flag='yes'").setParameter("contractId", contractId).getSingleResult(true); - String newPath = ""; - String split =""; - String InPdfFile=""; - if(cont!=null){ - InPdfFile=cont.getAttribute("fullpath").toString(); - split = cont.getAttribute("filepath").toString(); - File file = new File(outPdfFile+split.substring(0,split.lastIndexOf("/"))); - if (!file.exists()) { - file.mkdirs(); - } - newPath=outPdfFile+split; - }else{ - return "error"; - } - PdfReader reader = new PdfReader(InPdfFile, "PDF".getBytes()); - int pages = reader.getNumberOfPages();//鑾峰彇pdf鐨勬婚〉鏁 - PdfStamper stamp = new PdfStamper(reader, new FileOutputStream(newPath)); - Image img = Image.getInstance(markImagePath);//鎻掑叆姘村嵃聽 聽 - //璁剧疆鍥剧墖瀹藉害鍜岄珮搴 - img.scaleAbsolute(160, 22); - //璁剧疆鍥剧墖姘村嵃鐨勪綅缃 - img.setAbsolutePosition(400, 785); - - PdfContentByte under = stamp.getUnderContent(1); - under.addImage(img); - if(pages>2&&"02".equals(leasform)){ - PdfContentByte under2 = stamp.getUnderContent(3); - under2.addImage(img); - } - - - stamp.close();// 鍏抽棴聽 聽 聽 聽 聽聽 - File tempfile = new File(InPdfFile); - //鍒犻櫎鍘熸枃浠 - - if(tempfile.exists()) { - tempfile.delete(); - } - - cont.setAttributeValue("FULLPATH",newPath); - contBom.saveObject(cont); - BizObject attr = attrBom.createQuery("ID=:id").setParameter("id", cont.getAttribute("attribute_id").getString()).getSingleResult(true); - if(attr!=null){ - attr.setAttributeValue("FULLPATH",newPath); - attrBom.saveObject(attr); - } - return newPath; - } - - //鍏徃鐩栫珷 - public String compnySignIng(String contract_Id,JBOTransaction tx) throws Exception { - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); - Map map = new HashMap(); - ContractSignInfo con = null; - List bo = null; - BizObject ldclBo = null; - - // 鏌ヨlb_doc_contract_list琛 - bo = contBom.createQuery("contract_id=:contractId and file_flag='yes' and (sendprocess='0' or sendprocess='2' ) ").setParameter("contractId", contract_Id).getResultList(true); - for (BizObject keys : bo) { - String info = keys.getAttribute("id").toString(); - con = new ContractSignInfo(); - con.setCustname(keys.getAttribute("DOC_NAME").toString()); - con.setCustphone(keys.getAttribute("TELEPHONE").toString()); - con.setFileid(keys.getAttribute("ATTRIBUTE_ID").toString()); - con.setFilename(keys.getAttribute("FILENAME").toString()); - // 鑾峰彇鐢熸垚鏂囦欢璺緞 - String makefullPath = keys.getAttribute("FULLPATH").toString(); - File file = new File(makefullPath); - if (!file.exists()) { - throw new RuntimeException("瑕佽鍙栫殑鏂囦欢涓嶅瓨鍦"); - } - con.setInputfile(BASE64.encodeImgageToBase64(file)); - map.put(info, con); - } - Map fromCondtion = new HashMap(); - Map otherProperty = new HashMap(); - Map resultMap = requestService.compnySign(map); - if (!resultMap.containsKey("error")) { - for (String key : resultMap.keySet()) { - // 瀛樺偍濂戠害閿佽繑鍥炵殑鍚堝悓id鍜屽悎鍚屾枃浠秈d - if (key.indexOf("contract_") == -1) { - fromCondtion.clear(); - otherProperty.clear(); - // 濂戠害閿佸悎鍚屽彿 - String contractId = resultMap.get("contract_" + key); - String sendProcess = resultMap.get("contract_" + contractId); - ldclBo = contBom.createQuery("ATTRIBUTE_ID='" + key + "'").getSingleResult(true); - ldclBo.setAttributeValue("DOCUMENT_ID", resultMap.get(key)); - ldclBo.setAttributeValue("SINGCONTRACT_ID", contractId); - ldclBo.setAttributeValue("SIGN_TYPE", "COMPLETE");//娉曚汉瀹㈡埛褰撶洊瀹岀珷鏀逛负瀹屾垚鐘舵 - ldclBo.setAttributeValue("SENDPROCESS", sendProcess); - contBom.saveObject(ldclBo); - - String contractDocId = ldclBo.getAttribute("id").toString(); - fromCondtion.put("id", contractDocId); - otherProperty.put("SIGNPROCESS", "0");// 鍙戣捣鐢靛瓙绛剧害 - otherProperty.put("CONTRACTDOCID", contractDocId);// 鍙戣捣鐢靛瓙绛剧害 - otherProperty.put("INPUTTIME",DateAssistant.getTodayNow()); - //鎷疯〃鐨勬柟娉 - DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion, LB_CONTRACT_SIGN_LOG.CLASS_NAME, null, - otherProperty, tx); - } - } - downloadDoc(contract_Id,tx); - return "success"; - } else { - Boolean flag = false; - String getMessage = resultMap.get("error"); - logger.info("濂戠害閿佸弽棣堢殑寮傚父淇℃伅" + getMessage); - for (String key : resultMap.keySet()) { - // 瀛樺偍濂戠害閿佽繑鍥炵殑鍚堝悓id鍜屽悎鍚屾枃浠秈d - if (key.indexOf("contract_") == -1 && !"error".equals(key)) { - fromCondtion.clear(); - otherProperty.clear(); - // 濂戠害閿佸悎鍚屽彿 - String contractId = resultMap.get("contract_" + key); - String sendProcess = resultMap.get("contract_" + contractId); - ldclBo = contBom.createQuery("ATTRIBUTE_ID='" + key + "'").getSingleResult(true); - ldclBo.setAttributeValue("DOCUMENT_ID", resultMap.get(key)); - ldclBo.setAttributeValue("SINGCONTRACT_ID", contractId); - ldclBo.setAttributeValue("SENDPROCESS", sendProcess); - if ("1".equals(sendProcess)) { - flag = true; - ldclBo.setAttributeValue("SIGN_TYPE", "SIGNING"); - }else if("2".equals(sendProcess)){ - ldclBo.setAttributeValue("MESSAGE",getMessage ); - } - contBom.saveObject(ldclBo); - - String contractDocId = ldclBo.getAttribute("id").toString(); - fromCondtion.put("ID", contractDocId); - otherProperty.put("SIGNPROCESS", "0");//鍙戣捣鐢靛瓙绛剧害 - otherProperty.put("CONTRACTDOCID",contractDocId);//鍙戣捣鐢靛瓙绛剧害 - otherProperty.put("INPUTTIME",DateAssistant.getTodayNow()); - DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion, LB_CONTRACT_SIGN_LOG.CLASS_NAME, null, - otherProperty, tx); - } - } - // 鍒ゆ柇涓嶅悓鐨勫紓甯稿弽棣堢粰鍓嶇 - if (getMessage.indexOf("鐢ㄦ埛璁よ瘉淇℃伅涓庡悎鍚岀缃叉柟淇℃伅涓嶅尮閰") != -1) { - getMessage = getMessage.substring((getMessage.indexOf("message")) + 10, (getMessage.indexOf("code")) - 3); - return flag + "@" + getMessage; - } else if (getMessage.indexOf("contractId涓嶈兘涓虹┖") != -1) { - return flag + "@" + getMessage; - } else { - return flag + "@" + "error"; - } - } - } - - /** - * 鏍规嵁document_id涓嬭浇鍚堝悓 - * - * @param tx - * @return - * @throws Exception - * @throws Exception - * @throws MalformedURLException - */ - public String downloadDoc(String contract_id,JBOTransaction tx) throws MalformedURLException, Exception { - requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); - String sql = ""; - sql = "contract_id=:contractid and file_flag='yes'"; - try { - - @SuppressWarnings("unchecked") - List bo = contBom.createQuery(sql).setParameter("contractid", contract_id).getResultList(true); - if (bo != null) { - Map map = new HashMap(); - for (BizObject keys : bo) { - map.put(keys.getAttribute("DOCUMENT_ID").toString(), keys.getAttribute("FULLPATH").toString()); - } - Map result = requestService.downloadDoc(map); - if (!result.containsKey("error")) { - for (String contractId : map.keySet()) { - try { - if ("success".equals(result.get(contractId))) { - String fileString = result.get("file_" + contractId); - InputStream fileInput = BASE64.encodeFileToBase64(fileString); - OutputStream fileOut = new FileOutputStream(map.get(contractId));// TODO - byte[] buffByte = new byte[1024]; - int size = 0; - while ((size = fileInput.read(buffByte)) != -1) { - fileOut.write(buffByte, 0, size); - } - fileInput.close(); - fileOut.close(); - } else if ("error".equals(result.get(contractId))) { - return "error"; - } - } catch (Exception e) { - e.printStackTrace(); - - } - } - return "success"; - } else { - return "error"; - } - } - } catch (Exception e) { - return "error"; - } - return "success"; - } - @SuppressWarnings("deprecation") - public static String getConfigRequestUrl() throws Exception{ - return Configure.getInstance().getConfigure("RequestHessionUrl"); - } - - public Map fileBase(String contractId){ - Map fileNameBase = new HashMap(); - try { - BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); - BizObject cont = contBom.createQuery(" contract_id=:contractid and file_flag='yes' and (sendprocess='0' or sendprocess='2' ) ").setParameter("contractid", contractId).getSingleResult(false); - if(cont==null){ - return fileNameBase; - } - String newPath = cont.getAttribute("fullpath").getString(); - File file = new File(newPath); - if (!file.exists()) { - return fileNameBase; - } - // return BASE64.encodeImgageToBase64(file); - fileNameBase.put("fileName", newPath.substring(newPath.lastIndexOf("/")+1)); - fileNameBase.put("outputFile", BASE64.encodeImgageToBase64(file)); - } catch (JBOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return fileNameBase; - } - - - /** - * 鍖楁苯鍚堝悓鍙樻洿鏂规硶 - * @throws Exception - */ - public void BqChangecontract(String contractId,JBOTransaction tx) throws Exception{ - //鍒犻櫎涔嬪墠鐢熸垚鐨勬枃浠 - BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx); - List conts = contBom.createQuery(" contract_id=:contractid ").setParameter("contractid", contractId).getResultList(true); - for (BizObject cont : conts) { - cont.setAttributeValue("file_flag", "no"); - contBom.saveObject(cont); - } - BizObjectManager lctBom = JBOFactory.getBizObjectManager(LB_CONTRACT_TEMPLATE.CLASS_NAME,tx); - List lcts = lctBom.createQuery(" contract_id=:contractid ").setParameter("contractid", contractId).getResultList(true); - for (BizObject lct : lcts) { - lctBom.deleteObject(lct); - } - } -} +package com.tenwa.makeContract.util; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.MalformedURLException; +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 org.apache.log4j.Logger; +import org.jbarcode.JBarcode; +import org.jbarcode.encode.Code128Encoder; +import org.jbarcode.paint.BaseLineTextPainter; +import org.jbarcode.paint.WidthCodedPainter; + +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.util.json.JSONDecoder; +import com.amarsoft.are.util.json.JSONObject; +import com.amarsoft.awe.Configure; +import com.amarsoft.dict.als.manage.NameManager; +import com.caucho.hessian.client.HessianProxyFactory; +import com.itextpdf.text.Image; +import com.itextpdf.text.pdf.PdfContentByte; +import com.itextpdf.text.pdf.PdfReader; +import com.itextpdf.text.pdf.PdfStamper; +import com.sun.image.codec.jpeg.JPEGCodec; +import com.sun.image.codec.jpeg.JPEGEncodeParam; +import com.sun.image.codec.jpeg.JPEGImageEncoder; +import com.tenwa.app.dao.ContractSignInfo; +import com.tenwa.channelportal.action.ContractSignAction; +import com.tenwa.channelportal.action.generativecontract.WordToPDFUtil; +import com.tenwa.comm.util.date.DateAssistant; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.doc.action.DocListAction; +import com.tenwa.doc.util.BASE64; +import com.tenwa.lease.app.service.HttpRequestAppService; +import com.tenwa.officetempalte.util.FileOperatorUtil; +import com.tenwa.reckon.util.UUIDUtil; + +import jbo.app.tenwa.customer.CUSTOMER_INFO; +import jbo.app.tenwa.customer.CUSTOMER_PERSON; +import jbo.app.tenwa.doc.LB_DOCATTRIBUTE; +import jbo.app.tenwa.doc.LB_DOCRELATIVE; +import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; +import jbo.app.tenwa.doc.LB_ONEDIMENSIONALCODE; +import jbo.com.tenwa.entity.comm.officetempalte.BF_TEMPLATE; +import jbo.com.tenwa.lease.carbrand.LB_CONTRACT_SIGN_LOG; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_TEMPLATE; +import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; + + +public class MakeOneCodeAndContractModel { + + private static Logger logger=Logger.getLogger(ContractSignAction.class); + public HessianProxyFactory factory = new HessianProxyFactory(); + public HttpRequestAppService requestService; + + public String MOneDimensionalCode(String contractNo,String contractId,String projectId,String diskPath,JBOTransaction tx) throws Exception{ + JBarcode localJBarcode = new JBarcode(Code128Encoder.getInstance(), WidthCodedPainter.getInstance(), BaseLineTextPainter.getInstance()); + localJBarcode.setEncoder(Code128Encoder.getInstance()); + localJBarcode.setPainter(WidthCodedPainter.getInstance()); + localJBarcode.setBarHeight(10); + localJBarcode.setTextPainter(BaseLineTextPainter.getInstance()); + localJBarcode.setShowCheckDigit(false); + + BufferedImage localBufferedImage = null; + localBufferedImage = localJBarcode.createBarcode(contractNo); + //获取当前时间，根据时间创建一维码存放的路径 + Calendar now = Calendar.getInstance(); + String path = now.get(Calendar.YEAR)+"//"+(now.get(Calendar.MONTH) + 1) + "//"+now.get(Calendar.DAY_OF_MONTH); + File file = new File(diskPath+path); + if (!file.exists()) { + file.mkdirs(); + } + path=path+"//"+contractId+".jpg"; + OutputStream jos = null; + jos = new FileOutputStream(diskPath+path); + JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(jos); + JPEGEncodeParam jpegEP = JPEGCodec.getDefaultJPEGEncodeParam(localBufferedImage); + jpegEP.setQuality((float) 1, true); + try { + encoder.encode(localBufferedImage, jpegEP); + jos.flush(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + jos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + BizObjectManager attrBm = JBOFactory.getBizObjectManager(LB_ONEDIMENSIONALCODE.CLASS_NAME,tx); +// BizObjectManager attrBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_ONEDIMENSIONALCODE"); + BizObject attr=attrBm.newObject(); + attr.setAttributeValue("PROJECT_ID", projectId); + attr.setAttributeValue("CONTRACT_ID", contractId); + attr.setAttributeValue("CONTRACT_NO", contractNo); + attr.setAttributeValue("FileName", contractId+".jpg"); + Date date= new Date(System.currentTimeMillis()); + String pattern="yyyy/MM/dd HH:mm:ss"; + SimpleDateFormat sdf= new SimpleDateFormat(pattern); + attr.setAttributeValue("InputTime",sdf.format(date)); + attr.setAttributeValue("objectType", "OneDimensionalCode"); + + attr.setAttributeValue("FilePath",path); + attr.setAttributeValue("FullPath",diskPath+path); + attr.setAttributeValue("Content_Type", "jpg"); +// tx.join(attrBm); + attrBm.saveObject(attr); + return diskPath+path; + } + /** + * 生成word文档 + * @param sTemplateParam 生成word文档的参数 + * @param tempid 模板的id + * @param tx + * @return + * @throws Exception + */ + public String createBqWord(String sTemplateParam,String tempid,JBOTransaction tx) throws Exception{ + List message=new ArrayList(); + //生成参数 + JSONObject paramJson=JSONDecoder.decode(sTemplateParam); + MapsourceMap=FileOperatorUtil.getJsonObjectToMap(paramJson); + BqCreateOfficeService officeSer=new BqCreateOfficeService(tx); + if(tempid.length()>0){ + BizObjectManager bmbt = JBOFactory.getBizObjectManager(BF_TEMPLATE.CLASS_NAME); + tx.join(bmbt); + BizObject bobt=bmbt.createQuery("id=:id").setParameter("id",tempid).getSingleResult(false); + String TWO_CLASSIFY = bobt.getAttribute("TWOCLASSIFY").toString(); + String THREE_CLASSIFY = bobt.getAttribute("THREECLASSIFY").toString(); + String FOUR_CLASSIFY = bobt.getAttribute("FOURCLASSIFY").toString(); + String TEMPLATEVERSION = bobt.getAttribute("TEMPLATEVERSION").toString(); + if(bobt==null||TWO_CLASSIFY==null||THREE_CLASSIFY==null||FOUR_CLASSIFY==null||TEMPLATEVERSION==null){ + message.add(NameManager.getItemName("ProductContractTemplate", THREE_CLASSIFY)+"未找到模板配置！"); + }else{ + // 保存LB_CONTRACT_TEMPLATE表 + BizObjectManager bm = JBOFactory.getBizObjectManager(LB_CONTRACT_TEMPLATE.CLASS_NAME); + tx.join(bm); + BizObject bo = bm.newObject(); + String id=UUIDUtil.getUUID(); + bo.setAttributeValue("id", id); + bo.setAttributeValue("ONE_CLASSIFY", TWO_CLASSIFY); + bo.setAttributeValue("TWO_CLASSIFY", THREE_CLASSIFY); + bo.setAttributeValue("THREE_CLASSIFY", FOUR_CLASSIFY); + bo.setAttributeValue("FOUR_CLASSIFY", TEMPLATEVERSION); + // bo.setAttributeValue("CONTRACT_NUMBER", boc.getAttribute("CONTRACT_NUMBER").getString()); + bo.setAttributeValue("CONTRACT_ID", sourceMap.get("CONTRACT_ID")); + bo.setAttributeValue("FLOWUNID", sourceMap.get("FLOW_UNID")); + bm.saveObject(bo); + bo.getKey(); + sourceMap.put("TEMPLATE_ID", id); + BizObject rela=JBOFactory.createBizObjectQuery(LB_DOCRELATIVE.CLASS_NAME,"TEMPLATE_ID=:tempid").setParameter("tempid", tempid).getSingleResult(false); + if(rela!=null){ + DocListAction doc=new DocListAction(); + doc.setRelativeId(rela.getAttribute("id").getString()); + doc.deleteRelative(tx); + } + officeSer.createOfficeByTemplateNo(bobt.getAttribute("id").getString(), sourceMap); + } + } + return message.toString(); + } + //word转pdf + public String wordTopdf(String projectId,String contractId,JBOTransaction tx) throws Exception{ + String pdfPath=""; + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + BizObjectManager attrBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx); + BizObjectManager lulManage = JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME, tx); + BizObject lul = lulManage.createQuery("project_id=:projectid").setParameter("projectid", projectId).getSingleResult(false); + String customername = null; + String telephone = null; + String ids =null; + if(lul!=null){ + ids = lul.getAttribute("CUSTOMER_ID").toString(); + customername = lul.getAttribute("CUSTOMER_NAME").toString(); + BizObjectManager ciManage = JBOFactory.getBizObjectManager(CUSTOMER_INFO.CLASS_NAME, tx); + BizObject ci = ciManage.createQuery("customerid=:customerid").setParameter("customerid", lul.getAttribute("CUSTOMER_ID").getString()).getSingleResult(false); + BizObjectManager cpManage = JBOFactory.getBizObjectManager(CUSTOMER_PERSON.CLASS_NAME, tx); + BizObject cp = cpManage.createQuery("customerid=:customerid").setParameter("customerid", lul.getAttribute("CUSTOMER_ID").getString()).getSingleResult(false); + if(ci!=null&&"03".equals(ci.getAttribute("customertype").getString())){ + telephone = (cp==null?"":cp.getAttribute("mobile").getString()); + } + } + + WordToPDFUtil wordTopdf = new WordToPDFUtil(); + File file = null; + Boolean result = null; + List bo = contBom.createQuery("contract_id=:contractId and file_flag='yes' and process='1'").setParameter("contractId", contractId).getResultList(true); + if (bo != null) { + for (BizObject contBo : bo) { + String attrId = contBo.getAttribute("ATTRIBUTE_ID").toString(); + BizObject attrBo = attrBom.createQuery("id='" +attrId+"'").getSingleResult(true); + String path = attrBo.getAttribute("FULLPATH").toString(); + String lastFilePath = path.replace(".docx", ".pdf"); + File filePath = new File(path); + if(!filePath.exists()){ + logger.info("word转换pdf的源文件不存在"); + continue; + } + String lastFilePathpdf = filePath.getParent(); + try { + result = wordTopdf.Word2Pdf(path, lastFilePathpdf); + } catch (Exception e) { + result = false; + e.printStackTrace(); + } + if (result) { + file =new File(lastFilePath); + contBo.setAttributeValue("FULLPATH",lastFilePath); + contBo.setAttributeValue("FILENAME",contBo.getAttribute("FILENAME").toString().replace(".docx",".pdf" )); + contBo.setAttributeValue("FILEPATH",contBo.getAttribute("FILEPATH").toString().replace(".docx", ".pdf")); + contBo.setAttributeValue("CONTENT_TYPE","application/pdf"); + contBo.setAttributeValue("PROCESS","2"); + contBo.setAttributeValue("PROJECT_ID",projectId); + contBo.setAttributeValue("CUSTOMERNAME",customername); + contBo.setAttributeValue("TELEPHONE",telephone); + contBo.setAttributeValue("IDS",ids); + contBom.saveObject(contBo); + pdfPath=attrBo.getAttribute("FULLPATH").toString().replace(".docx", ".pdf"); + attrBo.setAttributeValue("FULLPATH",attrBo.getAttribute("FULLPATH").toString().replace(".docx", ".pdf")); + attrBo.setAttributeValue("FILENAME",attrBo.getAttribute("FILENAME").toString().replace(".docx", ".pdf")); + attrBo.setAttributeValue("FILEPATH",attrBo.getAttribute("FILEPATH").toString().replace(".docx", ".pdf")); + attrBo.setAttributeValue("FileSize",file.length()); + attrBo.setAttributeValue("CONTENT_TYPE","application/pdf"); + attrBom.saveObject(attrBo); + }else{ + contBo.setAttributeValue("PROCESS","3"); + contBom.saveObject(contBo); + } + } + } + return pdfPath; + } + /** + * 向pdf插入一维码图片 + * @param outPdfFile 插入后输出的路径 + * @param markImagePath 一维码的图片路径 + * @param tx 事务 + * @return + * @throws Exception + */ + public String pdfAndMark(String outPdfFile, String markImagePath,String contractId,String leasform,JBOTransaction tx) throws Exception{ + + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + BizObjectManager attrBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx); + BizObjectManager loscBom = JBOFactory.getBizObjectManager(LB_ONEDIMENSIONALCODE.CLASS_NAME, tx); + BizObject losc = loscBom.createQuery("CONTRACT_ID=:contractId").setParameter("contractId", contractId).getSingleResult(true); + if(markImagePath.length()<=0){ + if(losc!=null){ + markImagePath = losc.getAttribute("FULLPATH").getString(); + } + } + BizObject cont = contBom.createQuery("contract_id=:contractId and file_flag='yes'").setParameter("contractId", contractId).getSingleResult(true); + String newPath = ""; + String split =""; + String InPdfFile=""; + if(cont!=null){ + InPdfFile=cont.getAttribute("fullpath").toString(); + split = cont.getAttribute("filepath").toString(); + File file = new File(outPdfFile+split.substring(0,split.lastIndexOf("/"))); + if (!file.exists()) { + file.mkdirs(); + } + newPath=outPdfFile+split; + }else{ + return "error"; + } + PdfReader reader = new PdfReader(InPdfFile, "PDF".getBytes()); + int pages = reader.getNumberOfPages();//获取pdf的总页数 + PdfStamper stamp = new PdfStamper(reader, new FileOutputStream(newPath)); + Image img = Image.getInstance(markImagePath);//插入水印 + //设置图片宽度和高度 + img.scaleAbsolute(160, 22); + //设置图片水印的位置。 + img.setAbsolutePosition(400, 785); + + PdfContentByte under = stamp.getUnderContent(1); + under.addImage(img); + if(pages>2&&"02".equals(leasform)){ + PdfContentByte under2 = stamp.getUnderContent(3); + under2.addImage(img); + } + + + stamp.close();// 关闭 + File tempfile = new File(InPdfFile); + //删除原文件 + + if(tempfile.exists()) { + tempfile.delete(); + } + + cont.setAttributeValue("FULLPATH",newPath); + contBom.saveObject(cont); + BizObject attr = attrBom.createQuery("ID=:id").setParameter("id", cont.getAttribute("attribute_id").getString()).getSingleResult(true); + if(attr!=null){ + attr.setAttributeValue("FULLPATH",newPath); + attrBom.saveObject(attr); + } + return newPath; + } + + //公司盖章 + public String compnySignIng(String contract_Id,JBOTransaction tx) throws Exception { + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + Map map = new HashMap(); + ContractSignInfo con = null; + List bo = null; + BizObject ldclBo = null; + + // 查询lb_doc_contract_list表 + bo = contBom.createQuery("contract_id=:contractId and file_flag='yes' and (sendprocess='0' or sendprocess='2' ) ").setParameter("contractId", contract_Id).getResultList(true); + for (BizObject keys : bo) { + String info = keys.getAttribute("id").toString(); + con = new ContractSignInfo(); + con.setCustname(keys.getAttribute("DOC_NAME").toString()); + con.setCustphone(keys.getAttribute("TELEPHONE").toString()); + con.setFileid(keys.getAttribute("ATTRIBUTE_ID").toString()); + con.setFilename(keys.getAttribute("FILENAME").toString()); + // 获取生成文件路径 + String makefullPath = keys.getAttribute("FULLPATH").toString(); + File file = new File(makefullPath); + if (!file.exists()) { + throw new RuntimeException("要读取的文件不存在"); + } + con.setInputfile(BASE64.encodeImgageToBase64(file)); + map.put(info, con); + } + Map fromCondtion = new HashMap(); + Map otherProperty = new HashMap(); + Map resultMap = requestService.compnySign(map); + if (!resultMap.containsKey("error")) { + for (String key : resultMap.keySet()) { + // 存储契约锁返回的合同id和合同文件id + if (key.indexOf("contract_") == -1) { + fromCondtion.clear(); + otherProperty.clear(); + // 契约锁合同号 + String contractId = resultMap.get("contract_" + key); + String sendProcess = resultMap.get("contract_" + contractId); + ldclBo = contBom.createQuery("ATTRIBUTE_ID='" + key + "'").getSingleResult(true); + ldclBo.setAttributeValue("DOCUMENT_ID", resultMap.get(key)); + ldclBo.setAttributeValue("SINGCONTRACT_ID", contractId); + ldclBo.setAttributeValue("SIGN_TYPE", "COMPLETE");//法人客户当盖完章改为完成状态 + ldclBo.setAttributeValue("SENDPROCESS", sendProcess); + contBom.saveObject(ldclBo); + + String contractDocId = ldclBo.getAttribute("id").toString(); + fromCondtion.put("id", contractDocId); + otherProperty.put("SIGNPROCESS", "0");// 发起电子签约 + otherProperty.put("CONTRACTDOCID", contractDocId);// 发起电子签约 + otherProperty.put("INPUTTIME",DateAssistant.getTodayNow()); + //拷表的方法 + DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion, LB_CONTRACT_SIGN_LOG.CLASS_NAME, null, + otherProperty, tx); + } + } + downloadDoc(contract_Id,tx); + return "success"; + } else { + Boolean flag = false; + String getMessage = resultMap.get("error"); + logger.info("契约锁反馈的异常信息" + getMessage); + for (String key : resultMap.keySet()) { + // 存储契约锁返回的合同id和合同文件id + if (key.indexOf("contract_") == -1 && !"error".equals(key)) { + fromCondtion.clear(); + otherProperty.clear(); + // 契约锁合同号 + String contractId = resultMap.get("contract_" + key); + String sendProcess = resultMap.get("contract_" + contractId); + ldclBo = contBom.createQuery("ATTRIBUTE_ID='" + key + "'").getSingleResult(true); + ldclBo.setAttributeValue("DOCUMENT_ID", resultMap.get(key)); + ldclBo.setAttributeValue("SINGCONTRACT_ID", contractId); + ldclBo.setAttributeValue("SENDPROCESS", sendProcess); + if ("1".equals(sendProcess)) { + flag = true; + ldclBo.setAttributeValue("SIGN_TYPE", "SIGNING"); + }else if("2".equals(sendProcess)){ + ldclBo.setAttributeValue("MESSAGE",getMessage ); + } + contBom.saveObject(ldclBo); + + String contractDocId = ldclBo.getAttribute("id").toString(); + fromCondtion.put("ID", contractDocId); + otherProperty.put("SIGNPROCESS", "0");//发起电子签约 + otherProperty.put("CONTRACTDOCID",contractDocId);//发起电子签约 + otherProperty.put("INPUTTIME",DateAssistant.getTodayNow()); + DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion, LB_CONTRACT_SIGN_LOG.CLASS_NAME, null, + otherProperty, tx); + } + } + // 判断不同的异常反馈给前端 + if (getMessage.indexOf("用户认证信息与合同签署方信息不匹配") != -1) { + getMessage = getMessage.substring((getMessage.indexOf("message")) + 10, (getMessage.indexOf("code")) - 3); + return flag + "@" + getMessage; + } else if (getMessage.indexOf("contractId不能为空") != -1) { + return flag + "@" + getMessage; + } else { + return flag + "@" + "error"; + } + } + } + + /** + * 根据document_id下载合同 + * + * @param tx + * @return + * @throws Exception + * @throws Exception + * @throws MalformedURLException + */ + public String downloadDoc(String contract_id,JBOTransaction tx) throws MalformedURLException, Exception { + requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + String sql = ""; + sql = "contract_id=:contractid and file_flag='yes'"; + try { + + @SuppressWarnings("unchecked") + List bo = contBom.createQuery(sql).setParameter("contractid", contract_id).getResultList(true); + if (bo != null) { + Map map = new HashMap(); + for (BizObject keys : bo) { + map.put(keys.getAttribute("DOCUMENT_ID").toString(), keys.getAttribute("FULLPATH").toString()); + } + Map result = requestService.downloadDoc(map); + if (!result.containsKey("error")) { + for (String contractId : map.keySet()) { + try { + if ("success".equals(result.get(contractId))) { + String fileString = result.get("file_" + contractId); + InputStream fileInput = BASE64.encodeFileToBase64(fileString); + OutputStream fileOut = new FileOutputStream(map.get(contractId));// TODO + byte[] buffByte = new byte[1024]; + int size = 0; + while ((size = fileInput.read(buffByte)) != -1) { + fileOut.write(buffByte, 0, size); + } + fileInput.close(); + fileOut.close(); + } else if ("error".equals(result.get(contractId))) { + return "error"; + } + } catch (Exception e) { + e.printStackTrace(); + + } + } + return "success"; + } else { + return "error"; + } + } + } catch (Exception e) { + return "error"; + } + return "success"; + } + @SuppressWarnings("deprecation") + public static String getConfigRequestUrl() throws Exception{ + return Configure.getInstance().getConfigure("RequestHessionUrl"); + } + + public Map fileBase(String contractId){ + Map fileNameBase = new HashMap(); + try { + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); + BizObject cont = contBom.createQuery(" contract_id=:contractid and file_flag='yes' and (sendprocess='0' or sendprocess='2' ) ").setParameter("contractid", contractId).getSingleResult(false); + if(cont==null){ + return fileNameBase; + } + String newPath = cont.getAttribute("fullpath").getString(); + File file = new File(newPath); + if (!file.exists()) { + return fileNameBase; + } + // return BASE64.encodeImgageToBase64(file); + fileNameBase.put("fileName", newPath.substring(newPath.lastIndexOf("/")+1)); + fileNameBase.put("outputFile", BASE64.encodeImgageToBase64(file)); + } catch (JBOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return fileNameBase; + } + + + /** + * 北汽合同变更方法 + * @throws Exception + */ + public void BqChangecontract(String contractId,JBOTransaction tx) throws Exception{ + //删除之前生成的文件 + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx); + List conts = contBom.createQuery(" contract_id=:contractid ").setParameter("contractid", contractId).getResultList(true); + for (BizObject cont : conts) { + cont.setAttributeValue("file_flag", "no"); + contBom.saveObject(cont); + } + BizObjectManager lctBom = JBOFactory.getBizObjectManager(LB_CONTRACT_TEMPLATE.CLASS_NAME,tx); + List lcts = lctBom.createQuery(" contract_id=:contractid ").setParameter("contractid", contractId).getResultList(true); + for (BizObject lct : lcts) { + lctBom.deleteObject(lct); + } + } +} diff --git a/src_tenwa/com/tenwa/platform/controller/CustomerInfoController.java b/src_tenwa/com/tenwa/platform/controller/CustomerInfoController.java deleted file mode 100644 index 3e71ea9af..000000000 --- a/src_tenwa/com/tenwa/platform/controller/CustomerInfoController.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.tenwa.platform.controller; - -import com.amarsoft.are.jbo.*; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import jbo.app.tenwa.customer.*; -import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; -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_PROJECT_INFO; -import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; -import jbo.sys.*; -import org.codehaus.jackson.map.ObjectMapper; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -public class CustomerInfoController { - - public String serial; - public String currUserId; - public String channel; - public String sourcetype; - public String operationType; - public String applicationNo; - public String customerType; - - // 自然人类型字典值 - private String CUSTOMER_TYPE_PERSON = "03"; - // 法人类型字典值 - private String CUSTOMER_TYPE_COMPANY = "01"; - - // 合同起租状态字典值 - private String BUSINESS_STATUS_31 = "31"; - - public String change(JBOTransaction tx) { - Map result = new HashMap<>(); - try { - BizObjectManager pfProjectInfoManager = JBOFactory.getBizObjectManager(PF_PROJECT_INFO.CLASS_NAME, tx); - BizObject pfProjectInfo = pfProjectInfoManager.createQuery(" APPLICATION_NO=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - String isNetCar = pfProjectInfo.getAttribute(PF_PROJECT_INFO.IS_NETCAR).getString(); - - BizObjectManager lbUnionLesseeManager = JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME, tx); - BizObject lbUnionLessee = lbUnionLesseeManager.createQuery(" CONTRACT_NUMBER=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - String customerId = lbUnionLessee.getAttribute(LB_UNION_LESSEE.CUSTOMER_ID).getString(); - - if (CUSTOMER_TYPE_PERSON.equals(customerType)) { - // 自然人客户 - BizObjectManager customerPersonManager = JBOFactory.getBizObjectManager(CUSTOMER_PERSON.CLASS_NAME, tx); - BizObject customerPerson = customerPersonManager.createQuery(" CUSTOMER_ID=:customerId").setParameter("customerId", customerId).getSingleResult(false); - BizObjectManager customerAddressManager = JBOFactory.getBizObjectManager(CUSTOMER_ADDRESS.CLASS_NAME, tx); - BizObject customerAddress = customerAddressManager.createQuery(" CUSTOMER_ID=:customerId").setParameter("customerId", customerId).getSingleResult(false); - BizObjectManager customerFamilyManager = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY.CLASS_NAME, tx); - BizObject customerFamily = customerFamilyManager.createQuery(" CUSTOMER_ID=:customerId").setParameter("customerId", customerId).getSingleResult(false); - BizObjectManager contractInfoManager = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, tx); - BizObject contractInfo = contractInfoManager.createQuery(" CONTRACT_NUMBER=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - - - BizObjectManager pfCustomerPersonManager = JBOFactory.getBizObjectManager(PF_CUSTOMER_PERSON.CLASS_NAME, tx); - BizObject pfCustomerPerson = pfCustomerPersonManager.createQuery(" APPLICATION_NO=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - BizObjectManager pfCustomerAddressManager = JBOFactory.getBizObjectManager(PF_CUSTOMER_ADDRESS.CLASS_NAME, tx); - BizObject pfCustomerAddress = pfCustomerAddressManager.createQuery(" APPLICATION_NO=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - BizObjectManager pfCustomerFamilyManager = JBOFactory.getBizObjectManager(PF_CUSTOMER_FAMILY.CLASS_NAME, tx); - BizObject pfCustomerFamily = pfCustomerFamilyManager.createQuery(" APPLICATION_NO=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - - BizObjectManager customerPersonTempManager = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME, tx); - BizObject customerPersonTemp = customerPersonTempManager.newObject(); - BizObjectManager customerAddressTempManager = JBOFactory.getBizObjectManager(CUSTOMER_ADDRESS_TEMP.CLASS_NAME, tx); - BizObject customerAddressTemp = customerAddressTempManager.newObject(); - BizObjectManager customerFamilyTempManager = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME, tx); - BizObject customerFamilyTemp = customerFamilyTempManager.newObject(); - BizObjectManager contractInfoTempManager = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO_TEMP.CLASS_NAME, tx); - BizObject contractInfoTemp = contractInfoTempManager.newObject(); - - DataOperatorUtil.coptyJBOPropertyNoKey(pfCustomerPerson, customerPerson); - DataOperatorUtil.coptyJBOPropertyNoKey(pfCustomerAddress, customerAddress); - DataOperatorUtil.coptyJBOPropertyNoKey(pfCustomerFamily, customerFamily); - - DataOperatorUtil.coptyJBOPropertyNoKey(customerPerson, customerPersonTemp); - DataOperatorUtil.coptyJBOPropertyNoKey(customerAddress, customerAddressTemp); - DataOperatorUtil.coptyJBOPropertyNoKey(customerFamily, customerFamilyTemp); - DataOperatorUtil.coptyJBOPropertyNoKey(contractInfo, contractInfoTemp); - contractInfoTemp.setAttributeValue(LB_CONTRACT_INFO_TEMP.IS_NETCAR, isNetCar); - - customerPersonTempManager.saveObject(customerPersonTemp); - customerAddressTempManager.saveObject(customerAddressTemp); - customerFamilyTempManager.saveObject(customerFamilyTemp); - contractInfoTempManager.saveObject(contractInfoTemp); - } else { - // 法人客户 - BizObjectManager customerPersonManager = JBOFactory.getBizObjectManager(CUSTOMER_PERSON.CLASS_NAME, tx); - BizObject customerPerson = customerPersonManager.createQuery(" CUSTOMER_ID=:customerId").setParameter("customerId", customerId).getSingleResult(false); - BizObjectManager customerFamilyManager = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY.CLASS_NAME, tx); - BizObject customerFamily = customerFamilyManager.createQuery(" CUSTOMER_ID=:customerId").setParameter("customerId", customerId).getSingleResult(false); - BizObjectManager contractInfoManager = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, tx); - BizObject contractInfo = contractInfoManager.createQuery(" CONTRACT_NUMBER=:customerId").setParameter("customerId", customerId).getSingleResult(false); - - BizObjectManager pfCustomerPersonManager = JBOFactory.getBizObjectManager(PF_CUSTOMER_PERSON.CLASS_NAME, tx); - BizObject pfCustomerPerson = pfCustomerPersonManager.createQuery(" APPLICATION_NO=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - BizObjectManager pfCustomerFamilyManager = JBOFactory.getBizObjectManager(PF_CUSTOMER_FAMILY.CLASS_NAME, tx); - BizObject pfCustomerFamily = pfCustomerFamilyManager.createQuery(" APPLICATION_NO=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - - BizObjectManager customerPersonTempManager = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME, tx); - BizObject customerPersonTemp = customerPersonTempManager.newObject(); - BizObjectManager customerFamilyTempManager = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME, tx); - BizObject customerFamilyTemp = customerFamilyTempManager.newObject(); - BizObjectManager contractInfoTempManager = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO_TEMP.CLASS_NAME, tx); - BizObject contractInfoTemp = contractInfoTempManager.newObject(); - - DataOperatorUtil.coptyJBOPropertyNoKey(pfCustomerPerson, customerPerson); - DataOperatorUtil.coptyJBOPropertyNoKey(pfCustomerFamily, customerFamily); - - DataOperatorUtil.coptyJBOPropertyNoKey(customerPerson, customerPersonTemp); - DataOperatorUtil.coptyJBOPropertyNoKey(customerFamily, customerFamilyTemp); - DataOperatorUtil.coptyJBOPropertyNoKey(contractInfo, contractInfoTemp); - contractInfoTemp.setAttributeValue(LB_CONTRACT_INFO_TEMP.IS_NETCAR, isNetCar); - - customerPersonTempManager.saveObject(customerPersonTemp); - customerFamilyTempManager.saveObject(customerFamilyTemp); - contractInfoTempManager.saveObject(contractInfoTemp); - } - // 发起起租后客户信息变更流程 - - result.put("success", true); - result.put("msg", "发起起租后客户信息变更流程成功"); - } catch (JBOException e) { - result.put("success", false); - result.put("msg", "发起起租后客户信息变更出现异常"); - e.printStackTrace(); - } finally { - try { - return new ObjectMapper().writeValueAsString(result); - } catch (IOException e) { - e.printStackTrace(); - return "{'success': false, 'msg': '发起起租后客户信息变更出现异常'}"; - } - } - } - - - public String getSerial() { - return serial; - } - - public void setSerial(String serial) { - this.serial = serial; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getChannel() { - return channel; - } - - public void setChannel(String channel) { - this.channel = channel; - } - - public String getSourcetype() { - return sourcetype; - } - - public void setSourcetype(String sourcetype) { - this.sourcetype = sourcetype; - } - - public String getOperationType() { - return operationType; - } - - public void setOperationType(String operationType) { - this.operationType = operationType; - } - - public String getApplicationNo() { - return applicationNo; - } - - public void setApplicationNo(String applicationNo) { - this.applicationNo = applicationNo; - } - - public String getCustomerType() { - return customerType; - } - - public void setCustomerType(String customerType) { - this.customerType = customerType; - } -} diff --git a/src_tenwa/com/tenwa/platform/controller/CustomrAccountController.java b/src_tenwa/com/tenwa/platform/controller/CustomrAccountController.java deleted file mode 100644 index f4cfad30c..000000000 --- a/src_tenwa/com/tenwa/platform/controller/CustomrAccountController.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.tenwa.platform.controller; - -import com.amarsoft.are.jbo.*; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; -import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP; -import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; -import jbo.sys.PF_CUSTOMER_ACCOUNT; -import org.codehaus.jackson.map.ObjectMapper; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -public class CustomrAccountController { - - public String serial; - public String currUserId; - public String channel; - public String sourcetype; - public String operationType; - public String applicationNo; - - - private String BUSINESS_STATUS_31 = "31"; - - public String change(JBOTransaction tx) { - Map result = new HashMap<>(); - - try { - // 查询合同信息 - BizObjectManager contractInfoManager = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, tx); - BizObject contractInfo = contractInfoManager.createQuery("CONTRACT_NUMBER=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - String contractId = contractInfo.getAttribute(LB_CONTRACT_INFO.ID).toString(); - - // 新的扣款卡信息 - BizObjectManager pfCustomerAccountManager = JBOFactory.getBizObjectManager(PF_CUSTOMER_ACCOUNT.CLASS_NAME, tx); - BizObject pfCustomerAccount = pfCustomerAccountManager.createQuery("SERIAL=:serial").setParameter("serial", serial).getSingleResult(false); - String newAccount = pfCustomerAccount.getAttribute(PF_CUSTOMER_ACCOUNT.account).toString(); - String newAccNumber = pfCustomerAccount.getAttribute(PF_CUSTOMER_ACCOUNT.acc_number).toString(); - String newBankName = pfCustomerAccount.getAttribute(PF_CUSTOMER_ACCOUNT.bank_name).toString(); - String newMobile = pfCustomerAccount.getAttribute(PF_CUSTOMER_ACCOUNT.MOBILE).toString(); - - // 查询合同状态 - BizObjectManager businessStatusManager = JBOFactory.getBizObjectManager(BUSINESS_STATUS.CLASS_NAME, tx); - BizObject businessStatus = businessStatusManager.createQuery("CONTRACT_NUMBER=:applicationNo").setParameter("applicationNo", applicationNo).getSingleResult(false); - - if (businessStatus != null & BUSINESS_STATUS_31.equals(businessStatus.getAttribute(BUSINESS_STATUS.business_status).toString())) { - // TODO 查询流程状态，处于扣款卡变更流程中返回错误 - - // 发起扣款卡信息变更流程 - Map otherProperty = new HashMap<>(); - otherProperty.put(CUSTOMER_ACCOUNT_TEMP.account, newAccount); - otherProperty.put(CUSTOMER_ACCOUNT_TEMP.acc_number, newAccNumber); - otherProperty.put(CUSTOMER_ACCOUNT_TEMP.bank_name, newBankName); - otherProperty.put(CUSTOMER_ACCOUNT_TEMP.MOBILE, newMobile); - - Map fromCondition = new HashMap<>(); - fromCondition.put(CUSTOMER_ACCOUNT.contract_id, contractId); - DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT.CLASS_NAME, fromCondition, CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, null, otherProperty, tx); - - // TODO 发起扣款卡变更流程 - - result.put("success", true); - result.put("msg", "发起扣款卡信息变更流程成功"); - } else { - // 直接变更扣款卡信息 - BizObjectManager custmerAccountManager = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME, tx); - BizObject customerAccount = custmerAccountManager.createQuery("contract_id=:contractId").setParameter("contractId", contractId).getSingleResult(false); - customerAccount.setAttributeValue(CUSTOMER_ACCOUNT.account, newAccount); - customerAccount.setAttributeValue(CUSTOMER_ACCOUNT.acc_number, newAccNumber); - customerAccount.setAttributeValue(CUSTOMER_ACCOUNT.bank_name, newBankName); - customerAccount.setAttributeValue(CUSTOMER_ACCOUNT.MOBILE, newMobile); - custmerAccountManager.saveObject(customerAccount); - result.put("success", true); - result.put("msg", "扣款卡信息变更成功"); - } - } catch (JBOException e) { - result.put("success", false); - result.put("msg", "扣款卡信息变更出现异常"); - e.printStackTrace(); - } finally { - try { - return new ObjectMapper().writeValueAsString(result); - } catch (IOException e) { - e.printStackTrace(); - return "{'success': false, 'msg': '扣款卡信息变更出现异常'}"; - } - } - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getChannel() { - return channel; - } - - public void setChannel(String channel) { - this.channel = channel; - } - - public String getSourcetype() { - return sourcetype; - } - - public void setSourcetype(String sourcetype) { - this.sourcetype = sourcetype; - } - - public String getOperationType() { - return operationType; - } - - public void setOperationType(String operationType) { - this.operationType = operationType; - } - - public String getApplicationNo() { - return applicationNo; - } - - public void setApplicationNo(String applicationNo) { - this.applicationNo = applicationNo; - } - - -} diff --git a/src_tenwa/quartz/AutoDistribute.java b/src_tenwa/quartz/AutoDistribute.java index e02bbbc38..2f3d86dc9 100644 --- a/src_tenwa/quartz/AutoDistribute.java +++ b/src_tenwa/quartz/AutoDistribute.java @@ -6,10 +6,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import jbo.com.tenwa.lease.comm.DAY_DISTRIBUTE; -import jbo.com.tenwa.lease.comm.VI_AUTODISTRIBUTE; -import jbo.sys.OVERDUE_DUNNING_INFO; - import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -26,19 +22,14 @@ import com.base.util.QuartzUtil; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.lease.app.quartzmession.JobInitUserName; +import jbo.com.tenwa.lease.comm.DAY_DISTRIBUTE; +import jbo.com.tenwa.lease.comm.VI_AUTODISTRIBUTE; +import jbo.sys.OVERDUE_DUNNING_INFO; + public class AutoDistribute implements Job { private JobInitUserName jboName; //指定的北财催款员id（正式环境需要修改） - private String beicaiUserID = "8006U00000019"; - - //北财合作方角色 800R00000044 - private String beicaiRoleId = "800R00000044"; - - //指定的凯捷催款员id（正式环境需要修改） - private String kjUserID = "8006U00000017"; - - //凯捷合作方角色 - private String kjRoleId = "800R00000048"; + private String beicaiUserID = "8009011U00000021"; @Override @@ -54,17 +45,9 @@ public class AutoDistribute implements Job { ownershipTransferSign(tx, arg0); //北财逾期的合同分配给指定催款员 distributeBeicai(tx, arg0); - //凯捷逾期的合同分配给指定催款员 - distributekaijie(tx, arg0); tx.commit(); QuartzUtil.insertLog(startime, "quartz.AutoDistribute", "success","成功", curUserId); } catch (Exception e) { - try { - tx.rollback(); - } catch (JBOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } QuartzUtil.insertLog(startime, "quartz.AutoDistribute", "error","失败", curUserId); e.printStackTrace(); } @@ -76,8 +59,8 @@ public class AutoDistribute implements Job { * @param arg0 * @throws JBOException */ - public void distributeBeicai(JBOTransaction tx, JobExecutionContext arg0) throws JBOException { - + public void distributeBeicai(JBOTransaction tx, JobExecutionContext arg0) { + try { // 获取所有逾期的需要催收的合同信息 BizObjectManager bom; BizObjectManager overdueManager; @@ -85,7 +68,7 @@ public class AutoDistribute implements Job { overdueManager = JBOFactory.getBizObjectManager(OVERDUE_DUNNING_INFO.CLASS_NAME, tx); bom = JBOFactory.getBizObjectManager(VI_AUTODISTRIBUTE.CLASS_NAME, tx); @SuppressWarnings("unchecked") - List boList = bom.createQuery("SELECT O.id,O.over_days FROM O WHERE O.project_manage IN (SELECT ur.userid FROM jbo.awe.USER_ROLE ur WHERE ur.roleid ='"+beicaiRoleId+"')").getResultList(false); + List boList = bom.createQuery("SELECT O.id,O.over_days FROM O WHERE O.project_manage IN (SELECT ur.userid FROM jbo.awe.USER_ROLE ur WHERE ur.roleid ='800R00000044')").getResultList(false); for (BizObject bo : boList) { String contractId = bo.getAttribute("id").toString(); @@ -99,52 +82,15 @@ public class AutoDistribute implements Job { overdueBizObject.setAttributeValue("part_dept", beicaiUserID); overdueBizObject.setAttributeValue("contract_id", contractId); overdueManager.saveObject(overdueBizObject); - }else{ - overdueManager.createQuery("update O set part_dept=:part_dept where contract_id=:contract_id") - .setParameter("contract_id", contractId) - .setParameter("part_dept", beicaiUserID).executeUpdate(); } } + }catch(JBOException e) { + e.printStackTrace(); + } } - /** - * 凯捷逾期的合同分配给指定催款员 - * @param tx - * @param arg0 - * @throws JBOException - */ - public void distributekaijie(JBOTransaction tx, JobExecutionContext arg0) throws JBOException { - - // 获取所有逾期的需要催收的合同信息 - BizObjectManager bom; - BizObjectManager overdueManager; - - overdueManager = JBOFactory.getBizObjectManager(OVERDUE_DUNNING_INFO.CLASS_NAME, tx); - bom = JBOFactory.getBizObjectManager(VI_AUTODISTRIBUTE.CLASS_NAME, tx); - @SuppressWarnings("unchecked") - List boList = bom.createQuery("SELECT O.id,O.over_days FROM O WHERE O.project_manage IN (SELECT ur.userid FROM jbo.awe.USER_ROLE ur WHERE ur.roleid ='"+kjRoleId+"')").getResultList(false); - for (BizObject bo : boList) { - String contractId = bo.getAttribute("id").toString(); - - //查询是否已经有催款员(目前北财只有一个指定的催款员) - BizObject overdue = overdueManager.createQuery("contract_id=:contract_id").setParameter("contract_id", contractId).getSingleResult(false); - if(overdue == null){ - BizObject overdueBizObject = overdueManager.newObject(); - String uuid = UUID.randomUUID().toString().replace("-", ""); - - overdueBizObject.setAttributeValue("id", uuid); - overdueBizObject.setAttributeValue("part_dept", kjUserID); - overdueBizObject.setAttributeValue("contract_id", contractId); - overdueManager.saveObject(overdueBizObject); - }else{ - overdueManager.createQuery("update O set part_dept=:part_dept where contract_id=:contract_id") - .setParameter("contract_id", contractId) - .setParameter("part_dept", beicaiUserID).executeUpdate(); - } - } - - } + /** * 给非北财分配催款员 diff --git a/src_tenwa/quartz/ContractInfoForNomalEndSign.java b/src_tenwa/quartz/ContractInfoForNomalEndSign.java index f5556d2cc..45540f059 100644 --- a/src_tenwa/quartz/ContractInfoForNomalEndSign.java +++ b/src_tenwa/quartz/ContractInfoForNomalEndSign.java @@ -1,12 +1,8 @@ package quartz; -import java.util.HashMap; import java.util.List; import java.util.Map; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; -import jbo.com.tenwa.lease.comm.VI_NORMALEND_CONTRACT; - import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -16,21 +12,13 @@ import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.util.StringFunction; -import com.amarsoft.awe.util.Transaction; -import com.amarsoft.context.ASUser; import com.base.util.QuartzUtil; -//import com.tenwa.action.channelportal.ContractSignAction; -//import com.tenwa.action.channelportal.comm.ContractTransferRightForEnd; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.comm.util.jboutil.SaveBusinessStatus; import com.tenwa.lease.app.quartzmession.JobInitUserName; import com.tenwa.officetempalte.action.CreateOfficeAction; -//import com.tenwa.quartz.BeforeSerialTimingTask; -//import com.tenwa.quartz.service.BeforeSerialTimingTaskService; -//import com.tenwa.quartz.serviceImpl.BeforeSerialTimingTaskServiceImpl; -import com.tenwa.reckon.util.UUIDUtil; -import org.apache.log4j.Logger; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; +import jbo.com.tenwa.lease.comm.VI_NORMALEND_CONTRACT; public class ContractInfoForNomalEndSign implements Job{ private JobInitUserName jboName; @@ -43,7 +31,7 @@ public class ContractInfoForNomalEndSign implements Job{ try { JBOTransaction tx = JBOFactory.createJBOTransaction(); - ownershipTransferSign(tx,arg0,startime); + ownershipTransferSign(tx,arg0); tx.commit(); QuartzUtil.insertLog(startime, "quartz.ContractInfoForNomalEndSign", "success", "成功", curUserId); } catch (Exception e) { @@ -52,7 +40,7 @@ public class ContractInfoForNomalEndSign implements Job{ } } - public void ownershipTransferSign(JBOTransaction tx ,JobExecutionContext arg0,String startime) throws Exception{ + public void ownershipTransferSign(JBOTransaction tx ,JobExecutionContext arg0) throws Exception{ String conInfo1 = getContractId(tx); if(!(conInfo1 == null || conInfo1.length() <= 0)){ String[] conInfos = conInfo1.split(","); @@ -60,7 +48,7 @@ public class ContractInfoForNomalEndSign implements Job{ // String customerName = conInfo.split("@")[1]; String contractId = conInfo.split("@")[0]; BizObjectManager bm = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, tx); - bm.createQuery("update O set contract_status = '105',ACTUAL_END_DATE='"+startime+"' where id = '"+contractId+"'").executeUpdate(); + bm.createQuery("update O set contract_status = '105' where id = '" + contractId + "'").executeUpdate(); SaveBusinessStatus.saveByContractId(contractId, tx, "61", jboName.getUserId(arg0, tx)); } } diff --git a/src_tenwa/quartz/DbOptimizePenalty.java b/src_tenwa/quartz/DbOptimizePenalty.java deleted file mode 100644 index 77a8a74c0..000000000 --- a/src_tenwa/quartz/DbOptimizePenalty.java +++ /dev/null @@ -1,42 +0,0 @@ -package quartz; - -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import com.amarsoft.are.jbo.JBOException; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.jbo.JBOTransaction; -import com.tenwa.reckon.util.Conn; - -public class DbOptimizePenalty implements Job { - - @Override - public void execute(JobExecutionContext arg0) throws JobExecutionException{ - JBOTransaction tx=null; - Conn conn=null; - try { - tx= JBOFactory.createJBOTransaction(); - conn= new Conn(tx); - - //插入数据到临时表 - String updateTemp= -"update\n" + -" lc_rent_plan lc\n" + -"left join vi_contract_penalty vi on vi.payment_number = lc.PAYMENT_NUMBER\n" + -"and lc.PLAN_LIST = vi.plan_list and lc.PLAN_DATE=vi.plan_date\n" + -"set lc.PENALTY=vi.penalty"; - conn.executeUpdate(updateTemp); - tx.commit(); - } catch (Exception e) { - try { - if(tx!=null){ - tx.rollback(); - } - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - } - } -} diff --git a/璧勬簮绠＄悊/ADE宸ュ叿/ADE甯哥敤宸ュ叿 b/璧勬簮绠＄悊/ADE宸ュ叿/ADE甯哥敤宸ュ叿 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/ADE宸ュ叿/ADE琛ㄥ瓧娈甸厤缃 b/璧勬簮绠＄悊/ADE宸ュ叿/ADE琛ㄥ瓧娈甸厤缃 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/ADE宸ュ叿/JSP妯℃澘缁存姢 b/璧勬簮绠＄悊/ADE宸ュ叿/JSP妯℃澘缁存姢 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/浠ｇ爜绠＄悊 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/浠ｇ爜绠＄悊 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鍔熻兘閰嶇疆 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鍔熻兘閰嶇疆 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/瀵硅薄绫诲瀷璁剧疆 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/瀵硅薄绫诲瀷璁剧疆 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鏂规硶璁剧疆 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鏂规硶璁剧疆 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鏄剧ず妯℃澘V2 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鏄剧ず妯℃澘V2 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鏍煎紡鍖栨姤鍛婅缃 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鏍煎紡鍖栨姤鍛婅缃 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鏍煎紡鍖栨姤鍛婅缃甐2 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/鏍煎紡鍖栨姤鍛婅缃甐2 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/绯荤粺鑿滃崟 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/绯荤粺鑿滃崟 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/閫夋嫨瀵硅瘽妗嗚缃 b/璧勬簮绠＄悊/WEB绋嬪簭寮鍙/閫夋嫨瀵硅瘽妗嗚缃 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/涓氬姟妯″瀷璁剧疆/璇勭骇妯″瀷璁剧疆 b/璧勬簮绠＄悊/涓氬姟妯″瀷璁剧疆/璇勭骇妯″瀷璁剧疆 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/涓氬姟妯″瀷璁剧疆/璐㈠姟鎶ヨ〃妯″瀷绠＄悊 b/璧勬簮绠＄悊/涓氬姟妯″瀷璁剧疆/璐㈠姟鎶ヨ〃妯″瀷绠＄悊 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/涓氬姟妯″瀷璁剧疆/椋庨櫓鍒嗙被妯″瀷璁剧疆 b/璧勬簮绠＄悊/涓氬姟妯″瀷璁剧疆/椋庨櫓鍒嗙被妯″瀷璁剧疆 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/涓氬姟妯″瀷璁剧疆/椋庨櫓棰勮閰嶇疆 b/璧勬簮绠＄悊/涓氬姟妯″瀷璁剧疆/椋庨櫓棰勮閰嶇疆 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/涓氬姟娴佺▼璁剧疆/娴佺▼妯″瀷 b/璧勬簮绠＄悊/涓氬姟娴佺▼璁剧疆/娴佺▼妯″瀷 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/浜у搧绠＄悊/浜у搧v1 b/璧勬簮绠＄悊/浜у搧绠＄悊/浜у搧v1 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/瀵硅薄妯″瀷/JBO閰嶇疆.xml b/璧勬簮绠＄悊/瀵硅薄妯″瀷/JBO閰嶇疆.xml new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/瀵硅薄妯″瀷/鏁版嵁妯″瀷璁捐.adm b/璧勬簮绠＄悊/瀵硅薄妯″瀷/鏁版嵁妯″瀷璁捐.adm new file mode 100644 index 000000000..1149c4f1e --- /dev/null +++ b/璧勬簮绠＄悊/瀵硅薄妯″瀷/鏁版嵁妯″瀷璁捐.adm @@ -0,0 +1,160 @@ + + + + true + 100 + A4 210 x 297 mm + 30 + 30 + 30 + 30 + + 0 + 1.0 + 0 + 0 + + 128 + 128 + 192 + + + 255 + 255 + 255 + + 寰蒋闆呴粦 + 9 + + StandardSQL + true + + + 0 + true + 0 + 1 + 1 + false + true + false + false + + + + + + + false + false + false + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + false + false + false + + + + + + + false + + + + + 0 + + + + false + false + + + + + false + + + + + + -1 + -1 + Ubuntu + 9 + 50 + 50 + + 255 + 255 + 255 + + + + false + 2012-08-29 09:08:15 + 2012-12-04 10:39:38 + + Project Name + + + + Model Name + + + + Version + + + + Compnay + + + + 浣滆 + + + + + + + + 0 + Default + + + + + + + + + + + + + + + + + + + + diff --git a/璧勬簮绠＄悊/鎶ヨ〃妯″瀷璁剧疆/鍙傛暟璁剧疆 b/璧勬簮绠＄悊/鎶ヨ〃妯″瀷璁剧疆/鍙傛暟璁剧疆 new file mode 100644 index 000000000..e69de29bb diff --git a/璧勬簮绠＄悊/鎶ヨ〃妯″瀷璁剧疆/鎶ヨ〃妯″瀷 b/璧勬簮绠＄悊/鎶ヨ〃妯″瀷璁剧疆/鎶ヨ〃妯″瀷 new file mode 100644 index 000000000..e69de29bb