From f76684d67382601cee57e741c7692012f8a548cd Mon Sep 17 00:00:00 2001
From: luojian <luojian@DESKTOP-KDBLG14>
Date: Tue, 24 Jul 2018 14:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessApplication/ApprovalForm.jsp      |  2 +
 .../BusinessProjectTempInfo.jsp               | 18 +++---
 WebContent/WEB-INF/etc/jbo/jbo_customer.xml   | 33 ++++++++++
 .../LBProjectIntoTempInitCarBusiness.java     | 63 ++++++++-----------
 4 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index 311446373..7687dec11 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -111,6 +111,8 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	$(function(){
+		$(".info_td_left").css("width","150px");
+		$(".info_mid_line").css("width","50%");
 		switch('<%=phaseNo%>'){
 		case '0030'://初审
 			$("#A_div_1230").attr("style","display:none;");
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
index aae62bb3d..432780bfe 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
@@ -42,16 +42,14 @@
 	
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
-	/* 左侧样式微调 */
-	$("#div_1030").find("[style='display:inline-block;width:6px;']").css("width","100");
-	$("#div_1106").find("[style='display:inline-block;width:6px;']").css("width","100");
- 	$("#div_1260").find("[style='display:inline-block;width:6px;']").css("width","100");
- 	$("#div_1270").find("[style='display:inline-block;width:6px;']").css("width","76");
- 	/* 右侧 样式微调*/
- 	$("#div_1035").find("[style='display:inline-block;width:6px;']").css("width","86");
- 	$("#div_1111").find("[style='display:inline-block;width:6px;']").css("width","86");
- 	
-     
+	$(function() {
+		//去除项目审批信息难看样式
+		$("#PROJECT_NO").parent().find(".info_span").remove();
+		$("#PRODUCT_NAME").parent().find(".info_span").remove();
+		$("#LEAS_FORM").parent().find(".info_span").remove();
+		$(".info_td_left").css("width","150px");
+		$(".info_mid_line").css("width","50%");
+	})
 	function save(){
 		var leasfrom = getItemValue(0,getRow(),"LEAS_FORM");
 		var projectSource = getItemValue(0,getRow(),"PROJECT_SOURCE");
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index c560b9a14..05da1c5f8 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -2792,6 +2792,39 @@
 					<property name="createKey" value="true" />
 				</managerProperties>
 			</manager>
+		</class>
+		
+		<class name="CUSTOMER_INFO_TEMP" label="瀹㈡埛鍩烘湰淇℃伅琛�" keyAttributes="customerid">
+			<attributes>
+				<attribute name="customerid" label="瀹㈡埛缂栧彿" type="STRING" length="40"/>
+				<attribute name="CUSTOMERNAME" label="瀹㈡埛鍚嶇О" type="STRING" length="200"/>
+				<attribute name="nationcode" label="璇佷欢鍥藉埆" type="STRING" length="40"/>
+				<attribute name="certtype" label="璇佷欢绫诲瀷" type="STRING" length="20"/>
+				<attribute name="certid" label="璇佷欢鍙�" type="STRING" length="40"/>
+				<attribute name="custkind" label="鍐呴儴琛屼笟" type="STRING" length="40"/>
+				<attribute name="CUSTOMERTYPE" label="瀹㈡埛绫诲埆" type="STRING" length="20"/>
+				<attribute name="status" label="鐘舵��" type="STRING" length="20"/>
+				<attribute name="mfcustomerid" label="鏍稿績瀹㈡埛鍙�" type="STRING" length="40"/>
+				<attribute name="belonggroupid" label="鎵�灞炲叧鑱旈泦鍥唬鐮�" type="STRING" length="40"/>
+				<attribute name="channel" label="娓犻亾" type="STRING" length="18"/>
+				<attribute name="loancardno" label="璐锋鍗＄紪鍙�" type="STRING" length="32"/>
+				<attribute name="customerscale" label="瀹㈡埛瑙勬ā(鍖哄垎涓皬浼佷笟瀹㈡埛)" type="STRING" length="20"/>
+				<attribute name="remark" label="澶囨敞" type="STRING" length="250"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="32"/>
+				<attribute name="inputorgid" label="鐧昏鏈烘瀯" type="STRING" length="32"/>
+				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="32"/>
+				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="32"/>
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
+				<attribute name="flowunid" label="娴佺▼缂栧彿" type="STRING" length="50"/>
+				<attribute name="distributor_id" label="缁忛攢鍟嗙紪鍙�" type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="customer_info_temp" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
 		</class>
 	</package>
 </jbo>
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 0627469bd..523c432bc 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -1,12 +1,10 @@
 package com.tenwa.lease.flow.project.commbusiness;
 
-import java.util.UUID;
 
 import jbo.app.tenwa.customer.CUSTOMER_COMPANY_TEMP;
-import jbo.app.tenwa.customer.CUSTOMER_INFO;
+import jbo.app.tenwa.customer.CUSTOMER_INFO_TEMP;
 import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
 import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
-import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP;
 import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP;
 import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
@@ -18,7 +16,6 @@ import com.amarsoft.are.util.StringFunction;
 import com.amarsoft.awe.util.Transaction;
 import com.amarsoft.context.ASUser;
 import com.tenwa.flow.baseBussion.BaseBussiness;
-import com.tenwa.reckon.util.UUIDUtil;
 /**
  * 项目基本信息初始化
  * @author xu
@@ -34,22 +31,15 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 		    BizObjectManager bmLULT = JBOFactory.getBizObjectManager(LB_UNION_LESSEE_TEMP.CLASS_NAME,Sqlca);
 		    BizObjectManager bmCCT = JBOFactory.getBizObjectManager(CUSTOMER_COMPANY_TEMP.CLASS_NAME,Sqlca);
 		    BizObjectManager bmLECT = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME,Sqlca);
-		    BizObjectManager bmLCIT = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO_TEMP.CLASS_NAME,Sqlca);
-		    BizObjectManager bmCI = JBOFactory.getBizObjectManager(CUSTOMER_INFO.CLASS_NAME,Sqlca);
-		    
+		   // BizObjectManager bmLCIT = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO_TEMP.CLASS_NAME,Sqlca);
+		    BizObjectManager bmCI = JBOFactory.getBizObjectManager(CUSTOMER_INFO_TEMP.CLASS_NAME,Sqlca);
 		    Sqlca.join(bm);
-			
 			BizObject bo = bm.newObject();
-			BizObject boCRT = bmCPT.newObject();
 			BizObject boLULT = bmLULT.newObject();
-			BizObject bmCC = bmCCT.newObject();
 			BizObject bmLEC = bmLECT.newObject();
-			BizObject bmLCI = bmLCIT.newObject();
+			//BizObject bmLCI = bmLCIT.newObject();
 			BizObject bmC = bmCI.newObject();
-			
-			
 			ASUser asUser=new ASUser(this.getAttribute("CurUserID").toString());
-			
 			//客户信息表
 			bmC.setAttributeValue("customername", this.getAttribute("custname"));//自然人名称
 			bmC.setAttributeValue("customertype", this.getAttribute("CustomerType"));//客户类型
@@ -57,6 +47,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			bmC.setAttributeValue("certid", this.getAttribute("certid"));//证件号
 			bmC.setAttributeValue("inputuserid", asUser.getUserID());//登记人
 			bmC.setAttributeValue("inputorgid", asUser.getOrgID());//登记部门
+			bmC.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));//流程ID
 			bmC.setAttributeValue("inputtime", StringFunction.getTodayNow());//登记时间,系统当前时间
 			bmCI.saveObject(bmC);
 			String customerId = bmC.getAttribute("customerid").getString();
@@ -67,8 +58,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 	    			bmC.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no"));//经销商ID
 	    		}
 	    	}
-			
-			//合同信息表
+/*			//合同信息表
 			bmLCI.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));//流程ID
 			bmLCI.setAttributeValue("PRODUCT_ID", this.getAttribute("ProductId"));//产品ID
 			String versionID = UUID.randomUUID().toString().replaceAll("-", "");
@@ -76,22 +66,24 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			bmLCI.setAttributeValue("INPUTUSERID", asUser.getUserID());//登记人
 			bmLCI.setAttributeValue("INPUTORGID", asUser.getOrgID());//登记部门
 			bmLCI.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//登记时间,系统当前时间
-			
-			//自然人信息表
-			boCRT.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));//流程ID
-			boCRT.setAttributeValue("customerid", customerId);//自然人ID
-			boCRT.setAttributeValue("FULLNAME", this.getAttribute("custname"));//自然人名称
-			boCRT.setAttributeValue("CERTTYPE", this.getAttribute("certtype"));//证件类型
-			boCRT.setAttributeValue("CERTID", this.getAttribute("certid"));//自然人证件号
-			boCRT.setAttributeValue("INPUTUSERID", asUser.getUserID());//登记人
-			boCRT.setAttributeValue("INPUTORGID", asUser.getOrgID());//登记部门
-			boCRT.setAttributeValue("inputtime", StringFunction.getTodayNow());//登记时间,系统当前时间
-			boCRT.setAttributeValue("BALANCESHEET", "申请人");
-
-			//根据客户类型设置参数
-			String certType = this.getAttribute("certtype").toString();
-			if(certType.equals("Ent02")){
-				//法人信息表
+*/			
+			BizObject boCRT = null;
+			BizObject bmCC  = null;
+	        if("03".equals(this.getAttribute("CustomerType"))){//自然人
+	        	boCRT = bmCPT.newObject();
+	    		//自然人信息表
+				boCRT.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));//流程ID
+				boCRT.setAttributeValue("customerid", customerId);//自然人ID
+				boCRT.setAttributeValue("FULLNAME", this.getAttribute("custname"));//自然人名称
+				boCRT.setAttributeValue("CERTTYPE", this.getAttribute("certtype"));//证件类型
+				boCRT.setAttributeValue("CERTID", this.getAttribute("certid"));//自然人证件号
+				boCRT.setAttributeValue("INPUTUSERID", asUser.getUserID());//登记人
+				boCRT.setAttributeValue("INPUTORGID", asUser.getOrgID());//登记部门
+				boCRT.setAttributeValue("inputtime", StringFunction.getTodayNow());//登记时间,系统当前时间
+				boCRT.setAttributeValue("BALANCESHEET", "申请人");
+				bmCPT.saveObject(boCRT);
+			}else{
+				bmCC = bmCCT.newObject();
 				bmCC.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));//流程ID
 				bmCC.setAttributeValue("customerid", customerId);//法人ID
 				bmCC.setAttributeValue("enterprisename", this.getAttribute("custname"));//法人名称
@@ -102,7 +94,6 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 				bmCC.setAttributeValue("inputtime", StringFunction.getTodayNow());//登记时间,系统当前时间
 				bmCCT.saveObject(bmCC);
 			}
