From 985e5e73359a6b7f5cbfcad5ab45478eb6d5f1f2 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Sun, 10 Jun 2018 18:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProvinceCity/SelectProvinceCity.jsp       |  1 +
 .../BusinessApplyApplyList.jsp                |  1 +
 .../ProjectApprovalCreationInfo.jsp           | 11 +++++---
 .../lease/app/carbrand/CarBrandService.java   | 10 ++------
 .../BusinessApprovalStartAction.java          | 25 ++++++++++++++++++-
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/WebContent/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp b/WebContent/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp
index c0debe5a4..1c993c7f7 100644
--- a/WebContent/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp
@@ -34,6 +34,7 @@
 </style>
 <script>
 var ProvinceCity=function(){
+	debugger;
 	   this.proviceCity={};//省份城市
 	   this.brandServicePath="com.tenwa.lease.app.carbrand.CarBrandService";
 	   this.loadProvoiceCity();
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp
index 88e6f144f..11791d6af 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp
@@ -11,6 +11,7 @@
 		  "dialogWidth=500px;dialogHeight=300px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sReturnInfo){
 		  if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
 		  var sReturnInfos=sReturnInfo.split("@");
+		  alert(sReturnInfos);
 		  if(sReturnInfos[0]=="success")
 		     {
 		  		var objectNo=sReturnInfos[1];
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 64588aa9e..32c38992d 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -88,6 +88,9 @@
 			var brandid = getItemValue(0,getRow(),"brandid");
 			var seriesid = getItemValue(0,getRow(),"seriesid");
 			var modelid = getItemValue(0,getRow(),"modelid");
+			var carAttributes = getItemValue(0,0,"carAttributes");
+			var leasehold = getItemValue(0,0,"leasehold");
+			
 			if(certtype==""){
 				alert("请选择证件类型");
 				
@@ -124,7 +127,7 @@
 			}
 			
 			var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
-		 	sParams =sParams+",ProductId="+productid+",ProductName="+productname+",Customer_type="+customerType+",CustomerType="+customerType;
+		 	sParams =sParams+",ProductId="+productid+",ProductName="+productname+",Customer_type="+customerType+",CustomerType="+customerType+",CarAttributes="+carAttributes+",Leasehold="+leasehold;
 		 	var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);
 		   if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" )
 			{
@@ -227,10 +230,10 @@
 			
 		<%/*~[Describe=选择产品类型;]~*/%>
 		 function selectBusinessType()
-		  {
+		  { 
 			 
-			 var carAttributes = getItemValue(0,0,"carAttributes");
-			 var leasehold = getItemValue(0,0,"leasehold");
+			 var carAttributes = getItemValue(0,getRow(),"carAttributes");
+			 var leasehold = getItemValue(0,getRow(),"leasehold");
 			 
 			 if(carAttributes=='1'){
 				 AsDialog.OpenSelector("SelectBusinessType","ProductType,1,TypeNo,0005","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
diff --git a/src_tenwa/com/tenwa/lease/app/carbrand/CarBrandService.java b/src_tenwa/com/tenwa/lease/app/carbrand/CarBrandService.java
index d1b60a1a3..813b869c1 100644
--- a/src_tenwa/com/tenwa/lease/app/carbrand/CarBrandService.java
+++ b/src_tenwa/com/tenwa/lease/app/carbrand/CarBrandService.java
@@ -1,15 +1,9 @@
 package com.tenwa.lease.app.carbrand;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.security.MessageDigest;
-import java.util.List;
-
 import org.apache.log4j.Logger;
 
-import jbo.com.tenwa.lease.carbrand.LB_CAR_BRAND;
-import jbo.com.tenwa.lease.carbrand.LB_CAR_BRANDSERIES;
+import jbo.app.LB_CAR_BRAND;
+import jbo.app.LB_CAR_BRANDSE;
 
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.JBOFactory;
diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
index f206014b9..822034d3d 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
@@ -33,7 +33,8 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
 
 	private String productID;
 	private String CustomerType;
-	
+	private String CarAttributes;
+	private String Leasehold;
 
 public String getProductID() {
 		return productID;
@@ -54,6 +55,26 @@ public String getProductID() {
 	}
 
 
+	public String getCarAttributes() {
+		return CarAttributes;
+	}
+
+
+	public void setCarAttributes(String carAttributes) {
+		CarAttributes = carAttributes;
+	}
+
+
+	public String getLeasehold() {
+		return Leasehold;
+	}
+
+
+	public void setLeasehold(String leasehold) {
+		Leasehold = leasehold;
+	}
+
+
 	@Override
 	public void customOperation(JBOTransaction tx,BizObject flowBussiness) throws Exception {
 		this.FlowParam.put("ProjectId", UUID.randomUUID().toString().replaceAll("-", ""));
@@ -63,5 +84,7 @@ public String getProductID() {
 		this.FlowParam.put("FlowKey", projectNO);  
 		this.FlowParam.put("ProjectName", projectNO);
 		this.FlowParam.put("CustomerType", this.getCustomerType());
+		this.FlowParam.put("CarAttributes", getCarAttributes());
+		this.FlowParam.put("Leasehold", this.getLeasehold());
 	}
 }