Antiloveg 8 years ago
parent
commit
b10db039b7

+ 14 - 0
schema/2017-03-13.sql

@@ -9,3 +9,17 @@ alter table organization_identity
 MODIFY COLUMN `listed`  INT(1) NULL COMMENT '是否上市' ,
 MODIFY COLUMN `listed_type` INT(1) NULL COMMENT '上市类型';
 
+alter table patent_info 
+MODIFY COLUMN `principal`  VARCHAR(36) NULL COMMENT '负责人';
+
+alter table patent_log
+MODIFY COLUMN `principal`  VARCHAR(36) NULL COMMENT '负责人' ,
+MODIFY COLUMN `operator`  VARCHAR(36) NULL COMMENT '操作人';
+
+alter table org_cognizance
+MODIFY COLUMN `consultant`  VARCHAR(36) NULL COMMENT '咨询师';
+
+alter table org_cognizance_log
+MODIFY COLUMN `principal`  VARCHAR(36) NULL COMMENT '负责人' ,
+MODIFY COLUMN `operator`  VARCHAR(36) NULL COMMENT '操作人';
+

+ 3 - 1
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -408,6 +408,7 @@ public class OrganizationIdentity {
         this.validationAmount = validationAmount;
     }
 
+    @JsonFormat(shape = Shape.STRING)
     public Integer getIdentityType() {
         return identityType;
     }
@@ -463,7 +464,8 @@ public class OrganizationIdentity {
     public void setLastYearTaxReportUrl(String lastYearTaxReportUrl) {
         this.lastYearTaxReportUrl = lastYearTaxReportUrl;
     }
-
+    
+    @JsonFormat(shape = Shape.STRING)
     public Integer getAuditStatus() {
         return auditStatus;
     }

+ 74 - 77
src/main/webapp/WEB-INF/views/header.jsp

@@ -4,84 +4,81 @@
 <!DOCTYPE HTML>
 <html xmlns=http://www.w3.org/1999/xhtml>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
-	<!--[if lt IE 9]>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+<meta name="viewport"
+	content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
+<!--[if lt IE 9]>
     <script src="//cdn.bootcss.com/html5shiv/r29/html5.min.js"></script>
 	<script src="//cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
   	<![endif]-->
-  	<script type="text/javascript">
-  		
-  	   <c:if test="${not empty userData}">
-  		   window.userData = {
-	  		   mobile : "${userData.mobile}" ,
-	  		   nickname : "${userData.nickname}",
-	  		   number : "${userData.number}",
-	  		   type : "${userData.type}",
-	  		   email: "${userData.email}",
-	  		   createTime : "${userData.createTime}",
-	  		   lvl : "${userData.lvl}"
-  		   }
-  	   </c:if>
-  		   
-  	   <c:if test="${empty userData}">
-   	    window.userData = ""
-   	   </c:if>
-  		   
-   	   
-  		window.globalConfig = {
-	  		context: "${basePath}",
-	  		staticHost: "${staticHost}",
-	  		uploadPath: "${uploadPath}",
-	  		uploadPrivatePath:"${uploadPrivatePath}"
-	  	}
-  		
-  		
-    	   <c:if test="${not empty adminData}">
-  		   window.adminData = {
-  	  		   mobile : "${adminData.mobile}" ,
-  	  		   name : "${adminData.name}",
-  	  		   email: "${adminData.email}",
-  	  		   createTime : "${adminData.createTime}"
-  		   }
-  	   </c:if>  	   
-    	   
-    	   <c:if test="${empty adminData}">
-    	    window.adminData = ""
-    	   </c:if> 
-    	 
-  		
-  		<!--
-  		<shiro:hasRole name="999999">
- 		window.showSystem = true;
- 		window.showConfigure = true;
- 		window.showConfigview = true;
- 		window.showSheet = true;
- 		window.showPue = true;
- 		window.showVideo = true;
- 		window.showDevice = true;
-  		</shiro:hasRole>
-  		
-  		<shiro:hasPermission name="configure">
- 		window.showConfigure = true;
-  		</shiro:hasPermission>
-  		<shiro:hasPermission name="configview">
- 		window.showConfigview = true;
-  		</shiro:hasPermission>
-  		<shiro:hasPermission name="sheet">
- 		window.showSheet = true;
-  		</shiro:hasPermission>
-  		<shiro:hasPermission name="pue">
- 		window.showPue = true;
-  		</shiro:hasPermission>
+<script type="text/javascript">
+	<c:if test="${not empty userData}">
+	window.userData = {
+		mobile : "${userData.mobile}",
+		nickname : "${userData.nickname}",
+		number : "${userData.number}",
+		type : "${userData.type}",
+		email : "${userData.email}",
+		createTime : "${userData.createTime}",
+		lvl : "${userData.lvl}"
+	}
+	</c:if>
 
-  		<shiro:hasPermission name="video">
- 		window.showVideo = true;
-  		</shiro:hasPermission>
-  		<shiro:hasPermission name="device">
- 		window.showDevice = true;
-  		</shiro:hasPermission>
-      -->
-  	</script>
-  	<script type="text/javascript" src="${staticHost}/vendors.js"></script>
+	<c:if test="${empty userData}">
+	window.userData = ""
+	</c:if>
+
+	window.globalConfig = {
+		context : "${basePath}",
+		staticHost : "${staticHost}",
+		uploadPath : "${uploadPath}",
+		uploadPrivatePath : "${uploadPrivatePath}"
+	}
+
+	<c:if test="${not empty adminData}">
+	window.adminData = {
+		mobile : "${adminData.mobile}",
+		name : "${adminData.name}",
+		email : "${adminData.email}",
+		createTime : "${adminData.createTime}"
+	}
+	</c:if>
+
+	<c:if test="${empty adminData}">
+	window.adminData = ""
+	</c:if>
+
+	<!--
+	<shiro:hasRole name="999999">
+	window.showSystem = true;
+	window.showConfigure = true;
+	window.showConfigview = true;
+	window.showSheet = true;
+	window.showPue = true;
+	window.showVideo = true;
+	window.showDevice = true;
+	</shiro:hasRole>
+
+	<shiro:hasPermission name="configure">
+	window.showConfigure = true;
+	</shiro:hasPermission>
+	<shiro:hasPermission name="configview">
+	window.showConfigview = true;
+	</shiro:hasPermission>
+	<shiro:hasPermission name="sheet">
+	window.showSheet = true;
+	</shiro:hasPermission>
+	<shiro:hasPermission name="pue">
+	window.showPue = true;
+	</shiro:hasPermission>
+
+	<shiro:hasPermission name="video">
+	window.showVideo = true;
+	</shiro:hasPermission>
+	<shiro:hasPermission name="device">
+	window.showDevice = true;
+	</shiro:hasPermission>
+	-->
+</script>
+<script type="text/javascript" src="${staticHost}/vendors.js"></script>