-			
 			//车辆租赁物信息表
 			bmLEC.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));//流程ID
 			bmLEC.setAttributeValue("BRAND", this.getAttribute("productModel"));//品牌
@@ -126,7 +117,6 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			boLULT.setAttributeValue("INPUTUSERID", asUser.getUserID());//登记人
 			boLULT.setAttributeValue("INPUTORGID", asUser.getOrgID());//登记部门
 			boLULT.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//登记时间,系统当前时间
-			
 			//项目信息表
 			String inputorgid =  asUser.getOrgID() ;
 			if(inputorgid.startsWith("8006")) {
@@ -141,7 +131,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			bo.setAttributeValue("project_name",this.getAttribute("ProjectNo")+"-"+this.getAttribute("ProductName"));
 			bo.setAttributeValue("CAR_TYPE",this.getAttribute("carAttributes"));//车辆属性
 			bo.setAttributeValue("LEAS_FORM", this.getAttribute("leasehold"));//租赁方式
-			bo.setAttributeValue("VERSIONID", versionID);//版本ID
+			//bo.setAttributeValue("VERSIONID", versionID);//版本ID
 			bo.setAttributeValue("PRODUCT_ID",this.getAttribute("ProductId"));//产品ID
 			bo.setAttributeValue("PRODUCT_NAME",this.getAttribute("ProductName"));//产品名称
 			bo.setAttributeValue("Is_Flow","inFlow");//在流程中-inFlow，流程结束-outFlow
@@ -155,10 +145,9 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			bo.setAttributeValue("PROJECT_DATE",StringFunction.getTodayNow());//项目状态
 			
 			bm.saveObject(bo);
-			bmCPT.saveObject(boCRT);
 			bmLULT.saveObject(boLULT);
 			bmLECT.saveObject(bmLEC);
-			bmLCIT.saveObject(bmLCI);
+			//bmLCIT.saveObject(bmLCI);
 			bmCI.saveObject(bmC);
 			
 		    String sMessage="true";