diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index a54b9e502..fa403a912 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -299,7 +299,12 @@ CalcControl.InitStartDate=function(){ //默认起租日为投放日 if("period_type_1" == periodType){//期初 第一期还款日为投放日 setItemValue(0,0,"FIRST_PLAN_DATE",leaseAmtDate); - setItemValue(0,0,"SECOND_PLAN_DATE",dateAdd('m',incomenumberyear,new Date(startDate)).format('yyyy\/MM\/dd')); + if(Number(rentDay)<10){ + leaseAmtDate=leaseAmtDate.substring(0,8)+"0"+rentDay; + }else{ + leaseAmtDate=leaseAmtDate.substring(0,8)+rentDay; + } + setItemValue(0,0,"SECOND_PLAN_DATE",dateAdd('m',incomenumberyear,new Date(leaseAmtDate)).format('yyyy\/MM\/dd')); }else{ var firstPlanDate = dateAdd('m',incomenumberyear,new Date(startDate)).format('yyyy\/MM\/dd'); if(Number(rentDay)<10){ diff --git a/WebContent/AppFresh/AppPage/AppLibraryTemplateList.jsp b/WebContent/AppFresh/AppPage/AppLibraryTemplateList.jsp index 21765e072..fd570ec0f 100644 --- a/WebContent/AppFresh/AppPage/AppLibraryTemplateList.jsp +++ b/WebContent/AppFresh/AppPage/AppLibraryTemplateList.jsp @@ -1,64 +1,64 @@ - <%@ page contentType="text/html; charset=GBK"%><%@ - include file="/Frame/resources/include/include_begin_list.jspf"%><% - String GROUP_CODE = CurPage.getParameter("GROUP_CODE"); - if (GROUP_CODE == null) - GROUP_CODE = ""; - - ASObjectModel doTemp = new ASObjectModel("APP_BUSINESS_TEMPLATE_LIST"); - doTemp.setLockCount(2); //锁定两列 - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - - dwTemp.Style="1"; //设置为Grid风格 - dwTemp.ReadOnly = "1";//编辑模式 - dwTemp.setPageSize(10); - dwTemp.ConvertCode2Title = "1"; - dwTemp.genHTMLObjectWindow(GROUP_CODE); - - String sButtons[][] = { - {"true","","Button","新增字段","新增字段","newRecord()","","","","btn_icon_add"}, - {"true","","Button","删除字段","删除字段","if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete"}, - {"true","","Button","编辑字段","编辑字段","viewAndEdit()","","","","btn_icon_edit"}, - }; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - + <%@ page contentType="text/html; charset=GBK"%><%@ + include file="/Frame/resources/include/include_begin_list.jspf"%><% + String GROUP_CODE = CurPage.getParameter("GROUP_CODE"); + if (GROUP_CODE == null) + GROUP_CODE = ""; + + ASObjectModel doTemp = new ASObjectModel("APP_BUSINESS_TEMPLATE_LIST"); + doTemp.setLockCount(2); //锁定两列 + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + + dwTemp.Style="1"; //设置为Grid风格 + dwTemp.ReadOnly = "1";//编辑模式 + dwTemp.setPageSize(10); + dwTemp.ConvertCode2Title = "1"; + dwTemp.genHTMLObjectWindow(GROUP_CODE); + + String sButtons[][] = { + {"true","","Button","新增字段","新增字段","newRecord()","","","","btn_icon_add"}, + {"true","","Button","删除字段","删除字段","if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete"}, + {"true","","Button","编辑字段","编辑字段","viewAndEdit()","","","","btn_icon_edit"}, + }; +%><%@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/DealerDeposit/DDepositReturn_TempList.jsp b/WebContent/DealerDeposit/DDepositReturn_TempList.jsp index 23be864c8..630331525 100644 --- a/WebContent/DealerDeposit/DDepositReturn_TempList.jsp +++ b/WebContent/DealerDeposit/DDepositReturn_TempList.jsp @@ -7,18 +7,27 @@ */ String sFlowUnid = CurPage.getParameter("FlowUnid"); String ProjectName = CurPage.getParameter("ProjectName"); + String type = CurPage.getParameter("PhaseNo"); ASObjectModel doTemp = new ASObjectModel("DDepositReturn_TempList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); dwTemp.genHTMLObjectWindow(sFlowUnid); + + String falg = "true"; + if("0020".equals(type)){ + falg ="false"; + } //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","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""}, + {falg,"All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{falg,"","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {falg,"","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""}, +// {"","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, +// {"","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, +// {"","","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/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp index 20c211e95..8ae01d766 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp @@ -87,6 +87,7 @@ sReturn = sReturn.split("@"); // alert(sReturn[1]); setItemValue(0,0,"provinceInfo",sReturn[1]); + setItemValue(0,0,"district",""); province=sReturn[0]; setCertType(); },"请选择省份",''); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp index 6056c0ea3..253d05571 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp @@ -58,19 +58,48 @@ return false; } } + + + + //校验经销商编号是否唯一 + function Uniquenesscheck(){ + var DISTRIBUTOR_CODING = getItemValue(0,0,'DISTRIBUTOR_CODING'); + var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","distributor_basic","DISTRIBUTOR_CODING="+DISTRIBUTOR_CODING); + if("false" ==sReturnInfo){ + alert("经销商编码已存在，请重新输入！！！"); + return false; + }else{ + return true; + } + } + + <%-- $(function(){ if("<%=PhaseNo%>"=="0020"){ setItemRequired(0, "RETAIL_OPEN_DATE", true); $("#RETAIL_OPEN_DATE") } }) --%> - - function save(){ - var result = Checkfield(); - if(result==true){ - as_save(0,"saveproj_name()"); + + function save() { + var result = false; + var distributor_coding = getItemValue(0,0,'DISTRIBUTOR_CODING'); + if("0020"=="<%=PhaseNo%>"&&distributor_coding!=""){ + result=true; + }else{ + result = Uniquenesscheck(); } +// result = Uniquenesscheck(); + var result1 = Checkfield(); + //if(result==true){ + if(result==true && result1==true){ + as_save("0","saveproj_name()"); + } } + + + + function saveproj_name(){ var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businesspply.CustomerInfoManage","saveDistributorInfo","flowunid=<%=sFlowUnid%>"); @@ -153,6 +182,8 @@ // alert(sReturn[1]); setItemValue(0,0,"provinces",sReturn[1]); province=sReturn[0]; + setItemValue(0,0,"DISTRIBUTOR_ADDRESSNAME",""); + setItemValue(0,0,"DISTRIBUTOR_ADDRESS",""); setCertType(); },"请选择省份",''); } diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp index 7bf6f3ee3..1f02af30f 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp @@ -117,6 +117,8 @@ function saveproj_name(){ sReturn = sReturn.split("@"); // alert(sReturn[1]); setItemValue(0,0,"provinces",sReturn[1]); + setItemValue(0,0,"DISTRIBUTOR_ADDRESSNAME",""); + setItemValue(0,0,"DISTRIBUTOR_ADDRESS",""); province=sReturn[0]; setCertType(); },"请选择省份",''); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp index 532b05fa7..e874ab9b1 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp @@ -130,6 +130,8 @@ function saveproj_name(){ sReturn = sReturn.split("@"); // alert(sReturn[1]); setItemValue(0,0,"provinces",sReturn[1]); + setItemValue(0,0,"DISTRIBUTOR_ADDRESSNAME",""); + setItemValue(0,0,"DISTRIBUTOR_ADDRESS",""); province=sReturn[0]; setCertType(); },"请选择省份",''); diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp index b60df3817..821bced6a 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp @@ -35,7 +35,7 @@ alert(mes); } reloadSelf(); - },"请选择投放"); + },"请选择合同"); } <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalMaintenance/AssetsDisposalMaintenanceList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalMaintenance/AssetsDisposalMaintenanceList.jsp index b067768d8..ce674882e 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalMaintenance/AssetsDisposalMaintenanceList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalMaintenance/AssetsDisposalMaintenanceList.jsp @@ -3,10 +3,10 @@ <%@ include file="/Frame/resources/include/include_begin_list.jspf"%> <% ASObjectModel doTemp = new ASObjectModel("LBAssetsDisposalMaintenanceList"); - String sCondtion=DataRightManager.getRightCondition(CurUser,"lci", "contract"); - doTemp.appendJboWhere(sCondtion); - doTemp.setHtmlEvent("CONDITION_DEMO", "onmouseover", "showMemo"); - doTemp.setHtmlEvent("CONDITION_DEMO", "onmouseout", "hideMemo"); + //String sCondtion=DataRightManager.getRightCondition(CurUser,"lci", "contract"); + //doTemp.appendJboWhere(sCondtion); + //doTemp.setHtmlEvent("CONDITION_DEMO", "onmouseover", "showMemo"); + //doTemp.setHtmlEvent("CONDITION_DEMO", "onmouseout", "hideMemo"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 diff --git a/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LCCarBid.jsp b/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LCCarBid.jsp index 4ddef19b2..b9d2c4f3e 100644 --- a/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LCCarBid.jsp +++ b/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LCCarBid.jsp @@ -9,12 +9,13 @@ ASObjectModel doTemp = new ASObjectModel("LCCarBid"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.ReadOnly = "0"; //只读模式 dwTemp.setPageSize(10); dwTemp.genHTMLObjectWindow(framenumber); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, diff --git a/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeDetail.jsp b/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeDetail.jsp index b3437e956..a99778ef3 100644 --- a/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeDetail.jsp +++ b/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeDetail.jsp @@ -10,7 +10,7 @@ String ishistory=CurPage.getParameter("IsHistory"); String flowunid = CurPage.getParameter("FlowUnid"); String framenumber = Sqlca.getString("select FRAME_NUMBER from LC_CAR_DISPOSE_TEMP where flowunid ='"+flowunid+"'"); - String contractnumber = Sqlca.getString("select contract_no from LC_CAR_DISPOSE_TEMP where flowunid ='"+flowunid+"'"); + //String contractnumber = Sqlca.getString("select contract_no from LC_CAR_DISPOSE_TEMP where flowunid ='"+flowunid+"'"); if(sPrevUrl == null) sPrevUrl = ""; String sTempletNo = "LcCarDisposeDetail";//--模板号-- diff --git a/WebContent/Tenwa/Lease/Flow/CarManage/CarEvaluate/LcCarEvaluateDetail.jsp b/WebContent/Tenwa/Lease/Flow/CarManage/CarEvaluate/LcCarEvaluateDetail.jsp index 83077c7a9..7309d0dfe 100644 --- a/WebContent/Tenwa/Lease/Flow/CarManage/CarEvaluate/LcCarEvaluateDetail.jsp +++ b/WebContent/Tenwa/Lease/Flow/CarManage/CarEvaluate/LcCarEvaluateDetail.jsp @@ -48,10 +48,16 @@ var contractnumber=sReturn[2]; var customerid=sReturn[3]; var customername=sReturn[4]; + var parkplace=sReturn[6]; + var havingkey=sReturn[7]; + var platetime=sReturn[8]; setItemValue(0, getRow(0), "FRAME_NUMBER", framenumber); setItemValue(0, getRow(0), "CONTRACT_ID", contractnumber); setItemValue(0, getRow(0), "CUSTOMER_ID", customerid); setItemValue(0, getRow(0), "CUSTOMER_NAME", customername); + setItemValue(0, getRow(0), "PARK_PLACE", parkplace); + setItemValue(0, getRow(0), "HAVING_KEY", havingkey); + setItemValue(0, getRow(0), "PLATETIME", platetime); },"请选择客户"); } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index 9ddda435c..4c2a1c8d2 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -18,6 +18,8 @@ String sFileSaveMode = CurConfig.getConfigure("FileSaveMode"); String sFileSavePath = CurConfig.getConfigure("FileSavePath"); String sFileNameType = CurConfig.getConfigure("FileNameType"); + //获取租赁方式，用于判断生成的合同类型 + String leasform = CurPage.getParameter("leasform"); if(sPrevUrl == null) sPrevUrl = ""; String sTempletNo = "BaseFileTemplateSelect";//--模板号-- @@ -92,7 +94,10 @@ $('#A_Group_0010').css('display','none'); $('#A_Group_0020').css('display','none'); } - initOneClass(); + var sReturn = RunJavaMethodSqlca("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","getContractClass","leasform="+"<%=leasform%>"); + var jsonData=eval("("+sReturn+")"); + initFileTemplate(eval("("+jsonData[0].fileTemplate+")")); +// initOneClass(); }); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index d677bb3c1..315abaab8 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -20,7 +20,7 @@ doTemp.setHtmlEvent("acc_number", "onchange", "getNameOfBank"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - if(ApplyType.equals("BusinessApplyApply")&&PhaseNo.equals("0020")){ + if(PhaseNo.equals("0020")||PhaseNo.equals("0030")||PhaseNo.equals("0040")||PhaseNo.equals("0050")){ dwTemp.ReadOnly = "-2";//只读模式 } if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ @@ -45,18 +45,18 @@ %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> "); + } + + public boolean isPathRight(String path, RuntimeContext CurARC) + throws Exception + { + if ((path == null) || ("".equals(path))) return false; + + ArrayList urlList = (ArrayList)CurARC.getObject("UserUrlList"); + + if ((urlList == null) || (urlList.size() < 1)) { + urlList = RoleManager.getUserUrlList(CurARC.getUser()); + ARE.getLog().debug("[RED] URLTable Size=[" + urlList.size() + "] User=[" + CurARC.getUser().getUserID() + "][" + CurARC.getUser().getUserName() + "]"); + CurARC.setObject("UserUrlList", urlList); + } + + if (!AWEHrefCache.getHrefList().matchHref(path)) + { + return true; + } + + return urlList.contains(path); + } + + public void init() + throws ServletException + { + super.init(); + this.encoding = getInitParameter("encoding"); + if ((this.encoding == null) || ("".equals(this.encoding))) this.encoding = null; + + this.redType = getInitParameter("RedirectType"); + if ((this.redType == null) || ("".equals(this.redType))) this.redType = "server"; + + ARE.getLog().info("[RED] RedirectorServlet InitParameter : encoding[" + this.encoding + "] RedirectType[" + this.redType + "]"); + } +} \ No newline at end of file diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java index 2e9ede9a2..a44b2eda7 100644 --- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java +++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java @@ -34,6 +34,7 @@ public class FileTemplateUtil { public String templateParam; //模板参数 public String templateIds;//要生成的合同模板 public String flowunid;//用于查询已经生成的合同 + public String leasform;//用判断租赁方式 public String getTemplateCalss() {return templateCalss;} public void setTemplateCalss(String templateCalss) {this.templateCalss = templateCalss;} @@ -61,6 +62,12 @@ public class FileTemplateUtil { public void setFlowunid(String flowunid) { this.flowunid = flowunid; } + public String getLeasform() { + return leasform; + } + public void setLeasform(String leasform) { + this.leasform = leasform; + } public String getTemplateClass(Transaction Sqlca) throws Exception{ String fileClass=templateCalss.replaceAll("@", ","); ListtempFiles=new ArrayList(); @@ -92,11 +99,24 @@ public class FileTemplateUtil { while (rs.next()){ tempFiles.add("{'text':'"+rs.getString("templatename")+"','value':'"+rs.getString("id")+"'}"); } -// String sReturn="[{'fileTemplate':\""+tempFiles.toString()+"\"}]"; - String sReturn="[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端回租','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; + String sReturn="[{'fileTemplate':\""+tempFiles.toString()+"\"}]"; +// String sReturn="[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端回租','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; return sReturn; } + public String getContractClass(Transaction Sqlca){ + if("01".equals(leasform)){ + /*return "[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端直租','value':'24aba365e2794a018814ae81341486bf'}," + + "{'text':'直租个人授权协议书','value':'3334eed6051248b88cd4f2a22e93ac96'},]"+"\"}]";*/ + return "[{'fileTemplate':\""+"[{'text':'融资租赁合同','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]"; + }else{ + /*return "[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端回租','value':'641c55a1168f4a488a5028ee68870156'}," + + "{'text':'回租个人授权协议书','value':'e980635a77124d5598be1717c062b877'}," + + "{'text':'抵押合同','value':'ec90c114914d4725b57729107888511c'}]"+"\"}]";*/ + return "[{'fileTemplate':\""+"[{'text':'融资租赁合同（售后回租）','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; + } + } + public String createContractTemplate(JBOTransaction tx) throws Exception{ List message=new ArrayList(); String[] tempids=this.getTemplateIds().split("&"); @@ -156,7 +176,7 @@ public class FileTemplateUtil { BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); List ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and flow_unid=:flowunid").setParameter("flowunid", flowunid).getResultList(false); for(int i=0;i(); } - list.add(keys.getAttribute("DOCUMENT_ID").toString()); + list.add(keys.getAttribute("DOCUMENT_ID").toString()+"@"+keys.getAttribute("doc_name").toString()); map.put(keys.getAttribute("singcontract_id").toString(), list); } Map resultMap = requestService.Sign(map); diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java index 52b50d26c..a2cef5a3a 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java @@ -1,85 +1,88 @@ -package apx.com.amarsoft.als.apzl.apply.business.start.service.impl; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import apx.com.amarsoft.als.apzl.apply.business.start.bo.BusinessBO; -import apx.com.amarsoft.als.apzl.apply.business.start.service.BusinessApplyStartService; - -import com.amarsoft.are.jbo.JBOTransaction; -import com.amarsoft.awe.util.Transaction; -import com.base.constant.RestfullConstant; -import com.base.util.MultipartDataUtil; -import com.base.util.ReturnMapUtil; -import com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction; - -public class BusinessApplyStartServiceImpl implements BusinessApplyStartService { - private Map fieldMap; - - @SuppressWarnings("unchecked") - public Map applyStart(HttpServletRequest request, - HttpServletResponse response, JBOTransaction tx, Transaction sqlca, - ReturnMapUtil ReturnMapUtil) throws Exception { - - Map testMap = (Map) MultipartDataUtil - .readRequestParam(request, "UTF-8"); - fieldMap = (Map) testMap.get("fieldMap"); - BusinessBO bo = new BusinessBO(fieldMap); - - String applyType = "BusinessApplyApply"; - String uid = fieldMap.get("userid") == null ? "" : fieldMap.get( - "userid").toString(); - BusinessApprovalStartAction BusinessApprovalStartAction = new BusinessApprovalStartAction(); - - BusinessApprovalStartAction.setApplyType(applyType); - BusinessApprovalStartAction.setCurUserID(uid); - - BusinessApprovalStartAction.setFixedFlowParam(bo.getFixedFlowParam()); - - // 产品租赁信息 - BusinessApprovalStartAction.setBusinessType(bo.getBusinessType()); - BusinessApprovalStartAction.setVersionid(bo.getVersionId()); - BusinessApprovalStartAction.setProductID(bo.getProductId()); - BusinessApprovalStartAction.setProductId(bo.getProductId()); - BusinessApprovalStartAction.setLeasehold(bo.getLeasehold()); - - // 车辆信息 - BusinessApprovalStartAction.setModelid(bo.getModelId()); - BusinessApprovalStartAction.setCarAttributes(bo.getCarAttributes()); - BusinessApprovalStartAction.setProductModel(bo.getProductModel()); - BusinessApprovalStartAction.setCarSystem(bo.getCarSystem()); - BusinessApprovalStartAction.setCarSeries(bo.getCarSeries()); - - // 用户信息 - BusinessApprovalStartAction.setCertid(bo.getCertid()); - BusinessApprovalStartAction.setCerttype(bo.getCerttype()); - BusinessApprovalStartAction.setCustname(bo.getCUSTOMERNAME()); - BusinessApprovalStartAction.setCustomerType(bo.getCustomerType()); - - String sReturnInfo = BusinessApprovalStartAction.initFLow(tx); - if (sReturnInfo.startsWith("success")) { - String serialNo = sReturnInfo.split("@")[1]; - // 获取当前申请的相关参数，包含FlowUnid - Map params = BusinessApprovalStartAction - .getFlowParam(); - // 返回前台的数据 - Map body = new HashMap(); - body.put("flowUnid", params.get("FlowUnid")); - body.put("objectNo", params.get("FlowUnid")); - body.put("taskNo", serialNo); - body.put("serialNo", serialNo); - ReturnMapUtil.setReturnMap(body, - RestfullConstant.baseProperty.get("success").toString(), - "发起成功"); - } else - ReturnMapUtil.setReturnMap(null, - RestfullConstant.baseProperty.get("FAIL").toString(), - "发起失败"); - - return ReturnMapUtil.getReturnMap(); - } - -} +package apx.com.amarsoft.als.apzl.apply.business.start.service.impl; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.Configure; +import com.amarsoft.awe.util.Transaction; +import com.base.constant.RestfullConstant; +import com.base.util.MultipartDataUtil; +import com.base.util.ReturnMapUtil; +import com.tenwa.doc.action.DocListInitAction; +import com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction; + +import apx.com.amarsoft.als.apzl.apply.business.start.bo.BusinessBO; +import apx.com.amarsoft.als.apzl.apply.business.start.service.BusinessApplyStartService; + +public class BusinessApplyStartServiceImpl implements BusinessApplyStartService { + private Map fieldMap; + + @SuppressWarnings("unchecked") + public Map applyStart(HttpServletRequest request, + HttpServletResponse response, JBOTransaction tx, Transaction sqlca, + ReturnMapUtil ReturnMapUtil) throws Exception { + + Map testMap = (Map) MultipartDataUtil + .readRequestParam(request, "UTF-8"); + fieldMap = (Map) testMap.get("fieldMap"); + BusinessBO bo = new BusinessBO(fieldMap); + + String applyType = "BusinessApplyApply"; + String uid = fieldMap.get("userid") == null ? "" : fieldMap.get( + "userid").toString(); + BusinessApprovalStartAction BusinessApprovalStartAction = new BusinessApprovalStartAction(); + + BusinessApprovalStartAction.setApplyType(applyType); + BusinessApprovalStartAction.setCurUserID(uid); + + BusinessApprovalStartAction.setFixedFlowParam(bo.getFixedFlowParam()); + + // 产品租赁信息 + BusinessApprovalStartAction.setBusinessType(bo.getBusinessType()); + BusinessApprovalStartAction.setVersionid(bo.getVersionId()); + BusinessApprovalStartAction.setProductID(bo.getProductId()); + BusinessApprovalStartAction.setProductId(bo.getProductId()); + BusinessApprovalStartAction.setLeasehold(bo.getLeasehold()); + + // 车辆信息 + BusinessApprovalStartAction.setModelid(bo.getModelId()); + BusinessApprovalStartAction.setCarAttributes(bo.getCarAttributes()); + BusinessApprovalStartAction.setProductModel(bo.getProductModel()); + BusinessApprovalStartAction.setCarSystem(bo.getCarSystem()); + BusinessApprovalStartAction.setCarSeries(bo.getCarSeries()); + + // 用户信息 + BusinessApprovalStartAction.setCertid(bo.getCertid()); + BusinessApprovalStartAction.setCerttype(bo.getCerttype()); + BusinessApprovalStartAction.setCustname(bo.getCUSTOMERNAME()); + BusinessApprovalStartAction.setCustomerType(bo.getCustomerType()); + + String sReturnInfo = BusinessApprovalStartAction.initFLow(tx); + if (sReturnInfo.startsWith("success")) { + String serialNo = sReturnInfo.split("@")[1]; + // 获取当前申请的相关参数，包含FlowUnid + Map params = BusinessApprovalStartAction + .getFlowParam(); + // 返回前台的数据 + Map body = new HashMap(); + body.put("flowUnid", params.get("FlowUnid")); + body.put("objectNo", params.get("FlowUnid")); + body.put("projectId", params.get("ProjectId")); + body.put("taskNo", serialNo); + body.put("serialNo", serialNo); + ReturnMapUtil.setReturnMap(body, + RestfullConstant.baseProperty.get("success").toString(), + "发起成功"); + } else + ReturnMapUtil.setReturnMap(null, + RestfullConstant.baseProperty.get("FAIL").toString(), + "发起失败"); + + return ReturnMapUtil.getReturnMap(); + } + +} diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoQueryController.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoQueryController.java index 5ae695490..3b805cca1 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoQueryController.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoQueryController.java @@ -283,6 +283,13 @@ public class AweDoQueryController { else continue; + }else { + //filedMap中有参数则赋值 x = :x + String strParam = fieldMap.get(str.toLowerCase()).toString(); + otherWhere = otherWhere.replace(":" + + str,"'" + strParam + "'"); + continue; + } } } @@ -372,16 +379,16 @@ public class AweDoQueryController { int i = 0; for (String str : array1) { str = str.trim(); - if (fieldMap.get(param.toLowerCase()) == null) { + if (fieldMap.get(str.toLowerCase()) == null) { return "continue"; } - aSet[i] = fieldMap.get(param.toLowerCase()).toString(); + aSet[i] = fieldMap.get(str.toLowerCase()).toString(); i++; } - if (fieldMap.get(param.toLowerCase()) == null) { - return "continue"; - } +// if (fieldMap.get(param.toLowerCase()) == null) { +// return "continue"; +// } String value = executeMethod(classStr, aSet); fieldMap.put(paramStr.toLowerCase(), value); diff --git a/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java b/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java index 898e2ae0b..2dd426d48 100644 --- a/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java +++ b/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java @@ -37,6 +37,7 @@ public class FlowBussionAction extends CommonAction { private String FixedFlowParam; public String customertype; public String custname; + public String leasform; public List FlowMutexConfig; public Map FlowParam = new HashMap(); @@ -229,4 +230,11 @@ public class FlowBussionAction extends CommonAction { public void setCustname(String custname) { this.custname = custname; } + public String getLeasform() { + return leasform; + } + public void setLeasform(String leasform) { + this.leasform = leasform; + } + } diff --git a/src_tenwa/com/tenwa/apzl/cardispose/CarBidHandler.java b/src_tenwa/com/tenwa/apzl/cardispose/CarBidHandler.java new file mode 100644 index 000000000..82517a6b1 --- /dev/null +++ b/src_tenwa/com/tenwa/apzl/cardispose/CarBidHandler.java @@ -0,0 +1,29 @@ +package com.tenwa.apzl.cardispose; + +import jbo.com.tenwa.lease.comm.LC_CAR_DISPOSE_TEMP; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.dw.handler.impl.CommonHandler; + +public class CarBidHandler extends CommonHandler{ + @Override + protected void beforeUpdate(JBOTransaction tx, BizObject bo) + throws Exception { + String frameNumber=bo.getAttribute("FRAME_NUMBER").toString(); + //违章款项金额 + String otherPrice=bo.getAttribute("OTHER_PRICE").toString(); + //停车费 + String parkMoney=bo.getAttribute("park_money").toString(); + + BizObjectManager carDisposeManager = JBOFactory.getBizObjectManager(LC_CAR_DISPOSE_TEMP.CLASS_NAME, tx); + BizObject carDispose = carDisposeManager.createQuery("frame_number=:frame_number").setParameter("frame_number", frameNumber).getSingleResult(true); + if(carDispose !=null){ + carDispose.setAttributeValue("OTHER_PRICE", otherPrice); + carDispose.setAttributeValue("park_money", parkMoney); + carDisposeManager.saveObject(carDispose); + } + } +} diff --git a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java index fbdd73183..139f77084 100644 --- a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java @@ -3,6 +3,7 @@ package com.tenwa.customer.controller.group; 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_TEMP; import jbo.com.tenwa.entity.comm.own.COUNTRY_DISTRICT_INFO; import com.amarsoft.are.jbo.BizObject; @@ -16,6 +17,15 @@ public class CustomerGroupCompanyController { private String id = ""; private String group_name = ""; private String group_no = ""; + private String DISTRIBUTOR_CODING = ""; + + public String getDISTRIBUTOR_CODING() { + return DISTRIBUTOR_CODING; + } + + public void setDISTRIBUTOR_CODING(String dISTRIBUTOR_CODING) { + DISTRIBUTOR_CODING = dISTRIBUTOR_CODING; + } public String getGroup_name() { return group_name; @@ -137,6 +147,16 @@ public class CustomerGroupCompanyController { } } + public String distributor_basic(JBOTransaction tx) throws Exception{ + BizObjectManager dgcm = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME); + BizObject dgc = dgcm.createQuery("DISTRIBUTOR_CODING=:DISTRIBUTOR_CODING").setParameter("DISTRIBUTOR_CODING", DISTRIBUTOR_CODING).getSingleResult(false); + if(dgc == null){ + return "true"; + }else{ + return "false"; + } + } + public String getNewId(JBOTransaction tx) throws Exception{ String id=""; BizObjectManager dgcm = JBOFactory.getBizObjectManager(DISTRIBUTOR_GROUP_COMPANY.CLASS_NAME); diff --git a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java index 968ee24cf..10a0e9e58 100644 --- a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java +++ b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java @@ -12,6 +12,7 @@ import java.util.Map; import org.apache.log4j.Logger; import jbo.app.LB_EQUIPMENT_CAR_TEMP; +import jbo.sys.CODE_LIBRARY; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -24,59 +25,88 @@ import com.tenwa.lease.util.VehicleAppraisementUtil; public class vehicleAssessmentController { - private String id; + private String FlowUnid; private Logger logger = Logger.getLogger(this.getClass()); - public String getId() { - return id; + + public String getFlowUnid() { + return FlowUnid; } - public void setId(String id) { - this.id = id; + public void setFlowUnid(String flowUnid) { + FlowUnid = flowUnid; } - + public String vehicleAppraisement(JBOTransaction tx){ - String result = null; - try { - BizObjectManager bomLSNT = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME,tx); - BizObject boLSNT = bomLSNT.createQuery("ID=:ID").setParameter("ID",id).getSingleResult(true); - //获取车型ID - String modelId = boLSNT.getAttribute("modelId").toString(); - //获取地区编号 - String zone = boLSNT.getAttribute("zone").toString(); - //因为从数据库获取到的上牌日期的格式不满足接口需求,所以要利用SimpleDateFormat进行变换 - Date date = new SimpleDateFormat("yyyy/MM/dd").parse(boLSNT.getAttribute("regDate").toString()); - String regDate = new SimpleDateFormat("yyyy-MM-dd").format(date); - //获取车辆行驶里程 - String mile = boLSNT.getAttribute("mile").toString(); - //得到Car300接口返回的Json数据 - String responseResult = VehicleAppraisementUtil.getVehicleAppraisementResponse(modelId, zone, regDate, mile); - //String responseResult = ReadJSON.ReadFile("D://che300new.txt"); - JSONObject object = JSONObject.parseObject(responseResult); - String status = object.get("status").toString(); - //提取出Json数据中的status属性(1:成功;0:失败)并判断,如果为0,则将出错原因返回到前台 - if("0".equals(status)){ - String errormsg = object.getString("error_msg"); - return errormsg; - } - boLSNT.setAttributeValue("discharge_standard", object.get("discharge_standard").toString()); - boLSNT.setAttributeValue("NOW_TOTAL", object.get("model_price").toString()); - boLSNT.setAttributeValue("detail_report_url", object.get("detail_report_url").toString()); - //将Json字符串中的数组数据部分转换为Json数组 - List list = JSONArray.parseArray(JSON.toJSONString(object.get("eval_prices")),HashMap.class); - //遍历Json数组并将对应字段的数据加入到数据库中 - for(int i=0;i list = JSONArray.parseArray(JSON.toJSONString(object.get("eval_prices")),HashMap.class); + //遍历Json数组并将对应字段的数据加入到数据库中 + for(int i=0;i