From 5f1ced228b24aef61debcacf6496be112f1c0cce Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Tue, 4 Sep 2018 21:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E4=BA=BA=E5=AE=A2=E6=88=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=8D=89=E7=A8=BF=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tenwa/Customer/Lessee/Company/CustomerCompany.jsp       | 2 +-
 .../Customer/Lessee/Company/CustomerCompanyRegister.jsp     | 2 +-
 .../controller/company/NewCustomerCompanyController.java    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
index 3f1ae10be..59d063c62 100644
--- a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
@@ -38,7 +38,7 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	$(document).ready(function(){
-		$("#STATUS_0").prop("checked", true);
+// 		$("#STATUS_0").prop("checked", true);
 		init();
 		changeOtherRequired();
 	})
diff --git a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp
index 15d9037fb..b866165c3 100644
--- a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp
@@ -7,7 +7,7 @@
 	String sTempletNo = "CustomerCompanyRegister";
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	doTemp.setDDDWJbo("certtype","jbo.sys.CODE_LIBRARY,itemNo,ItemName,Codeno='CertType'  and SortNo like 'Ent%' and itemno<>'Ent03' and IsInuse='1' ");
-	doTemp.setDDDWJbo("status","jbo.sys.CODE_LIBRARY,itemNo,ItemName,Codeno='customer_status'  and itemno in('status02','status03') ");
+	doTemp.setDDDWJbo("status","jbo.sys.CODE_LIBRARY,itemNo,ItemName,Codeno='customer_status'  and itemno in('status04','status02') ");
 	doTemp.setDefaultValue("nationcode","CHN");
 	doTemp.setColInnerBtEvent("NATIONCODENAME", "");
 	doTemp.setHtmlEvent("certtype","onchange","changeCertidRequired");
diff --git a/src_tenwa/com/tenwa/customer/controller/company/NewCustomerCompanyController.java b/src_tenwa/com/tenwa/customer/controller/company/NewCustomerCompanyController.java
index ee74dd43b..f8a46bf6e 100644
--- a/src_tenwa/com/tenwa/customer/controller/company/NewCustomerCompanyController.java
+++ b/src_tenwa/com/tenwa/customer/controller/company/NewCustomerCompanyController.java
@@ -211,10 +211,10 @@ public class NewCustomerCompanyController{
 			}else{
 				newCustomerType.setAttributeValue("custstatus", "status04");//其他默认草稿
 			}*/
-			if("status03".equals(status)){
-				newCustomerType.setAttributeValue("custstatus", "status03");//废弃
+			if("status02".equals(status)){
+				newCustomerType.setAttributeValue("custstatus", "status02");//正式
 			}else{
-				newCustomerType.setAttributeValue("custstatus", "status02");//其他默认正式
+				newCustomerType.setAttributeValue("custstatus", "status04");//其他默认正式
 			}
 			newCustomerType.setAttributeValue("status","valid");
 			newCustomerType.setAttributeValue("isoriginal","yes");