diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeInfo.jsp index 684411755..315dedc44 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeInfo.jsp @@ -42,7 +42,8 @@ String nodeNo=CurPage.getParameter("NodeNo"); String taskno = CurPage.getParameter("TaskNo"); String RightType = CurPage.getParameter("RightType"); - + String businesstype=CurPage.getParameter("businesstype"); + %> <%/*~END~*/%> @@ -190,7 +191,7 @@ if(righttype == "ReadOnly"){ sParam = sParam+"&RightType=<%=RightType%>"; } - sParam = sParam+"&IsHistory=<%=ishistory%>&TaskNo=<%=taskno%>&NodeNo=<%=nodeNo%>&IsShowFormal=<%=isShowForaml%>"; + sParam = sParam+"&IsHistory=<%=ishistory%>&TaskNo=<%=taskno%>&NodeNo=<%=nodeNo%>&IsShowFormal=<%=isShowForaml%>&businesstype=<%=businesstype%>"; AsControl.OpenView(sUrl,sParam,"_self",""); } @@ -224,9 +225,18 @@ /*~[Describe=查询承租人名称;InputParam=无;OutPutParam=无;]~*/ function SelectCustomer() { - AsDialog.OpenSelector("SelectCustomer","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + var orgid = ""; + if("2"=="<%=businesstype%>"){ + orgid="8009010"; + }else if("3"=="<%=businesstype%>"){ + orgid="8009011"; + }else{ + alert("没有找到对应的申请类型，请联系管理员！"); + return; + } + AsDialog.OpenSelector("SelectCustomerScreening","orgid,"+orgid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ - if(!sReturn || sReturn == "_CANCEL_"||sReturn == "_CLEAR_"||sReturn=="_NONE_") + if(!sReturn || sReturn == "_CANCEL_"||sReturn == "_CLEAR_"||sReturn=="_NONE_") { return; } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeList.jsp index e2173f628..349781a19 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeList.jsp @@ -37,6 +37,7 @@ String taskno = CurPage.getParameter("TaskNo"); String ishistory = CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); + String businesstype=CurPage.getParameter("businesstype"); %> <%/*~END~*/%> @@ -106,7 +107,7 @@ function newRecord() { var sUrl = "/Tenwa/Lease/Flow/Comm/LBUnionLessee/LBUnionLesseeInfo.jsp"; - var sParam = "FlowUnid="+"<%=sFlowUnid%>"+"&ListTempletNo="+"<%=sTempletNo%>"+"&TaskNo="+"<%=taskno%>"; + var sParam = "FlowUnid="+"<%=sFlowUnid%>"+"&ListTempletNo="+"<%=sTempletNo%>"+"&TaskNo="+"<%=taskno%>"+"&businesstype="+"<%=businesstype%>"; AsControl.OpenView(sUrl,sParam,"_self",""); reloadSelf(); } @@ -127,7 +128,7 @@ if(righttype == "ReadOnly"){ sParam = sParam+"&RightType=<%=RightType%>"; } - sParam = sParam+"&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>"; + sParam = sParam+"&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>"+"&businesstype="+"<%=businesstype%>"; AsControl.OpenView(sUrl,sParam,"_self",""); reloadSelf(); } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCPayCondtion/LCPayCondtionList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCPayCondtion/LCPayCondtionList.jsp index e9db9bdca..2805df122 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCPayCondtion/LCPayCondtionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCPayCondtion/LCPayCondtionList.jsp @@ -170,7 +170,7 @@ /*~[Describe=导入;InputParam=无;OutPutParam=无;]~*/ function importCondition(){ var sParam = "FlowUnid="+"<%=sFlowUnid%>"+",Plan_Number="+"<%=sPlanNumber%>"+",Fee_Type="+"<%=sFeeType%>"+",Plan_List="+"<%=sPlanList%>"; - AsDialog.OpenSelector("SelectPayCondition","ProjectId,"+"<%=projectId%>","dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",function(sReturn){ + AsDialog.OpenSelector("SelectPayConditionScreening","ProjectId,"+"<%=projectId%>","dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ return; diff --git a/WebContent/Tenwa/Lease/Flow/Contract/contractInfoAllView/contractInfoAllViewList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/contractInfoAllView/contractInfoAllViewList.jsp index 07b0e0a5e..7d59032ce 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/contractInfoAllView/contractInfoAllViewList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/contractInfoAllView/contractInfoAllViewList.jsp @@ -41,23 +41,33 @@ } //roleid:800R00000044 北财合作方 String roleId = "800R00000044"; - - //roleid:800R00000045 rolename: bccuishou - //如果登录人属于bccuishou角色，可以看到北财下的所有的合同 - if(roleList.contains("800R00000045")){ - List userObjectList = manager.createQuery("roleid=:roleid").setParameter("roleid", roleId).getResultList(false); - String userId = ""; - List useridList = new ArrayList(); - for(BizObject bo : userObjectList){ - userId = bo.getAttribute("userid").toString(); - useridList.add("'"+userId+"'"); + if(InfoForType.equals("02")){//传统和汽车类传统 + String orgidB = Orgid.substring(0,7); + if("8009011".equals(orgidB)){ + doTemp.appendJboWhere(" and O.businesstype='3' "); + }else if("8009010".equals(orgidB)){ + doTemp.appendJboWhere(" and O.businesstype='2' "); + }else{ + doTemp.appendJboWhere(" and (O.businesstype='2' or O.businesstype='3' )"); + } + }else{//C端汽车 + //roleid:800R00000045 rolename: bccuishou + //如果登录人属于bccuishou角色，可以看到北财下的所有的合同 + if(roleList.contains("800R00000045")){ + List userObjectList = manager.createQuery("roleid=:roleid").setParameter("roleid", roleId).getResultList(false); + String userId = ""; + List useridList = new ArrayList(); + for(BizObject bo : userObjectList){ + userId = bo.getAttribute("userid").toString(); + useridList.add("'"+userId+"'"); + } + String useridStr = StringUtils.join(useridList.toArray(), ","); + doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); + } + //登录人属于经销商角色 401：经销商roleid + if(roleList.contains("401")){ + doTemp.appendJboWhere(" and O.project_manage='"+userid1+"'"); } - String useridStr = StringUtils.join(useridList.toArray(), ","); - doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); - } - //登录人属于经销商角色 401：经销商roleid - if(roleList.contains("401")){ - doTemp.appendJboWhere(" and O.project_manage='"+userid1+"'"); } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); diff --git a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java index e7f35d935..0be71a4b5 100644 --- a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java +++ b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java @@ -50,7 +50,7 @@ public class vehicleAssessmentController { //获取用户选择的所属地区 //天津天津市河东区 String area = boLSNT.getAttribute("zone").getString(); - if(area.indexOf("上海") != -1){ + /*if(area.indexOf("上海") != -1){ area = "上海上海市"; } if(area.indexOf("重庆") != -1){ @@ -86,14 +86,15 @@ public class vehicleAssessmentController { } if(area ==null ||"".equals(area)){ return "请返回租赁车辆基本信息页面填写地区!"; - } + }*/ //到数据字典中查询对应的行政编号作为接口入参的zone参数 String zone = ""; if(codeSNT != null){ BizObject zoneResult = codeSNT.createQuery("select itemname,itemno FROM O WHERE codeno='AreaCode' AND itemname=:AREA") .setParameter("AREA",area).getSingleResult(false); if(zoneResult != null){ - zone = zoneResult.getAttribute("itemno").getString(); + zone = zoneResult.getAttribute("itemno").getString().substring(0,4)+"00"; + System.out.println("二手车评估地址ID:"+zone); } } //因为从数据库获取到的上牌日期的格式不满足接口需求,所以要利用SimpleDateFormat进行变换