删减非必要字段

@@ -2,19 +2,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<groupId>com.thinkgem.jeesite</groupId>
 	<groupId>com.thinkgem.jeesite</groupId>
 	<artifactId>station</artifactId>
 	<artifactId>station</artifactId>
 	<version>1.2.7</version>
 	<version>1.2.7</version>
 	<packaging>war</packaging>
 	<packaging>war</packaging>
-	
+
 	<name>station</name>
 	<name>station</name>
 
 
 	<inceptionYear>2012-2016</inceptionYear>
 	<inceptionYear>2012-2016</inceptionYear>
-	
+
 	<!-- 项目属性 -->
 	<!-- 项目属性 -->
 	<properties>
 	<properties>
-		
+
 		<!-- main version setting -->
 		<!-- main version setting -->
 		<spring.version>4.1.9.RELEASE</spring.version>
 		<spring.version>4.1.9.RELEASE</spring.version>
 		<validator.version>5.2.4.Final</validator.version>
 		<validator.version>5.2.4.Final</validator.version>
@@ -23,10 +23,10 @@
 		<druid.version>1.0.18</druid.version>
 		<druid.version>1.0.18</druid.version>
 		<ehcache.version>2.6.11</ehcache.version>
 		<ehcache.version>2.6.11</ehcache.version>
 		<ehcache-web.version>2.0.4</ehcache-web.version>
 		<ehcache-web.version>2.0.4</ehcache-web.version>
-		<shiro.version>1.2.3</shiro.version>
+		<shiro.version>1.2.5</shiro.version>
 		<sitemesh.version>2.4.2</sitemesh.version>
 		<sitemesh.version>2.4.2</sitemesh.version>
 		<activiti.version>5.21.0</activiti.version>
 		<activiti.version>5.21.0</activiti.version>
-		
+
 		<!-- tools version setting -->
 		<!-- tools version setting -->
 		<slf4j.version>1.7.7</slf4j.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<commons-lang3.version>3.3.2</commons-lang3.version>
 		<commons-lang3.version>3.3.2</commons-lang3.version>
@@ -41,12 +41,12 @@
 		<dozer.version>5.5.1</dozer.version>
 		<dozer.version>5.5.1</dozer.version>
 		<poi.version>3.9</poi.version>
 		<poi.version>3.9</poi.version>
 		<freemarker.version>2.3.20</freemarker.version>
 		<freemarker.version>2.3.20</freemarker.version>
-		
+
 		<!-- jdbc driver setting -->
 		<!-- jdbc driver setting -->
 		<mysql.driver.version>8.0.13</mysql.driver.version>
 		<mysql.driver.version>8.0.13</mysql.driver.version>
 		<oracle.driver.version>10.2.0.4.0</oracle.driver.version>
 		<oracle.driver.version>10.2.0.4.0</oracle.driver.version>
 		<mssql.driver.version>1.3.1</mssql.driver.version>
 		<mssql.driver.version>1.3.1</mssql.driver.version>
-	    
+
 		<!-- environment setting -->
 		<!-- environment setting -->
 		<jdk.version>1.7</jdk.version>
 		<jdk.version>1.7</jdk.version>
 		<tomcat.version>2.2</tomcat.version>
 		<tomcat.version>2.2</tomcat.version>
@@ -54,34 +54,34 @@
 		<webserver.port>8181</webserver.port>
 		<webserver.port>8181</webserver.port>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<downloadSources>true</downloadSources>
 		<downloadSources>true</downloadSources>
-		
+
 	</properties>
 	</properties>
-	
+
 	<!-- 设定主仓库，按设定顺序进行查找。 -->
 	<!-- 设定主仓库，按设定顺序进行查找。 -->
 	<repositories>
 	<repositories>
-	
+
 		<repository>
 		<repository>
 			<id>jeesite-repos</id>
 			<id>jeesite-repos</id>
 			<name>Jeesite Repository</name>
 			<name>Jeesite Repository</name>
 			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
 			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
 		</repository>
 		</repository>
-		
+
 	</repositories>
 	</repositories>
-	
+
 	<!-- 设定插件仓库 -->
 	<!-- 设定插件仓库 -->
-	<pluginRepositories> 
-	
+	<pluginRepositories>
+
 		<pluginRepository>
 		<pluginRepository>
 			<id>jeesite-repos</id>
 			<id>jeesite-repos</id>
 			<name>Jeesite Repository</name>
 			<name>Jeesite Repository</name>
 			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
 			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
 		</pluginRepository>
 		</pluginRepository>
-		
-	</pluginRepositories> 
-	
+
+	</pluginRepositories>
+
 	<!-- 依赖项定义 -->
 	<!-- 依赖项定义 -->
 	<dependencies>
 	<dependencies>
-	
+
 		<!-- SPRING begin -->
 		<!-- SPRING begin -->
 		<dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<groupId>org.springframework</groupId>
@@ -125,7 +125,7 @@
 			<artifactId>spring-tx</artifactId>
 			<artifactId>spring-tx</artifactId>
 			<version>${spring.version}</version>
 			<version>${spring.version}</version>
 		</dependency>
 		</dependency>
-			
+
 		<!-- spring orm -->
 		<!-- spring orm -->
 		<dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<groupId>org.springframework</groupId>
@@ -137,7 +137,7 @@
 			<artifactId>spring-jdbc</artifactId>
 			<artifactId>spring-jdbc</artifactId>
 			<version>${spring.version}</version>
 			<version>${spring.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- bean validate -->
 		<!-- bean validate -->
 		<dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<groupId>org.hibernate</groupId>
@@ -145,7 +145,7 @@
 			<version>${validator.version}</version>
 			<version>${validator.version}</version>
 		</dependency>
 		</dependency>
 		<!-- SPRING end -->
 		<!-- SPRING end -->
-		
+
 		<!-- AOP begin -->
 		<!-- AOP begin -->
 		<dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<groupId>org.aspectj</groupId>
@@ -163,9 +163,9 @@
 			<version>3.1</version>
 			<version>3.1</version>
 		</dependency>
 		</dependency>
 		<!-- AOP end -->
 		<!-- AOP end -->
-		
+
 		<!-- PERSISTENCE begin -->
 		<!-- PERSISTENCE begin -->
-		
+
 		<!-- MyBatis -->
 		<!-- MyBatis -->
 		<dependency>
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<groupId>org.mybatis</groupId>
@@ -177,14 +177,14 @@
 			<artifactId>mybatis-spring</artifactId>
 			<artifactId>mybatis-spring</artifactId>
 			<version>${mybatis-spring.version}</version>
 			<version>${mybatis-spring.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- connection pool -->
 		<!-- connection pool -->
 		<dependency>
 		<dependency>
 		     <groupId>com.alibaba</groupId>
 		     <groupId>com.alibaba</groupId>
 		     <artifactId>druid</artifactId>
 		     <artifactId>druid</artifactId>
 		     <version>${druid.version}</version>
 		     <version>${druid.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- jdbc driver -->
 		<!-- jdbc driver -->
 		<dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<groupId>mysql</groupId>
@@ -206,7 +206,7 @@
 			<scope>runtime</scope>
 			<scope>runtime</scope>
 		</dependency>
 		</dependency>
 		<!-- PERSISTENCE end -->
 		<!-- PERSISTENCE end -->
-		
+
 		<!-- WEB begin -->
 		<!-- WEB begin -->
 		<dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<groupId>org.springframework</groupId>
@@ -273,8 +273,8 @@
 			<version>${ehcache.version}</version>
 			<version>${ehcache.version}</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
-			<groupId>net.sf.ehcache</groupId>  
-			<artifactId>ehcache-web</artifactId>  
+			<groupId>net.sf.ehcache</groupId>
+			<artifactId>ehcache-web</artifactId>
 			<version>${ehcache-web.version}</version>
 			<version>${ehcache-web.version}</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
@@ -283,7 +283,7 @@
 			 <version>2.5.1</version>
 			 <version>2.5.1</version>
 		</dependency>
 		</dependency>
 		<!-- CACHE end -->
 		<!-- CACHE end -->
-		
+
 		<!-- SECURITY begin -->
 		<!-- SECURITY begin -->
 		<dependency>
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<groupId>org.apache.shiro</groupId>
@@ -357,14 +357,14 @@
 			<artifactId>activiti-diagram-rest</artifactId>
 			<artifactId>activiti-diagram-rest</artifactId>
 			<version>${activiti.version}</version>
 			<version>${activiti.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- 支持activiti缓存 -->
 		<!-- 支持activiti缓存 -->
 		<!-- <dependency>
 		<!-- <dependency>
 			<groupId>org.infinispan</groupId>
 			<groupId>org.infinispan</groupId>
 			<artifactId>infinispan-core</artifactId>
 			<artifactId>infinispan-core</artifactId>
 			<version>5.1.7.Final</version>
 			<version>5.1.7.Final</version>
 		</dependency> -->
 		</dependency> -->
-		
+
 		<!-- LOGGING begin -->
 		<!-- LOGGING begin -->
 		<dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<groupId>org.slf4j</groupId>
@@ -389,7 +389,7 @@
 			<version>${slf4j.version}</version>
 			<version>${slf4j.version}</version>
 		</dependency>
 		</dependency>
 		<!-- LOGGING end -->
 		<!-- LOGGING end -->
-		
+
 		<!-- GENERAL UTILS begin -->
 		<!-- GENERAL UTILS begin -->
 		<dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<groupId>org.apache.commons</groupId>
@@ -422,14 +422,14 @@
 				</exclusion>
 				</exclusion>
 			</exclusions>
 			</exclusions>
 		</dependency>
 		</dependency>
-		
+
 		<!-- google java lib -->
 		<!-- google java lib -->
 		<dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<artifactId>guava</artifactId>
 			<version>${guava.version}</version>
 			<version>${guava.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- jackson json -->
 		<!-- jackson json -->
 		<dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -451,35 +451,35 @@
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
 			<version>${jackson.version}</version>
 			<version>${jackson.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- fastjson json-->
 		<!-- fastjson json-->
 		<dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
 			<artifactId>fastjson</artifactId>
 			<version>${fastjson.version}</version>
 			<version>${fastjson.version}</version>
-		</dependency> 
-		
+		</dependency>
+
 		<!-- xstream xml -->
 		<!-- xstream xml -->
 		<dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
 			<artifactId>xstream</artifactId>
 			<version>${xstream.version}</version>
 			<version>${xstream.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- pojo copy -->
 		<!-- pojo copy -->
 		<dependency>
 		<dependency>
 			<groupId>net.sf.dozer</groupId>
 			<groupId>net.sf.dozer</groupId>
 			<artifactId>dozer</artifactId>
 			<artifactId>dozer</artifactId>
 			<version>${dozer.version}</version>
 			<version>${dozer.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- freemarker engine -->
 		<!-- freemarker engine -->
 		<dependency>
 		<dependency>
 			<groupId>org.freemarker</groupId>
 			<groupId>org.freemarker</groupId>
 			<artifactId>freemarker</artifactId>
 			<artifactId>freemarker</artifactId>
 			<version>${freemarker.version}</version>
 			<version>${freemarker.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- email -->
 		<!-- email -->
 		<dependency>
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<groupId>javax.mail</groupId>
@@ -491,7 +491,7 @@
 			<artifactId>activation</artifactId>
 			<artifactId>activation</artifactId>
 			<version>1.1.1</version>
 			<version>1.1.1</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- poi office -->
 		<!-- poi office -->
 		<dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<groupId>org.apache.poi</groupId>
@@ -508,14 +508,14 @@
 			<artifactId>poi-ooxml-schemas</artifactId>
 			<artifactId>poi-ooxml-schemas</artifactId>
 			<version>${poi.version}</version>
 			<version>${poi.version}</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- image util -->
 		<!-- image util -->
 		<dependency>
 		<dependency>
 			<groupId>com.drewnoakes</groupId>
 			<groupId>com.drewnoakes</groupId>
 			<artifactId>metadata-extractor</artifactId>
 			<artifactId>metadata-extractor</artifactId>
 			<version>2.6.2</version>
 			<version>2.6.2</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- 条形码、二维码生成  -->
 		<!-- 条形码、二维码生成  -->
 		<dependency>
 		<dependency>
 			<groupId>com.google.zxing</groupId>
 			<groupId>com.google.zxing</groupId>
@@ -527,7 +527,7 @@
 			<artifactId>javase</artifactId>
 			<artifactId>javase</artifactId>
 			<version>2.2</version>
 			<version>2.2</version>
 		</dependency>
 		</dependency>
-		
+
 		<!-- 中文分词 -->
 		<!-- 中文分词 -->
 		<dependency>
 		<dependency>
 			<groupId>org.wltea</groupId>
 			<groupId>org.wltea</groupId>
@@ -537,7 +537,7 @@
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/analyzer-2012_u6.jar</systemPath>
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/analyzer-2012_u6.jar</systemPath>
 		</dependency>
 		</dependency>
 		<!-- GENERAL UTILS end -->
 		<!-- GENERAL UTILS end -->
-		
+
 		<!-- CKFinder begin -->
 		<!-- CKFinder begin -->
 		<dependency>
 		<dependency>
 			<groupId>net.coobird</groupId>
 			<groupId>net.coobird</groupId>
@@ -575,7 +575,7 @@
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/ckfinderplugin-imageresize-2.3.jar</systemPath>
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/ckfinderplugin-imageresize-2.3.jar</systemPath>
 		</dependency>
 		</dependency>
 		<!-- CKFinder end -->
 		<!-- CKFinder end -->
-		
+
 		<!-- TEST begin -->
 		<!-- TEST begin -->
 		<dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<groupId>junit</groupId>
@@ -588,7 +588,7 @@
 			<version>${spring.version}</version>
 			<version>${spring.version}</version>
 		</dependency>
 		</dependency>
 		<!-- TEST end -->
 		<!-- TEST end -->
-		
+
 		<!-- User Agent -->
 		<!-- User Agent -->
 		<dependency>
 		<dependency>
 			<groupId>bitwalker</groupId>
 			<groupId>bitwalker</groupId>
@@ -597,7 +597,7 @@
 			<scope>system</scope>
 			<scope>system</scope>
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/UserAgentUtils-1.13.jar</systemPath>
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/UserAgentUtils-1.13.jar</systemPath>
 		</dependency>
 		</dependency>
-		
+
 		<!-- 自定义jar依赖包
 		<!-- 自定义jar依赖包
 		<dependency>
 		<dependency>
 			<groupId>com.thinkgem.jeesite</groupId>
 			<groupId>com.thinkgem.jeesite</groupId>
@@ -606,8 +606,8 @@
 			<scope>system</scope>
 			<scope>system</scope>
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/test-core-1.0.jar</systemPath>
 			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/test-core-1.0.jar</systemPath>
 		</dependency> -->
 		</dependency> -->
-		
-		<!-- 使用 Jetty JSP引擎 
+
+		<!-- 使用 Jetty JSP引擎
 		<dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-jsp</artifactId>
 			<artifactId>jetty-jsp</artifactId>
@@ -623,7 +623,7 @@
 				</exclusion>
 				</exclusion>
 			</exclusions>
 			</exclusions>
 		</dependency> -->
 		</dependency> -->
-		
+
 	</dependencies>
 	</dependencies>
 
 
 	<build>
 	<build>
@@ -640,7 +640,7 @@
 					<showWarnings>true</showWarnings>
 					<showWarnings>true</showWarnings>
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
-			
+
 			<!-- JSP 预编译插件  jspweb.xml
 			<!-- JSP 预编译插件  jspweb.xml
 			<plugin>
 			<plugin>
 				<groupId>org.jasig.mojo.jspc</groupId>
 				<groupId>org.jasig.mojo.jspc</groupId>
@@ -664,7 +664,7 @@
 					</dependency>
 					</dependency>
 				</dependencies>
 				</dependencies>
 			</plugin>-->
 			</plugin>-->
-			
+
 			<!-- Jetty JSP 预编译插件  web.xml
 			<!-- Jetty JSP 预编译插件  web.xml
 			<plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<groupId>org.mortbay.jetty</groupId>
@@ -681,7 +681,7 @@
 					</execution>
 					</execution>
 				</executions>
 				</executions>
 			</plugin>-->
 			</plugin>-->
-			
+
 			<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
 			<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -707,7 +707,7 @@
 					</execution>
 					</execution>
 				</executions> -->
 				</executions> -->
 			</plugin>
 			</plugin>
-			
+
 			<!-- 混淆代码
 			<!-- 混淆代码
 			<plugin>
 			<plugin>
 				<groupId>com.github.wvengen</groupId>
 				<groupId>com.github.wvengen</groupId>
@@ -778,12 +778,12 @@
 						<!-- userfiles/** --><!-- ,/**/*.jsp -->,
 						<!-- userfiles/** --><!-- ,/**/*.jsp -->,
 						test/**
 						test/**
 					</warSourceExcludes>
 					</warSourceExcludes>
-					<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory><!-- 
+					<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory><!--
 					<webXml>${project.basedir}/target/jspweb.xml</webXml> -->
 					<webXml>${project.basedir}/target/jspweb.xml</webXml> -->
 					<warName>${project.artifactId}</warName>
 					<warName>${project.artifactId}</warName>
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
-			
+
 			<!-- Eclipse 插件 -->
 			<!-- Eclipse 插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -808,31 +808,31 @@
 					</additionalProjectnatures>
 					</additionalProjectnatures>
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
-			
+
 			<!-- tomcat6插件 -->
 			<!-- tomcat6插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<artifactId>tomcat6-maven-plugin</artifactId>
 				<artifactId>tomcat6-maven-plugin</artifactId>
-				<version>${tomcat.version}</version> 
+				<version>${tomcat.version}</version>
 				<configuration>
 				<configuration>
 					<port>${webserver.port}</port>
 					<port>${webserver.port}</port>
 					<path>/${project.artifactId}</path>
 					<path>/${project.artifactId}</path>
 					<uriEncoding>${project.build.sourceEncoding}</uriEncoding>
 					<uriEncoding>${project.build.sourceEncoding}</uriEncoding>
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
-			
+
 			<!-- tomcat7插件 -->
 			<!-- tomcat7插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<artifactId>tomcat7-maven-plugin</artifactId>
-				<version>${tomcat.version}</version> 
+				<version>${tomcat.version}</version>
 				<configuration>
 				<configuration>
 					<port>${webserver.port}</port>
 					<port>${webserver.port}</port>
 					<path>/${project.artifactId}</path>
 					<path>/${project.artifactId}</path>
 					<uriEncoding>${project.build.sourceEncoding}</uriEncoding>
 					<uriEncoding>${project.build.sourceEncoding}</uriEncoding>
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
-			
+
 			<!-- jetty插件 -->
 			<!-- jetty插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<groupId>org.mortbay.jetty</groupId>
@@ -847,7 +847,7 @@
 					<webAppConfig>
 					<webAppConfig>
 						<contextPath>/${project.artifactId}</contextPath>
 						<contextPath>/${project.artifactId}</contextPath>
 					</webAppConfig>
 					</webAppConfig>
-					<systemProperties>  
+					<systemProperties>
 						<systemProperty>
 						<systemProperty>
 							<name>org.mortbay.util.URI.charset</name>
 							<name>org.mortbay.util.URI.charset</name>
 							<value>${project.build.sourceEncoding}</value>
 							<value>${project.build.sourceEncoding}</value>
@@ -855,35 +855,35 @@
 					</systemProperties>
 					</systemProperties>
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
-			
+
 			<!-- resource插件 -->
 			<!-- resource插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.7</version>
 				<version>2.7</version>
 			</plugin>
 			</plugin>
-			
+
 			<!-- install插件 -->
 			<!-- install插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-install-plugin</artifactId>
 				<artifactId>maven-install-plugin</artifactId>
 				<version>2.5.2</version>
 				<version>2.5.2</version>
 			</plugin>
 			</plugin>
-			
+
 			<!-- clean插件 -->
 			<!-- clean插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
 				<artifactId>maven-clean-plugin</artifactId>
 				<version>2.6.1</version>
 				<version>2.6.1</version>
 			</plugin>
 			</plugin>
-			
+
 			<!-- ant插件 -->
 			<!-- ant插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<version>1.8</version>
 				<version>1.8</version>
 			</plugin>
 			</plugin>
-			
+
 			<!-- dependency插件 -->
 			<!-- dependency插件 -->
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -892,9 +892,9 @@
 			</plugin>
 			</plugin>
 		</plugins>
 		</plugins>
 	</build>
 	</build>
-	
+
 	<profiles>
 	<profiles>
-		<!-- 初始化数据库 -->			
+		<!-- 初始化数据库 -->
 		<profile>
 		<profile>
 			<id>init-db</id>
 			<id>init-db</id>
 			<dependencies>
 			<dependencies>
@@ -914,21 +914,21 @@
 					<plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
+						<version>1.8</version>
 						<configuration>
 						<configuration>
 							<target>
 							<target>
-								
+
 								<!-- mysql -->
 								<!-- mysql -->
 								<property name="dbunit.datatype" value="org.dbunit.ext.mysql.MySqlDataTypeFactory" />
 								<property name="dbunit.datatype" value="org.dbunit.ext.mysql.MySqlDataTypeFactory" />
-								
+
 								<!-- mssql
 								<!-- mssql
 								<property name="dbunit.datatype" value="org.dbunit.ext.mssql.MsSqlDataTypeFactory" /> -->
 								<property name="dbunit.datatype" value="org.dbunit.ext.mssql.MsSqlDataTypeFactory" /> -->
-								
+
 								<!-- oracle
 								<!-- oracle
 								<property name="dbunit.datatype" value="org.dbunit.ext.oracle.Oracle10DataTypeFactory" /> -->
 								<property name="dbunit.datatype" value="org.dbunit.ext.oracle.Oracle10DataTypeFactory" /> -->
-								
+
 								<property file="src/main/resources/jeesite.properties" />
 								<property file="src/main/resources/jeesite.properties" />
-								<sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" password="${jdbc.password}" 
+								<sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" password="${jdbc.password}"
 									onerror="continue" encoding="${project.build.sourceEncoding}">
 									onerror="continue" encoding="${project.build.sourceEncoding}">
 									<classpath refid="maven.test.classpath" />
 									<classpath refid="maven.test.classpath" />
 									<transaction src="db/sys/jeesite_${jdbc.type}.sql"/>
 									<transaction src="db/sys/jeesite_${jdbc.type}.sql"/>
@@ -944,26 +944,26 @@
 									<transaction src="db/act/create/activiti.${jdbc.type}.create.history.sql"/>
 									<transaction src="db/act/create/activiti.${jdbc.type}.create.history.sql"/>
 									<transaction src="db/act/create/activiti.${jdbc.type}.create.identity.sql"/>
 									<transaction src="db/act/create/activiti.${jdbc.type}.create.identity.sql"/>
 								</sql>
 								</sql>
-								
+
 								<taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask" classpathref="maven.test.classpath" />
 								<taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask" classpathref="maven.test.classpath" />
-								
+
 								<!-- mysql、mssql -->
 								<!-- mysql、mssql -->
 								<dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}"
 								<dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}"
 									 password="${jdbc.password}">
 									 password="${jdbc.password}">
-								
+
 								<!-- oracle
 								<!-- oracle
 								<dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}"
 								<dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}"
 									password="${jdbc.password}" schema="${jdbc.username}" > -->
 									password="${jdbc.password}" schema="${jdbc.username}" > -->
-									
+
 									<dbconfig>
 									<dbconfig>
 										<property name="datatypeFactory" value="${dbunit.datatype}" />
 										<property name="datatypeFactory" value="${dbunit.datatype}" />
 									</dbconfig>
 									</dbconfig>
 									<classpath refid="maven.test.classpath" />
 									<classpath refid="maven.test.classpath" />
 									<operation type="INSERT" src="db/sys/jeesite_data.xls" format="xls" transaction="true"/>
 									<operation type="INSERT" src="db/sys/jeesite_data.xls" format="xls" transaction="true"/>
 									<operation type="INSERT" src="db/cms/jeesite_data.xls" format="xls" transaction="true"/>
 									<operation type="INSERT" src="db/cms/jeesite_data.xls" format="xls" transaction="true"/>
-									
+
 								</dbunit>
 								</dbunit>
-								
+
 							</target>
 							</target>
 						</configuration>
 						</configuration>
 					</plugin>
 					</plugin>
@@ -971,16 +971,16 @@
 			</build>
 			</build>
 		</profile>
 		</profile>
 	</profiles>
 	</profiles>
-	
+
 	<!-- 开发者信息 -->
 	<!-- 开发者信息 -->
-	<developers>  
-		<developer>
-			<id>Promise</id>
-			<name>Promise</name>
-			<email>cpufun@163.com</email>
-			<roles><role>Project lead</role></roles>
-			<timezone>+8</timezone>
-		</developer>
-	</developers>
-	
+	<!--<developers>-->
+		<!--<developer>-->
+			<!--<id>Promise</id>-->
+			<!--<name>Promise</name>-->
+			<!--<email>cpufun@163.com</email>-->
+			<!--<roles><role>Project lead</role></roles>-->
+			<!--<timezone>+8</timezone>-->
+		<!--</developer>-->
+	<!--</developers>-->
+
 </project>
 </project>

@@ -3,6 +3,7 @@
  */
  */
 package com.thinkgem.jeesite.modules.land.dao;
 package com.thinkgem.jeesite.modules.land.dao;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
@@ -32,8 +33,11 @@ public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> {
 	
 	
 	int updateEntry(LandBusinesstypeList landBusinesstypeList);
 	int updateEntry(LandBusinesstypeList landBusinesstypeList);
 	
 	
+	int deleteByPrimaryKey(String id);
+	
 	int deleteByMessageId(LandBusinesstypeList landBusinesstypeList);
 	int deleteByMessageId(LandBusinesstypeList landBusinesstypeList);
 
 
 	List<LandBusinesstypeList> findByIsValid(@Param("trailerFrameNo")String frameNo, @Param("isvalid")String isValid);
 	List<LandBusinesstypeList> findByIsValid(@Param("trailerFrameNo")String frameNo, @Param("isvalid")String isValid);
 
 
+	List<LandBusinesstypeList> findByTime(@Param("time1")Date time,@Param("time2")Date time2);
 }
 }

-/**
- * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- */
-package com.thinkgem.jeesite.modules.land.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.thinkgem.jeesite.modules.land.entity.LandResponseMessage;
-
-/**
- * 回执内容DAO接口
- * @author zhangfan
- * @version 2018-10-08
- */
-@MyBatisDao
-public interface LandResponseMessageDao extends CrudDao<LandResponseMessage> {
-	
-}

-/**
- * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- */
-package com.thinkgem.jeesite.modules.land.entity;
-
-import org.hibernate.validator.constraints.Length;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 回执内容Entity
- * @author zhangfan
- * @version 2018-10-08
- */
-public class LandResponseMessage extends DataEntity<LandResponseMessage> {
-	
-	private static final long serialVersionUID = 1L;
-	private String messageId;		// 回执ID
-	private String responseCode;		// 回执代码
-	private String responseText;		// 回执描述
-	private Date responseTime;		// response_time
-	
-	public LandResponseMessage() {
-		super();
-	}
-
-	public LandResponseMessage(String id){
-		super(id);
-	}
-
-	@Length(min=0, max=64, message="回执ID长度必须介于 0 和 64 之间")
-	public String getMessageId() {
-		return messageId;
-	}
-
-	public void setMessageId(String messageId) {
-		this.messageId = messageId;
-	}
-	
-	@Length(min=0, max=5, message="回执代码长度必须介于 0 和 5 之间")
-	public String getResponseCode() {
-		return responseCode;
-	}
-
-	public void setResponseCode(String responseCode) {
-		this.responseCode = responseCode;
-	}
-	
-	@Length(min=0, max=512, message="回执描述长度必须介于 0 和 512 之间")
-	public String getResponseText() {
-		return responseText;
-	}
-
-	public void setResponseText(String responseText) {
-		this.responseText = responseText;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getResponseTime() {
-		return responseTime;
-	}
-
-	public void setResponseTime(Date responseTime) {
-		this.responseTime = responseTime;
-	}
-	
-}

@@ -63,7 +63,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 	@JsonFormat(timezone="GMT+8")
 	@JsonFormat(timezone="GMT+8")
 	private Date proposeTime;		// 申请时间
 	private Date proposeTime;		// 申请时间
 	private String veClassFlag;		// 车辆分类
 	private String veClassFlag;		// 车辆分类
-	private String operationType;		// 删除标识
+	private String operationType;		// 暂用 审批标识
 	private String trailerLicenseNo;		// 挂车牌号
 	private String trailerLicenseNo;		// 挂车牌号
 	private String trailerFrameNo;		// 挂车车架号
 	private String trailerFrameNo;		// 挂车车架号
 	private String approNoPic;		// 批文扫描图
 	private String approNoPic;		// 批文扫描图

@@ -3,6 +3,7 @@
  */
  */
 package com.thinkgem.jeesite.modules.land.service;
 package com.thinkgem.jeesite.modules.land.service;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,4 +88,12 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis
 	public List<LandBusinesstypeList> findByIsValid(String frameNo,String isValid){
 	public List<LandBusinesstypeList> findByIsValid(String frameNo,String isValid){
 		return dao.findByIsValid(frameNo,isValid);
 		return dao.findByIsValid(frameNo,isValid);
 	}
 	}
+	@Transactional(readOnly = false)
+	public List<LandBusinesstypeList> findBytime(Date time1,Date time2){
+		return dao.findByTime(time1,time2);
+	}
+	@Transactional(readOnly=false)
+	public int deleteByPrimaryKey(String id) {
+		return dao.deleteByPrimaryKey(id);
+	}
 }
 }

-/**
- * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- */
-package com.thinkgem.jeesite.modules.land.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.modules.land.entity.LandResponseMessage;
-import com.thinkgem.jeesite.modules.land.dao.LandResponseMessageDao;
-
-/**
- * 回执内容Service
- * @author zhangfan
- * @version 2018-10-08
- */
-@Service
-@Transactional(readOnly = true)
-public class LandResponseMessageService extends CrudService<LandResponseMessageDao, LandResponseMessage> {
-
-	public LandResponseMessage get(String id) {
-		return super.get(id);
-	}
-	
-	public List<LandResponseMessage> findList(LandResponseMessage landResponseMessage) {
-		return super.findList(landResponseMessage);
-	}
-	
-	public Page<LandResponseMessage> findPage(Page<LandResponseMessage> page, LandResponseMessage landResponseMessage) {
-		return super.findPage(page, landResponseMessage);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(LandResponseMessage landResponseMessage) {
-		super.save(landResponseMessage);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(LandResponseMessage landResponseMessage) {
-		super.delete(landResponseMessage);
-	}
-	
-}

@@ -3,31 +3,11 @@
  */
  */
 package com.thinkgem.jeesite.modules.land.web;
 package com.thinkgem.jeesite.modules.land.web;
 
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
-
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
 import com.thinkgem.jeesite.common.barCode.buildBarCode;
 import com.thinkgem.jeesite.common.barCode.buildBarCode;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
 import com.thinkgem.jeesite.modules.land.entity.VehicleMainifist;
 import com.thinkgem.jeesite.modules.land.entity.VehicleMainifist;
@@ -45,10 +25,25 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
 import com.thinkgem.jeesite.modules.yard.entity.Yard;
 import com.thinkgem.jeesite.modules.yard.entity.Yard;
 import com.thinkgem.jeesite.modules.yard.service.BayonetService;
 import com.thinkgem.jeesite.modules.yard.service.BayonetService;
 import com.thinkgem.jeesite.modules.yard.service.YardService;
 import com.thinkgem.jeesite.modules.yard.service.YardService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 
 /**
 /**
  * 货物流转类型Controller
  * 货物流转类型Controller
- * 
+ *
  * @author zhangfan
  * @author zhangfan
  * @version 2018-10-08
  * @version 2018-10-08
  */
  */
@@ -73,7 +68,7 @@ public class LandBusinesstypeListController extends BaseController {
 
 
 	@Autowired
 	@Autowired
 	private SystemService systemService;
 	private SystemService systemService;
-	
+
 	@Autowired
 	@Autowired
 	private OfficeService officeService;
 	private OfficeService officeService;
 
 
@@ -101,27 +96,31 @@ public class LandBusinesstypeListController extends BaseController {
 		Principal principal = UserUtils.getPrincipal();
 		Principal principal = UserUtils.getPrincipal();
 		String loginName = principal.getLoginName();
 		String loginName = principal.getLoginName();
 		User user = systemService.getUserByLoginName(loginName);
 		User user = systemService.getUserByLoginName(loginName);
+		if (user == null) {
+			return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
+		}
 		Yard yard = new Yard();
 		Yard yard = new Yard();
 		List<Yard> yardList = yardService.findList(yard);
 		List<Yard> yardList = yardService.findList(yard);
 		List<LandBusinesstypeList> lists = new ArrayList<LandBusinesstypeList>();
 		List<LandBusinesstypeList> lists = new ArrayList<LandBusinesstypeList>();
 		Page<LandBusinesstypeList> page = null;
 		Page<LandBusinesstypeList> page = null;
 		if ("2".equals(user.getUserType())) {
 		if ("2".equals(user.getUserType())) {
 			Office office = officeService.get(user.getOffice());
 			Office office = officeService.get(user.getOffice());
-			List<User> u = systemService.findByOfficeId(office.getId());			
+			List<User> u = systemService.findByOfficeId(office.getId());
 			for (int i = 0; i < u.size(); i++) {
 			for (int i = 0; i < u.size(); i++) {
 				landBusinesstypeList.setCreateBy(u.get(i));
 				landBusinesstypeList.setCreateBy(u.get(i));
-				page = landBusinesstypeListService
-						.findPage(new Page<LandBusinesstypeList>(request, response), landBusinesstypeList);
+				page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response),
+						landBusinesstypeList);
 				lists.addAll(page.getList());
 				lists.addAll(page.getList());
 			}
 			}
 		} else {
 		} else {
 			Role role = systemService.getByUserId(user.getId());
 			Role role = systemService.getByUserId(user.getId());
-			if("admin".equals(role.getEnname())||"leader".equals(role.getEnname())) {
+			if ("admin".equals(role.getEnname()) || "leader".equals(role.getEnname())) {
 				landBusinesstypeList.setCreateBy(systemService.getUserByLoginName("admin"));
 				landBusinesstypeList.setCreateBy(systemService.getUserByLoginName("admin"));
-			}else {
+			} else {
 				landBusinesstypeList.setCreateBy(user);
 				landBusinesstypeList.setCreateBy(user);
 			}
 			}
-			page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response), landBusinesstypeList);
+			page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response),
+					landBusinesstypeList);
 			lists.addAll(page.getList());
 			lists.addAll(page.getList());
 		}
 		}
 		page.setList(lists);
 		page.setList(lists);
@@ -205,6 +204,9 @@ public class LandBusinesstypeListController extends BaseController {
 		List<Yard> yardList = yardService.findList(yard);
 		List<Yard> yardList = yardService.findList(yard);
 		LandRoadVeRecord ve = new LandRoadVeRecord();
 		LandRoadVeRecord ve = new LandRoadVeRecord();
 		User user = systemService.getUserByLoginName("admin");
 		User user = systemService.getUserByLoginName("admin");
+		if (user == null) {
+			return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
+		}
 		ve.setCreateBy(user);
 		ve.setCreateBy(user);
 
 
 		List<LandRoadVeRecord> veList = roadVeService.findList(ve);
 		List<LandRoadVeRecord> veList = roadVeService.findList(ve);
@@ -225,9 +227,16 @@ public class LandBusinesstypeListController extends BaseController {
 		if (!beanValidator(model, landBusinesstypeList)) {
 		if (!beanValidator(model, landBusinesstypeList)) {
 			return form(landBusinesstypeList, model);
 			return form(landBusinesstypeList, model);
 		}
 		}
-		if(!(landBusinesstypeList.getIsvalid()!=null)) {
-			List<LandBusinesstypeList> lists = landBusinesstypeListService.findByIsValid(landBusinesstypeList.getTrailerFrameNo(), "0");
-			if(lists.size()>0) {
+		Principal principal = UserUtils.getPrincipal();
+		String loginName = principal.getLoginName();
+		User user = systemService.getUserByLoginName(loginName);
+		if (user == null) {
+			return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
+		}
+		if (!(landBusinesstypeList.getIsvalid() != null)) {
+			List<LandBusinesstypeList> lists = landBusinesstypeListService
+					.findByIsValid(landBusinesstypeList.getTrailerFrameNo(), "0");
+			if (lists.size() > 0) {
 				addMessage(redirectAttributes, "当前车辆已做出入申请，请重新录入");
 				addMessage(redirectAttributes, "当前车辆已做出入申请，请重新录入");
 				return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
 				return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
 			}
 			}
@@ -285,54 +294,72 @@ public class LandBusinesstypeListController extends BaseController {
 	public String delete(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes)
 	public String delete(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes)
 			throws Exception {
 			throws Exception {
 		boolean flag = false;
 		boolean flag = false;
-		List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
-		for (int i = 0; i < list.size(); i++) {
-			String flag1 = list.get(i).getContrastflag();
-			if (flag1 != null) {
-				flag = true;
-				break;
+		if (landBusinesstypeList.getBarcode() != null && landBusinesstypeList.getBarcode().length()>0) {
+			List<LandBusinesstypeList> list = landBusinesstypeListService
+					.findByBarcode(landBusinesstypeList.getBarcode());
+			for (int i = 0; i < list.size(); i++) {
+				String flag1 = list.get(i).getContrastflag();
+				if (flag1 != null) {
+					flag = true;
+					break;
+				}
+			}
+			if (!flag) {
+				landBusinesstypeListService.deleteByBarcode(landBusinesstypeList.getBarcode());
+				veMainService.deleteById(landBusinesstypeList.getMassageId());
+				buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
+				addMessage(redirectAttributes, "删除申请单成功");
+			} else {
+				addMessage(redirectAttributes, "删除失败,已有业务已进出站");
 			}
 			}
-		}
-		if (!flag) {
-			landBusinesstypeListService.deleteByBarcode(landBusinesstypeList.getBarcode());
-			veMainService.deleteById(landBusinesstypeList.getMassageId());
-			buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
-			addMessage(redirectAttributes, "删除申请单成功");
 		} else {
 		} else {
-			addMessage(redirectAttributes, "删除失败,已有业务已进出站");
+			landBusinesstypeListService.deleteByPrimaryKey(landBusinesstypeList.getId());
+			addMessage(redirectAttributes, "删除申请单成功");
 		}
 		}
 
 
 		return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
 		return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
 	}
 	}
-	
+
 	@RequiresPermissions("land:landBusinesstypeList:edit")
 	@RequiresPermissions("land:landBusinesstypeList:edit")
-	@RequestMapping(value = "update")
+	@RequestMapping(value = "updateError")
 	public String update(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes)
 	public String update(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes)
 			throws Exception {
 			throws Exception {
+		if ("E".equals(landBusinesstypeList.getTurnoverflag())) {
+			landBusinesstypeList.setContrastflag("非正常出站");
+		}
+		if ("I".equals(landBusinesstypeList.getTurnoverflag())) {
+			landBusinesstypeList.setContrastflag("非正常进站");
+		}
+		landBusinesstypeListService.updateEntry(landBusinesstypeList);
+
 		List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
 		List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
 		for (int i = 0; i < list.size(); i++) {
 		for (int i = 0; i < list.size(); i++) {
 			list.get(i).setIsvalid("1");
 			list.get(i).setIsvalid("1");
-			if("E".equals(list.get(i).getTurnoverflag())) {
-				list.get(i).setContrastflag("非正常出站");
-			}
 			landBusinesstypeListService.updateEntry(list.get(i));
 			landBusinesstypeListService.updateEntry(list.get(i));
 		}
 		}
 		buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
 		buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
+		addMessage(redirectAttributes, "异常处理成功");
 		return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
 		return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
 	}
 	}
-	
 
 
 	public boolean insertType1(LandBusinesstypeList landBusinesstypeList) {
 	public boolean insertType1(LandBusinesstypeList landBusinesstypeList) {
-		boolean flag = false;
+
 		try {
 		try {
+			String messageId = dateTimeFormat();
+
+			String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
+			if (barCode.length() < 1 | barCode == null) {
+				buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
+				return false;
+			}
 			// first entry in
 			// first entry in
-			String messageId = LandBusinesstypeListController.dateTimeFormat();
 			String mainfistList = landBusinesstypeList.getMasterList();
 			String mainfistList = landBusinesstypeList.getMasterList();
 			String startport = landBusinesstypeList.getStartport();
 			String startport = landBusinesstypeList.getStartport();
 			String endport = landBusinesstypeList.getEndport();
 			String endport = landBusinesstypeList.getEndport();
 			String startStation = landBusinesstypeList.getStartsatation();
 			String startStation = landBusinesstypeList.getStartsatation();
 			String endStation = landBusinesstypeList.getEndstation();
 			String endStation = landBusinesstypeList.getEndstation();
 			String isfull = landBusinesstypeList.getIsfull();
 			String isfull = landBusinesstypeList.getIsfull();
+
 			landBusinesstypeList.setMassageId(messageId);
 			landBusinesstypeList.setMassageId(messageId);
 			landBusinesstypeList.setStartport("");
 			landBusinesstypeList.setStartport("");
 			landBusinesstypeList.setStartsatation("");
 			landBusinesstypeList.setStartsatation("");
@@ -340,6 +367,7 @@ public class LandBusinesstypeListController extends BaseController {
 			landBusinesstypeList.setEndstation(startStation);
 			landBusinesstypeList.setEndstation(startStation);
 			landBusinesstypeList.setMasterList("");
 			landBusinesstypeList.setMasterList("");
 			landBusinesstypeList.setProdectTime(new Date());
 			landBusinesstypeList.setProdectTime(new Date());
+			landBusinesstypeList.setBarcode(barCode);
 			landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel());
 			landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel());
 			landBusinesstypeListService.save(landBusinesstypeList);
 			landBusinesstypeListService.save(landBusinesstypeList);
 			insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
 			insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
@@ -348,6 +376,7 @@ public class LandBusinesstypeListController extends BaseController {
 			LandBusinesstypeList list = new LandBusinesstypeList();
 			LandBusinesstypeList list = new LandBusinesstypeList();
 			list.setAgentname(landBusinesstypeList.getAgentname());
 			list.setAgentname(landBusinesstypeList.getAgentname());
 			list.setAgentno(landBusinesstypeList.getAgentno());
 			list.setAgentno(landBusinesstypeList.getAgentno());
+			list.setCocode(landBusinesstypeList.getCocode());
 			list.setIsDelete("0");
 			list.setIsDelete("0");
 			list.setIsvalid("0");
 			list.setIsvalid("0");
 			list.setIsfull(isfull);
 			list.setIsfull(isfull);
@@ -364,12 +393,14 @@ public class LandBusinesstypeListController extends BaseController {
 			list.setAisle(bayService.findByYardAndName(startStation, "1号卡口-出").getChannel());
 			list.setAisle(bayService.findByYardAndName(startStation, "1号卡口-出").getChannel());
 			list.setTurnoverflag("E");
 			list.setTurnoverflag("E");
 			list.setMassageId(messageId);
 			list.setMassageId(messageId);
+			list.setBarcode(barCode);
 			landBusinesstypeListService.save(list);
 			landBusinesstypeListService.save(list);
 
 
 			// third
 			// third
 			LandBusinesstypeList list1 = new LandBusinesstypeList();
 			LandBusinesstypeList list1 = new LandBusinesstypeList();
 			list1.setAgentname(landBusinesstypeList.getAgentname());
 			list1.setAgentname(landBusinesstypeList.getAgentname());
 			list1.setAgentno(landBusinesstypeList.getAgentno());
 			list1.setAgentno(landBusinesstypeList.getAgentno());
+			list1.setCocode(landBusinesstypeList.getCocode());
 			list1.setIsDelete("0");
 			list1.setIsDelete("0");
 			list1.setIsvalid("0");
 			list1.setIsvalid("0");
 			list1.setIsfull(isfull);
 			list1.setIsfull(isfull);
@@ -388,12 +419,14 @@ public class LandBusinesstypeListController extends BaseController {
 			list1.setAisle(bayService.findByYardAndName(endStation, "1号卡口-进").getChannel());
 			list1.setAisle(bayService.findByYardAndName(endStation, "1号卡口-进").getChannel());
 			list1.setTurnoverflag("I");
 			list1.setTurnoverflag("I");
 			list1.setMassageId(messageId);
 			list1.setMassageId(messageId);
+			list1.setBarcode(barCode);
 			landBusinesstypeListService.save(list1);
 			landBusinesstypeListService.save(list1);
 
 
 			// four
 			// four
 			LandBusinesstypeList list2 = new LandBusinesstypeList();
 			LandBusinesstypeList list2 = new LandBusinesstypeList();
 			list2.setAgentname(landBusinesstypeList.getAgentname());
 			list2.setAgentname(landBusinesstypeList.getAgentname());
 			list2.setAgentno(landBusinesstypeList.getAgentno());
 			list2.setAgentno(landBusinesstypeList.getAgentno());
+			list2.setCocode(landBusinesstypeList.getCocode());
 			list2.setIsDelete("0");
 			list2.setIsDelete("0");
 			list2.setIsvalid("0");
 			list2.setIsvalid("0");
 			list2.setIsfull(isfull);
 			list2.setIsfull(isfull);
@@ -414,55 +447,41 @@ public class LandBusinesstypeListController extends BaseController {
 			list2.setAisle(bayService.findByYardAndName(endStation, "1号卡口-出").getChannel());
 			list2.setAisle(bayService.findByYardAndName(endStation, "1号卡口-出").getChannel());
 			list2.setTurnoverflag("E");
 			list2.setTurnoverflag("E");
 			list2.setMassageId(messageId);
 			list2.setMassageId(messageId);
+			list2.setBarcode(barCode);
 			landBusinesstypeListService.save(list2);
 			landBusinesstypeListService.save(list2);
 
 
-			String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
-			List<LandBusinesstypeList> typeList = landBusinesstypeListService.findByMessageId(messageId);
-			int count = 0;
-			for (int i = 0; i < typeList.size(); i++) {
-				typeList.get(i).setBarcode(barCode);
-				landBusinesstypeListService.updateEntry(typeList.get(i));
-				count++;
-				if (count == typeList.size()) {
-					flag = true;
-				}
-			}
-			int countType = 0;
-			if (barCode == null) {
-				List<LandBusinesstypeList> typeList1 = landBusinesstypeListService.findByMessageId(messageId);
-				for (int i = 0; i < typeList1.size(); i++) {
-					landBusinesstypeListService.deleteByMessageId(typeList1.get(i));
-					countType++;
-					if (countType == typeList1.size()) {
-						flag = false;
-					}
-				}
-			}
 		} catch (Exception e) {
 		} catch (Exception e) {
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
-		return flag;
+		return true;
 
 
 	}
 	}
 
 
 	public boolean insertType2(LandBusinesstypeList landBusinesstypeList) {
 	public boolean insertType2(LandBusinesstypeList landBusinesstypeList) {
 
 
-		boolean flag = false;
 		try {
 		try {
+			String messageId = LandBusinesstypeListController.dateTimeFormat();
+
+			String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
+			if (barCode.length() < 1 | barCode == null) {
+				buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
+				return false;
+			}
 
 
 			// first entry
 			// first entry
-			String messageId = dateTimeFormat();
 			String mainfistList = landBusinesstypeList.getMasterList();
 			String mainfistList = landBusinesstypeList.getMasterList();
 			String isfull = landBusinesstypeList.getIsfull();
 			String isfull = landBusinesstypeList.getIsfull();
 			landBusinesstypeList.setMassageId(messageId);
 			landBusinesstypeList.setMassageId(messageId);
 			landBusinesstypeList.setMasterList("");
 			landBusinesstypeList.setMasterList("");
 			landBusinesstypeList.setProdectTime(new Date());
 			landBusinesstypeList.setProdectTime(new Date());
+			landBusinesstypeList.setBarcode(barCode);
 			landBusinesstypeListService.save(landBusinesstypeList);
 			landBusinesstypeListService.save(landBusinesstypeList);
 			insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
 			insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
 			// second
 			// second
 			LandBusinesstypeList list = new LandBusinesstypeList();
 			LandBusinesstypeList list = new LandBusinesstypeList();
 			list.setAgentname(landBusinesstypeList.getAgentname());
 			list.setAgentname(landBusinesstypeList.getAgentname());
 			list.setAgentno(landBusinesstypeList.getAgentno());
 			list.setAgentno(landBusinesstypeList.getAgentno());
+			list.setCocode(landBusinesstypeList.getCocode());
 			list.setIsDelete("0");
 			list.setIsDelete("0");
 			list.setIsvalid("0");
 			list.setIsvalid("0");
 			list.setIsfull(isfull);
 			list.setIsfull(isfull);
@@ -481,51 +500,38 @@ public class LandBusinesstypeListController extends BaseController {
 			list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
 			list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
 			list.setTurnoverflag("E");
 			list.setTurnoverflag("E");
 			list.setMassageId(messageId);
 			list.setMassageId(messageId);
+			list.setBarcode(barCode);
 			landBusinesstypeListService.save(list);
 			landBusinesstypeListService.save(list);
-			String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
-			List<LandBusinesstypeList> typeList = landBusinesstypeListService.findByMessageId(messageId);
-			int count = 0;
-			for (int i = 0; i < typeList.size(); i++) {
-				typeList.get(i).setBarcode(barCode);
-				landBusinesstypeListService.updateEntry(typeList.get(i));
-				count++;
-				if (count == typeList.size()) {
-					flag = true;
-				}
-			}
-			int countType = 0;
-			if (barCode == null) {
-				List<LandBusinesstypeList> typeList1 = landBusinesstypeListService.findByMessageId(messageId);
-				for (int i = 0; i < typeList1.size(); i++) {
-					landBusinesstypeListService.deleteByMessageId(typeList1.get(i));
-					countType++;
-					if (countType == typeList.size()) {
-						flag = false;
-					}
-				}
-			}
 		} catch (Exception e) {
 		} catch (Exception e) {
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
-		return flag;
+		return true;
 	}
 	}
 
 
 	public boolean insertType3(LandBusinesstypeList landBusinesstypeList) {
 	public boolean insertType3(LandBusinesstypeList landBusinesstypeList) {
 
 
-		boolean flag = false;
 		try {
 		try {
+
+			String messageId = LandBusinesstypeListController.dateTimeFormat();
+
+			String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
+			if (barCode.length() < 1 | barCode == null) {
+				buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
+				return false;
+			}
 			// first entry
 			// first entry
-			String messageId = dateTimeFormat();
 			landBusinesstypeList.setMassageId(messageId);
 			landBusinesstypeList.setMassageId(messageId);
 			String mainfistList = landBusinesstypeList.getMasterList();
 			String mainfistList = landBusinesstypeList.getMasterList();
 			String isfull = landBusinesstypeList.getIsfull();
 			String isfull = landBusinesstypeList.getIsfull();
 			landBusinesstypeList.setProdectTime(new Date());
 			landBusinesstypeList.setProdectTime(new Date());
+			landBusinesstypeList.setBarcode(barCode);
 			landBusinesstypeListService.save(landBusinesstypeList);
 			landBusinesstypeListService.save(landBusinesstypeList);
 			insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
 			insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
 			// second
 			// second
 			LandBusinesstypeList list = new LandBusinesstypeList();
 			LandBusinesstypeList list = new LandBusinesstypeList();
 			list.setAgentname(landBusinesstypeList.getAgentname());
 			list.setAgentname(landBusinesstypeList.getAgentname());
 			list.setAgentno(landBusinesstypeList.getAgentno());
 			list.setAgentno(landBusinesstypeList.getAgentno());
+			list.setCocode(landBusinesstypeList.getCocode());
 			list.setIsDelete("0");
 			list.setIsDelete("0");
 			list.setIsvalid("0");
 			list.setIsvalid("0");
 			list.setIsfull(isfull);
 			list.setIsfull(isfull);
@@ -544,34 +550,13 @@ public class LandBusinesstypeListController extends BaseController {
 			list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
 			list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
 			list.setTurnoverflag("E");
 			list.setTurnoverflag("E");
 			list.setMassageId(messageId);
 			list.setMassageId(messageId);
+			list.setBarcode(barCode);
 			landBusinesstypeListService.save(list);
 			landBusinesstypeListService.save(list);
 
 
-			String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
-			List<LandBusinesstypeList> typeList = landBusinesstypeListService.findByMessageId(messageId);
-			int count = 0;
-			for (int i = 0; i < typeList.size(); i++) {
-				typeList.get(i).setBarcode(barCode);
-				landBusinesstypeListService.updateEntry(typeList.get(i));
-				count++;
-				if (count == typeList.size()) {
-					flag = true;
-				}
-			}
-			int countType = 0;
-			if (barCode == null) {
-				List<LandBusinesstypeList> typeList1 = landBusinesstypeListService.findByMessageId(messageId);
-				for (int i = 0; i < typeList1.size(); i++) {
-					landBusinesstypeListService.deleteByMessageId(typeList1.get(i));
-					countType++;
-					if (countType == typeList.size()) {
-						flag = false;
-					}
-				}
-			}
 		} catch (Exception e) {
 		} catch (Exception e) {
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
-		return flag;
+		return true;
 	}
 	}
 
 
 	/*
 	/*
@@ -597,7 +582,7 @@ public class LandBusinesstypeListController extends BaseController {
 	 * landBusinesstypeListService.save(landBusinesstypeList);
 	 * landBusinesstypeListService.save(landBusinesstypeList);
 	 * insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.
 	 * insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.
 	 * getTrailerFrameNo(),mainfistList);
 	 * getTrailerFrameNo(),mainfistList);
-	 * 
+	 *
 	 * //second out LandBusinesstypeList list = new LandBusinesstypeList();
 	 * //second out LandBusinesstypeList list = new LandBusinesstypeList();
 	 * list.setAgentname(landBusinesstypeList.getAgentname());
 	 * list.setAgentname(landBusinesstypeList.getAgentname());
 	 * list.setAgentno(landBusinesstypeList.getAgentno()); list.setBarcode(barCode);
 	 * list.setAgentno(landBusinesstypeList.getAgentno()); list.setBarcode(barCode);
@@ -612,7 +597,7 @@ public class LandBusinesstypeListController extends BaseController {
 	 * list.setAisle(bayService.findByYardAndName(startStation,
 	 * list.setAisle(bayService.findByYardAndName(startStation,
 	 * "1号卡口-出").getChannel()); list.setTurnoverflag("E");
 	 * "1号卡口-出").getChannel()); list.setTurnoverflag("E");
 	 * list.setMassageId(messageId); landBusinesstypeListService.save(list);
 	 * list.setMassageId(messageId); landBusinesstypeListService.save(list);
-	 * 
+	 *
 	 * //third LandBusinesstypeList list1 = new LandBusinesstypeList();
 	 * //third LandBusinesstypeList list1 = new LandBusinesstypeList();
 	 * list1.setAgentname(landBusinesstypeList.getAgentname());
 	 * list1.setAgentname(landBusinesstypeList.getAgentname());
 	 * list1.setAgentno(landBusinesstypeList.getAgentno()); list1.setIsDelete("0");
 	 * list1.setAgentno(landBusinesstypeList.getAgentno()); list1.setIsDelete("0");
@@ -628,7 +613,7 @@ public class LandBusinesstypeListController extends BaseController {
 	 * list1.setAisle(bayService.findByYardAndName(endStation,
 	 * list1.setAisle(bayService.findByYardAndName(endStation,
 	 * "1号卡口-进").getChannel()); list1.setTurnoverflag("I");
 	 * "1号卡口-进").getChannel()); list1.setTurnoverflag("I");
 	 * list1.setMassageId(messageId); landBusinesstypeListService.save(list1);
 	 * list1.setMassageId(messageId); landBusinesstypeListService.save(list1);
-	 * 
+	 *
 	 * //four LandBusinesstypeList list2 = new LandBusinesstypeList();
 	 * //four LandBusinesstypeList list2 = new LandBusinesstypeList();
 	 * list2.setAgentname(landBusinesstypeList.getAgentname());
 	 * list2.setAgentname(landBusinesstypeList.getAgentname());
 	 * list2.setAgentno(landBusinesstypeList.getAgentno());
 	 * list2.setAgentno(landBusinesstypeList.getAgentno());
@@ -646,7 +631,7 @@ public class LandBusinesstypeListController extends BaseController {
 	 * list2.setAisle(bayService.findByYardAndName(endStation,
 	 * list2.setAisle(bayService.findByYardAndName(endStation,
 	 * "1号卡口-出").getChannel()); list2.setTurnoverflag("E");
 	 * "1号卡口-出").getChannel()); list2.setTurnoverflag("E");
 	 * list2.setMassageId(messageId); landBusinesstypeListService.save(list2);
 	 * list2.setMassageId(messageId); landBusinesstypeListService.save(list2);
-	 * 
+	 *
 	 * }
 	 * }
 	 */
 	 */
 	public static String dateTimeFormat() {
 	public static String dateTimeFormat() {
@@ -733,4 +718,40 @@ public class LandBusinesstypeListController extends BaseController {
 			}
 			}
 		}
 		}
 	}
 	}
-}
+
+	// @RequiresPermissions("land:landBusinesstypeList:view")
+	@RequestMapping(value = "tongji")
+	@ResponseBody
+	public void tongji() throws ParseException {
+		Map<String, Integer> map = new HashMap<>();
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		for (int i = 1; i < 31; i++) {
+			String date = null;
+			if (i < 10) {
+				date = "2019-06-0" + i + " ";
+			} else {
+				date = "2019-06-" + i + " ";
+			}
+			for (int j = 0; j < 25; j++) {
+				String time = null;
+				String time2 = null;
+				if (j < 10) {
+					time = "0" + j + ":00:00";
+				} else {
+					time = j + ":00:00";
+				}
+				if (j + 1 < 10) {
+					time2 = "0" + (j + 1) + ":00:00";
+				} else {
+					time2 = (j + 1) + ":00:00";
+				}
+
+				List<LandBusinesstypeList> list = landBusinesstypeListService.findBytime(format.parse(date + time),
+						format.parse(date + time2));
+				map.put(date + time, list.size());
+			}
+
+		}
+		System.out.println(map);
+	}
+}

-/**
- * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- */
-package com.thinkgem.jeesite.modules.land.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.modules.land.entity.LandResponseMessage;
-import com.thinkgem.jeesite.modules.land.service.LandResponseMessageService;
-
-/**
- * 回执内容Controller
- * @author zhangfan
- * @version 2018-10-08
- */
-@Controller
-@RequestMapping(value = "${adminPath}/land/landResponseMessage")
-public class LandResponseMessageController extends BaseController {
-
-	@Autowired
-	private LandResponseMessageService landResponseMessageService;
-	
-	@ModelAttribute
-	public LandResponseMessage get(@RequestParam(required=false) String id) {
-		LandResponseMessage entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = landResponseMessageService.get(id);
-		}
-		if (entity == null){
-			entity = new LandResponseMessage();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("land:landResponseMessage:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(LandResponseMessage landResponseMessage, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<LandResponseMessage> page = landResponseMessageService.findPage(new Page<LandResponseMessage>(request, response), landResponseMessage); 
-		model.addAttribute("page", page);
-		return "modules/land/landResponseMessageList";
-	}
-
-	@RequiresPermissions("land:landResponseMessage:view")
-	@RequestMapping(value = "form")
-	public String form(LandResponseMessage landResponseMessage, Model model) {
-		model.addAttribute("landResponseMessage", landResponseMessage);
-		return "modules/land/landResponseMessageForm";
-	}
-
-	@RequiresPermissions("land:landResponseMessage:edit")
-	@RequestMapping(value = "save")
-	public String save(LandResponseMessage landResponseMessage, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, landResponseMessage)){
-			return form(landResponseMessage, model);
-		}
-		landResponseMessageService.save(landResponseMessage);
-		addMessage(redirectAttributes, "保存回执成功");
-		return "redirect:"+Global.getAdminPath()+"/land/landResponseMessage/?repage";
-	}
-	
-	@RequiresPermissions("land:landResponseMessage:edit")
-	@RequestMapping(value = "delete")
-	public String delete(LandResponseMessage landResponseMessage, RedirectAttributes redirectAttributes) {
-		landResponseMessageService.delete(landResponseMessage);
-		addMessage(redirectAttributes, "删除回执成功");
-		return "redirect:"+Global.getAdminPath()+"/land/landResponseMessage/?repage";
-	}
-
-}

@@ -3,41 +3,38 @@
  */
  */
 package com.thinkgem.jeesite.modules.land.web;
 package com.thinkgem.jeesite.modules.land.web;
 
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
 import com.thinkgem.jeesite.common.barCode.buildBarCode;
 import com.thinkgem.jeesite.common.barCode.buildBarCode;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
 import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService;
 import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService;
 import com.thinkgem.jeesite.modules.sys.entity.Office;
 import com.thinkgem.jeesite.modules.sys.entity.Office;
-import com.thinkgem.jeesite.modules.sys.entity.Role;
 import com.thinkgem.jeesite.modules.sys.entity.User;
 import com.thinkgem.jeesite.modules.sys.entity.User;
 import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
 import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
 import com.thinkgem.jeesite.modules.sys.service.OfficeService;
 import com.thinkgem.jeesite.modules.sys.service.OfficeService;
 import com.thinkgem.jeesite.modules.sys.service.SystemService;
 import com.thinkgem.jeesite.modules.sys.service.SystemService;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * 汽车备案Controller
  * 汽车备案Controller
- * 
+ *
  * @author zhangfan
  * @author zhangfan
  * @version 2018-10-08
  * @version 2018-10-08
  */
  */
@@ -80,8 +77,7 @@ public class LandRoadVeRecordController extends BaseController {
 			List<User> u = systemService.findByOfficeId(office.getId());
 			List<User> u = systemService.findByOfficeId(office.getId());
 			for (int i = 0; i < u.size(); i++) {
 			for (int i = 0; i < u.size(); i++) {
 				landRoadVeRecord.setCreateBy(u.get(i));
 				landRoadVeRecord.setCreateBy(u.get(i));
-				page = landRoadVeRecordService.findPage(new Page<LandRoadVeRecord>(request, response),
-						landRoadVeRecord);
+				page = landRoadVeRecordService.findPage(new Page<LandRoadVeRecord>(request, response),landRoadVeRecord);
 				lists.addAll(page.getList());
 				lists.addAll(page.getList());
 			}
 			}
 			page.setCount(lists.size());
 			page.setCount(lists.size());
@@ -90,7 +86,7 @@ public class LandRoadVeRecordController extends BaseController {
 			 * Role role = systemService.getByUserId(user.getId()); List<Role> roles =
 			 * Role role = systemService.getByUserId(user.getId()); List<Role> roles =
 			 * systemService.findAllRole(); if("admin".equals(role.getEnname())
 			 * systemService.findAllRole(); if("admin".equals(role.getEnname())
 			 * ||"leader".equals(role.getEnname())) {
 			 * ||"leader".equals(role.getEnname())) {
-			 * 
+			 *
 			 * }else { landRoadVeRecord.setCreateBy(user); }
 			 * }else { landRoadVeRecord.setCreateBy(user); }
 			 */
 			 */
 			if ("3".equals(user.getUserType())) {
 			if ("3".equals(user.getUserType())) {
@@ -126,10 +122,12 @@ public class LandRoadVeRecordController extends BaseController {
 		if (!beanValidator(model, landRoadVeRecord)) {
 		if (!beanValidator(model, landRoadVeRecord)) {
 			return form(landRoadVeRecord, model);
 			return form(landRoadVeRecord, model);
 		}
 		}
-		String barcode = landRoadVeRecord.getBarcode();
-
+		System.out.println(landRoadVeRecord.getDomesticLisenceNo());
+		List<LandRoadVeRecord> veList = landRoadVeRecordService.selectByFrameNo(landRoadVeRecord.getDomesticLisenceNo());
+		if(veList.size()>0) {
+			landRoadVeRecord.setId(veList.get(0).getId());
+		}
 		String barCode = buildBarCode.crateCar(landRoadVeRecord);
 		String barCode = buildBarCode.crateCar(landRoadVeRecord);
-		// String barCode = "111";
 		if ("0".equals(barCode)) {
 		if ("0".equals(barCode)) {
 			landRoadVeRecord.setReturnmessage("备案成功");
 			landRoadVeRecord.setReturnmessage("备案成功");
 		} else {
 		} else {
@@ -167,5 +165,12 @@ public class LandRoadVeRecordController extends BaseController {
 		}
 		}
 		return page;
 		return page;
 	}
 	}
-
-}
+	@RequiresPermissions("land:landRoadVeRecord:edit")
+	@RequestMapping(value = "change")
+	public String change(LandRoadVeRecord landRoadVeRecord, RedirectAttributes redirectAttributes) {
+		landRoadVeRecord.setOperationType("1");
+		landRoadVeRecordService.save(landRoadVeRecord);
+		addMessage(redirectAttributes, "状态更新成功");
+		return "redirect:" + Global.getAdminPath() + "/land/landRoadVeRecord/?repage";
+	}
+}

@@ -69,13 +69,13 @@ public class SystemAuthorizingRealm extends AuthorizingRealm {
 		}
 		}
 		
 		
 		// 校验登录验证码
 		// 校验登录验证码
-		if (LoginController.isValidateCodeLogin(token.getUsername(), false, false)){
+/*		if (LoginController.isValidateCodeLogin(token.getUsername(), false, false)){
 			Session session = UserUtils.getSession();
 			Session session = UserUtils.getSession();
 			String code = (String)session.getAttribute(ValidateCodeServlet.VALIDATE_CODE);
 			String code = (String)session.getAttribute(ValidateCodeServlet.VALIDATE_CODE);
 			if (token.getCaptcha() == null || !token.getCaptcha().toUpperCase().equals(code)){
 			if (token.getCaptcha() == null || !token.getCaptcha().toUpperCase().equals(code)){
 				throw new AuthenticationException("msg:验证码错误, 请重试.");
 				throw new AuthenticationException("msg:验证码错误, 请重试.");
 			}
 			}
-		}
+		}*/
 		
 		
 		// 校验用户名密码
 		// 校验用户名密码
 		User user = getSystemService().getUserByLoginName(token.getUsername());
 		User user = getSystemService().getUserByLoginName(token.getUsername());

@@ -110,13 +110,13 @@ public class LoginController extends BaseController{
 					sessionDAO.getActiveSessions(false).size(), message, exception);
 					sessionDAO.getActiveSessions(false).size(), message, exception);
 		}
 		}
 		
 		
-		// 非授权异常，登录失败，验证码加1。
+/*		// 非授权异常，登录失败，验证码加1。
 		if (!UnauthorizedException.class.getName().equals(exception)){
 		if (!UnauthorizedException.class.getName().equals(exception)){
 			model.addAttribute("isValidateCodeLogin", isValidateCodeLogin(username, true, false));
 			model.addAttribute("isValidateCodeLogin", isValidateCodeLogin(username, true, false));
-		}
+		}*/
 		
 		
 		// 验证失败清空验证码
 		// 验证失败清空验证码
-		request.getSession().setAttribute(ValidateCodeServlet.VALIDATE_CODE, IdGen.uuid());
+	//	request.getSession().setAttribute(ValidateCodeServlet.VALIDATE_CODE, IdGen.uuid());
 		
 		
 		// 如果是手机登录，则返回JSON字符串
 		// 如果是手机登录，则返回JSON字符串
 		if (mobile){
 		if (mobile){

@@ -73,6 +73,15 @@
 			</if>
 			</if>
 		order by a.create_date DESC
 		order by a.create_date DESC
 	</select>
 	</select>
+	<select id="findByTime" resultType="LandBusinesstypeList">
+		select * from land_businesstype_list 
+		WHERE PRODECT_TIME &gt;=#{time1} 
+		AND PRODECT_TIME &lt;= #{time2} 
+		AND ENDSTATION= "4604000000" 
+		AND AISLE = "4604333311" 
+		AND IS_DELETE="0" 
+		ORDER BY PRODECT_TIME;
+	</select>
 	<select id="findByMessageId" resultType="LandBusinesstypeList">
 	<select id="findByMessageId" resultType="LandBusinesstypeList">
 		SELECT 
 		SELECT 
 			<include refid="landBusinesstypeListColumns"/>
 			<include refid="landBusinesstypeListColumns"/>
@@ -178,6 +187,10 @@
 		UPDATE land_businesstype_list set is_delete = "1",isvalid = "1"
 		UPDATE land_businesstype_list set is_delete = "1",isvalid = "1"
 		WHERE barcode = #{barcode}
 		WHERE barcode = #{barcode}
 	</update>
 	</update>
+	<update id="deleteByPrimaryKey" parameterType="java.lang.String">
+		DELETE FROM land_businesstype_list
+		WHERE id = #{id}
+	</update>
 	
 	
 	<update id="deleteByMessageId" parameterType="java.lang.String">
 	<update id="deleteByMessageId" parameterType="java.lang.String">
 		DELETE FROM land_businesstype_list 
 		DELETE FROM land_businesstype_list 
@@ -254,66 +267,42 @@
 	
 	
 	<update id="update">
 	<update id="update">
 		UPDATE land_businesstype_list SET 	
 		UPDATE land_businesstype_list SET 	
-			massage_id = #{massageId},
 			trailer_frame_no = #{trailerFrameNo},
 			trailer_frame_no = #{trailerFrameNo},
-			trailer_license_no = #{trailerLicenseNo},
 			master_list = #{masterList},
 			master_list = #{masterList},
-			prodect_time = #{prodectTime},
-			is_delete = #{isDelete},
 			agentno = #{agentno},
 			agentno = #{agentno},
 			agentname = #{agentname},
 			agentname = #{agentname},
 			cocode = #{cocode},
 			cocode = #{cocode},
-			drivername = #{drivername},
-			driverid = #{driverid},
 			startport = #{startport},
 			startport = #{startport},
 			endport = #{endport},
 			endport = #{endport},
 			startsatation = #{startsatation},
 			startsatation = #{startsatation},
 			endstation = #{endstation},
 			endstation = #{endstation},
 			aisle = #{aisle},
 			aisle = #{aisle},
 			businesstype = #{businesstype},
 			businesstype = #{businesstype},
-			turnoverflag = #{turnoverflag},
 			barcode = #{barcode},
 			barcode = #{barcode},
-			contrastflag = #{contrastflag},
 			update_by = #{updateBy.id},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			update_date = #{updateDate},
-			isvalid = #{isvalid},
-			aislewt = #{aislewt},
-			isfull = #{isfull},
-			remark = #{remark},
-			remark1 = #{remark1},
-			remark2 = #{remark2}
+			isfull = #{isfull}
 		WHERE id = #{id}
 		WHERE id = #{id}
 	</update>
 	</update>
 	<update id="updateEntry">
 	<update id="updateEntry">
 		UPDATE land_businesstype_list SET 	
 		UPDATE land_businesstype_list SET 	
-			massage_id = #{massageId},
 			trailer_frame_no = #{trailerFrameNo},
 			trailer_frame_no = #{trailerFrameNo},
-			trailer_license_no = #{trailerLicenseNo},
 			master_list = #{masterList},
 			master_list = #{masterList},
-			prodect_time = #{prodectTime},
-			is_delete = #{isDelete},
 			agentno = #{agentno},
 			agentno = #{agentno},
 			agentname = #{agentname},
 			agentname = #{agentname},
 			cocode = #{cocode},
 			cocode = #{cocode},
-			drivername = #{drivername},
-			driverid = #{driverid},
 			startport = #{startport},
 			startport = #{startport},
 			endport = #{endport},
 			endport = #{endport},
 			startsatation = #{startsatation},
 			startsatation = #{startsatation},
 			endstation = #{endstation},
 			endstation = #{endstation},
 			aisle = #{aisle},
 			aisle = #{aisle},
-			businesstype = #{businesstype},
-			turnoverflag = #{turnoverflag},
 			barcode = #{barcode},
 			barcode = #{barcode},
-			contrastflag = #{contrastflag},
+			contrastflag=#{contrastflag},
+			businesstype = #{businesstype},
 			update_by = #{updateBy.id},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			update_date = #{updateDate},
-			isvalid = #{isvalid},
-			aislewt = #{aislewt},
-			isfull = #{isfull},
-			remark = #{remark},
-			remark1 = #{remark1},
-			remark2 = #{remark2}
+			isvalid=#{isvalid},
+			isfull = #{isfull}
 		WHERE id = #{id}
 		WHERE id = #{id}
 	</update>
 	</update>
 	
 	

@@ -298,13 +298,33 @@ th, td {
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="control-group">
 		<div class="control-group">
-			<label class="control-label">是否空车：</label>
-			<div class="controls">
-				<form:select path="isfull" class="input-xlarge">
-					<form:option value="" label="--请选择--" />
-					<form:option value="0" label="是"  selected = "selected"/>
-					<form:option value="1" label="否"/>
-				</form:select>
+		  <div class="row-fluid">
+			<div class="span12">
+				<div class="span6">
+					<label class="control-label">是否空车：</label>
+					<div class="controls">
+						<form:select path="isfull" class="input-xlarge">
+							<form:option value="" label="--请选择--" />
+							<form:option value="0" label="是"  selected = "selected"/>
+							<form:option value="1" label="否"/>
+						</form:select>
+					</div>
+				</div>
+				<div class="span6">
+					<label class="control-label">货物类型：</label>
+					<div class="controls">
+						<form:select path="cocode" class="input-xlarge">
+							<form:option value="" label="--请选择--" />
+							<form:option value="转关货" label="转关货"/>
+							<form:option value="换单货" label="换单货"/>
+							<form:option value="普通货" label="普通货"/>
+							<form:option value="退库货" label="退库货"/>
+							<form:option value="查验货" label="查验货"/>
+						</form:select>
+						<span class="help-inline"><font color="red">*</font></span>
+					</div>
+				</div>
+			  </div>
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="control-group">
 		<div class="control-group">
@@ -447,8 +467,8 @@ th, td {
 		}else if(ieType=="出口送货" | ieType=="调拨业务"){ 
 		}else if(ieType=="出口送货" | ieType=="调拨业务"){ 
 			ieType="E";
 			ieType="E";
 		}
 		}
-		var url = "http://tjfx.15miaoo.com:8003/tj/orig/orig";
-		//var url = "http://10.50.3.64:8080/tj/orig/orig";
+		var url = "http://tjfx.15miaoo.com:8003/orig/orig";
+	//	var url = "http://10.50.3.64:8080/tj/orig/orig";
 		var xhr = new XMLHttpRequest();
 		var xhr = new XMLHttpRequest();
 		// 访问nginx中的代理服务器
 		// 访问nginx中的代理服务器
 		xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true);
 		xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true);
@@ -459,37 +479,39 @@ th, td {
 		        	var flightNo = "";
 		        	var flightNo = "";
 		        	var flightDate = "";
 		        	var flightDate = "";
 		            var data = JSON.parse(xhr.responseText);
 		            var data = JSON.parse(xhr.responseText);
-		            for(var i = 0;i<data.length;i++ ){
-		            	console.log(data[i])
-		            	console.log()
-		            	if(data[i].receiptinformation!=undefined){
-		            		if(data[i].receiptinformation.indexOf("41301")!=-1 || data[i].receiptinformation.indexOf("41106")!=-1 ||
-			            			data[i].receiptinformation.indexOf("31301")!=-1 || data[i].receiptinformation.indexOf("31106")!=-1 ||
-			            			data[i].receiptinformation.indexOf("提运单放行")!=-1 ){
-			            		  if(ieType=="I"){
-			  		            	flightNo = data[i].flightno;
-			  		            	flightDate = timeFormat(data[i].flightDate).substring(0,10);
-			  		            }else{
-			  		            	flightNo = data[i].carrier+data[i].flightno
-			  		            	flightDate = timeFormat(data[i].flightdate).substring(0,10)
-			  		            }
-			  		            $("#tableInfo").children("tr").remove();
-			  		    		var str = '<tr>'+
-			  		    			'<td><button class="btn btn-primary" onclick="addData(this);">添加</button></td>'+
-			  		    			'<td>'+flightNo+'</td>'+
-			  		    			'<td>'+flightDate+'</td>'+
-			  		    			'<td>'+data[i].originatingstation+"-"+data[0].destinationstation+'</td>'+
-			  		    			'<td>'+data[i].waybillnomaster+'</td>'+
-			  		    			'<td>'+data[i].totalpiece +'</td>'+
-			  		    			'<td>'+data[i].totalweight +'</td>'+
-			  		    			'<td>'+data[i].customscode+'</td>'+
-			  		    			'<td>'+timeFormat(data[i].createdate) +'</td>'+
-			  		    			'<td>'+data[i].receiptinformation +'</td>'+
-			  		    		'</tr>';
-			  		    		$("#tableInfo").append(str);
+		            if(data.length>0){
+		                for(var i = 0;i<data.length;i++ ){
+			            	if(data[i].receiptinformation!=undefined){
+			            		if(data[i].receiptinformation.indexOf("41301")!=-1 || data[i].receiptinformation.indexOf("41106")!=-1 ||
+				            			data[i].receiptinformation.indexOf("31301")!=-1 || data[i].receiptinformation.indexOf("31106")!=-1 ||
+				            			data[i].receiptinformation.indexOf("提运单放行")!=-1 ){
+				            		  if(ieType=="I"){
+				  		            	flightNo = data[i].flightno;
+				  		            	flightDate = timeFormat(data[i].flightDate).substring(0,10);
+				  		            }else{
+				  		            	flightNo = data[i].carrier+data[i].flightno
+				  		            	flightDate = timeFormat(data[i].flightdate).substring(0,10)
+				  		            }
+				  		            $("#tableInfo").children("tr").remove();
+				  		    		var str = '<tr>'+
+				  		    			'<td><button class="btn btn-primary" onclick="addData(this);">添加</button></td>'+
+				  		    			'<td>'+flightNo+'</td>'+
+				  		    			'<td>'+flightDate+'</td>'+
+				  		    			'<td>'+data[i].originatingstation+"-"+data[0].destinationstation+'</td>'+
+				  		    			'<td>'+data[i].waybillnomaster+'</td>'+
+				  		    			'<td>'+data[i].totalpiece +'</td>'+
+				  		    			'<td>'+data[i].totalweight +'</td>'+
+				  		    			'<td>'+data[i].customscode+'</td>'+
+				  		    			'<td>'+timeFormat(data[i].createdate) +'</td>'+
+				  		    			'<td>'+data[i].receiptinformation +'</td>'+
+				  		    		'</tr>';
+				  		    		$("#tableInfo").append(str);
+				            	}
 			            	}
 			            	}
-		            	}
-		            	
+			            	
+			            }
+		            }else {
+		            	alert("请确认单号是否为郑州关进出口单号")
 		            }
 		            }
 		        }
 		        }
 		   }
 		   }

@@ -86,6 +86,9 @@
 				<shiro:hasAnyRoles name="dept,admin,leader">
 				<shiro:hasAnyRoles name="dept,admin,leader">
 					<th>操作</th>
 					<th>操作</th>
 				</shiro:hasAnyRoles>
 				</shiro:hasAnyRoles>
+				<shiro:hasRole name="dept">
+					<th>是否失效</th>
+				</shiro:hasRole>
 				<th>车牌号</th>
 				<th>车牌号</th>
 				<th>挂靠单位</th>
 				<th>挂靠单位</th>
 				<th>目的海关代码</th>
 				<th>目的海关代码</th>
@@ -96,6 +99,7 @@
 				<th>进出差值</th>
 				<th>进出差值</th>
 				<th>备案车重</th>
 				<th>备案车重</th>
 				<th>业务类型</th>
 				<th>业务类型</th>
+				<th>货物类型</th>
 				<th>二维码编号</th>
 				<th>二维码编号</th>
 				<th>进出场站</th>
 				<th>进出场站</th>
 				<th>已进已出</th>
 				<th>已进已出</th>
@@ -111,6 +115,12 @@
 					<a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">查看</a>
 					<a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">查看</a>
 				</td>
 				</td>
 				</shiro:hasAnyRoles>
 				</shiro:hasAnyRoles>
+				<shiro:hasRole name="dept">
+					<td>
+						<c:if test="${landBusinesstypeList.isvalid =='1'}">失效</c:if>
+						<c:if test="${landBusinesstypeList.isvalid =='0'}">未失效</c:if>
+					</td>
+				</shiro:hasRole>
 				<td>${landBusinesstypeList.trailerFrameNo}</td>
 				<td>${landBusinesstypeList.trailerFrameNo}</td>
 				<td>${landBusinesstypeList.agentname}</td>		
 				<td>${landBusinesstypeList.agentname}</td>		
 				<td>${landBusinesstypeList.endport}</td>
 				<td>${landBusinesstypeList.endport}</td>
@@ -134,6 +144,7 @@
 				<td>${landBusinesstypeList.remark1}</td>
 				<td>${landBusinesstypeList.remark1}</td>
 				<td>${landBusinesstypeList.remark2}</td>
 				<td>${landBusinesstypeList.remark2}</td>
 				<td>${landBusinesstypeList.businesstype}</td>
 				<td>${landBusinesstypeList.businesstype}</td>
+				<td>${landBusinesstypeList.cocode}</td>
 				<td>${landBusinesstypeList.barcode}</td>
 				<td>${landBusinesstypeList.barcode}</td>
 				<td>
 				<td>
 					<c:if test="${landBusinesstypeList.turnoverflag =='E'}">出场站</c:if>
 					<c:if test="${landBusinesstypeList.turnoverflag =='E'}">出场站</c:if>
@@ -147,8 +158,8 @@
 					<c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}">
 					<c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}">
 						<a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">修改</a>
 						<a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">修改</a>
 						<a href="${ctx}/land/landBusinesstypeList/delete?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要删除该流转吗？', this.href)">删除</a>
 						<a href="${ctx}/land/landBusinesstypeList/delete?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要删除该流转吗？', this.href)">删除</a>
-						<shiro:hasAnyRoles name="dept,admin.leader">
-							<a href="${ctx}/land/landBusinesstypeList/update?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要更新异常吗？', this.href)">异常处理</a>
+						<shiro:hasAnyRoles name="dept,admin,leader">
+							<a href="${ctx}/land/landBusinesstypeList/updateError?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要更新异常吗？', this.href)">异常处理</a>
 						</shiro:hasAnyRoles>
 						</shiro:hasAnyRoles>
 					</c:if>
 					</c:if>
 				</td></shiro:hasPermission>
 				</td></shiro:hasPermission>

@@ -205,7 +205,7 @@ input {
 				</form:select>
 				</form:select>
 			</div>
 			</div>
 		</div>
 		</div>
-		<div class="control-group">
+<%-- 		<div class="control-group">
 			<h4>运输服务企业信息</h4>
 			<h4>运输服务企业信息</h4>
 		</div>
 		</div>
 		<div class="control-group">
 		<div class="control-group">
@@ -475,7 +475,7 @@ input {
 						itemValue="value" htmlEscape="false" />
 						itemValue="value" htmlEscape="false" />
 				</form:select>
 				</form:select>
 			</div>
 			</div>
-		</div>
+		</div> --%>
 		<div class="control-group">
 		<div class="control-group">
 			<label class="row-lable">备注：</label>
 			<label class="row-lable">备注：</label>
 			<div class="row-controls">
 			<div class="row-controls">

@@ -53,64 +53,159 @@
 		<div class="control-group">
 		<div class="control-group">
 			<h4>驾驶员信息</h4>
 			<h4>驾驶员信息</h4>
 		</div>	
 		</div>	
-		<div class="control-group">
-			<label class="control-label">主管海关代码：</label>
-			<div class="controls">
-				<form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-xlarge " id="mainPort"/>
+				<div class="control-group">
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span4">
+						<label class="control-label">主管海关代码：</label>
+						<div class="controls">
+							<form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-xlarge " id="mainPort"/>
+						</div>
+					</div>
+					<div class="span4">
+						<label class="control-label">所在企业代码：</label>
+						<div class="controls">
+							<form:input path="coCode" htmlEscape="false" maxlength="32" class="input-xlarge "/>
+						</div>
+					</div>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">所在企业代码：</label>
-			<div class="controls">
-				<form:input path="coCode" htmlEscape="false" maxlength="32" class="input-xlarge "/>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label">身份证号/护照号：</label>
+<%-- 		<div class="control-group">
+			<label class="control-label">国籍：</label>
 			<div class="controls">
 			<div class="controls">
-				<form:input path="idCard" htmlEscape="false" maxlength="18" class="input-xlarge "/>
+				<form:input path="nationality" htmlEscape="false" maxlength="2" class="input-medium "/>
 			</div>
 			</div>
-		</div>
+		</div> --%>
+
 		<div class="control-group">
 		<div class="control-group">
-			<label class="control-label">驾驶员姓名：</label>
-			<div class="controls">
-				<form:input path="drName" htmlEscape="false" maxlength="20" class="input-large "/>
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span4">
+						<label class="control-label">身份证号/护照号：</label>
+						<div class="controls">
+							<form:input path="idCard" htmlEscape="false" maxlength="18" class="input-xlarge "/>
+						</div>
+					</div>
+					<div class="span4">
+						<label class="control-label">驾驶员姓名：</label>
+						<div class="controls">
+							<form:input path="drName" htmlEscape="false" maxlength="20" class="input-large "/>
+						</div>
+					</div>
+			
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="control-group">
 		<div class="control-group">
-			<label class="control-label">国籍：</label>
-			<div class="controls">
-				<form:input path="nationality" htmlEscape="false" maxlength="2" class="input-medium "/>
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span4">
+						<label class="control-label">籍贯：</label>
+						<div class="controls">
+							<form:input path="drNative" htmlEscape="false" maxlength="20" class="input-medium "/>
+						</div>
+					</div>
+					<div class="span4">
+						<label class="control-label">性别：</label>
+						<div class="controls">
+							<form:input path="gender" htmlEscape="false" maxlength="1" class="input-medium "/>
+						</div>
+					</div>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="control-group">
 		<div class="control-group">
-			<label class="control-label">籍贯：</label>
-			<div class="controls">
-				<form:input path="drNative" htmlEscape="false" maxlength="20" class="input-medium "/>
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span4">
+						<label class="control-label">出生日期：</label>
+						<div class="controls">
+							<input name="birthday" type="text" readonly="readonly" maxlength="20" class="input-large Wdate "
+								value="<fmt:formatDate value="${landRoadDrRecord.birthday}" pattern="yyyy-MM-dd"/>"
+								onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+						</div>
+					</div>
+					<div class="span4">
+						<label class="control-label">居住地址：</label>
+						<div class="controls">
+							<form:input path="liveAddr" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+						</div>
+					</div>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="control-group">
 		<div class="control-group">
-			<label class="control-label">性别：</label>
-			<div class="controls">
-				<form:input path="gender" htmlEscape="false" maxlength="1" class="input-medium "/>
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span4">
+						<label class="control-label">申请人：</label>
+						<div class="controls">
+							<form:input path="proposer" htmlEscape="false" maxlength="32" class="input-xlarge "/>
+						</div>
+					</div>
+					<div class="span4">
+						<label class="control-label">申请时间：</label>
+						<div class="controls">
+							<input name="proposeTime" type="text" readonly="readonly" maxlength="20" class="input-large Wdate "
+								value="<fmt:formatDate value="${landRoadDrRecord.proposeTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+								onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
+						</div>
+					</div>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="control-group">
 		<div class="control-group">
-			<label class="control-label">出生日期：</label>
-			<div class="controls">
-				<input name="birthday" type="text" readonly="readonly" maxlength="20" class="input-large Wdate "
-					value="<fmt:formatDate value="${landRoadDrRecord.birthday}" pattern="yyyy-MM-dd"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span4">
+						<label class="control-label">驾驶员分类：</label>
+						<div class="controls">
+							<form:select path="drClassFlag" class="input-xlarge ">
+								<form:option value="" label=""/>
+								<form:option value="经营性进出境公路运输工具	" label="经营性进出境公路运输工具	"/>
+								<form:option value="经营性来往港澳公路运输工具" label="经营性来往港澳公路运输工具"/>
+								<form:option value="非经营性进出境交通工具" label="非经营性进出境交通工具"/>
+								<form:option value="非经营性来往港澳公路交通工具" label="非经营性来往港澳公路交通工具"/>
+							</form:select>
+						</div>
+					</div>
+					<div class="span4">
+						<label class="control-label">驾车资格编号：</label>
+						<div class="controls">
+							<form:input path="quaId" htmlEscape="false" maxlength="32" class="input-xlarge required"/>
+							<span class="help-inline"><font color="red">*</font> </span>
+						</div>
+					</div>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="control-group">
 		<div class="control-group">
-			<label class="control-label">居住地址：</label>
-			<div class="controls">
-				<form:input path="liveAddr" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span4">
+						<label class="control-label">驾车资格：</label>
+						<div class="controls">
+							<form:select path="drQua" class="input-xlarge ">
+								<form:option value="" label=""/>
+								<form:option value="经营性来往港澳公路运输工具" label="经营性来往港澳公路运输工具"/>
+								<form:option value="经营性进出境公路运输工具" label="经营性进出境公路运输工具"/>
+								<form:option value="境内公路承运海关监管货物运输工具" label="境内公路承运海关监管货物运输工具"/>
+								<form:option value="非经营性来往港澳公路交通工具" label="非经营性来往港澳公路交通工具"/>
+								<form:option value="非经营性进出境公路交通工具" label="非经营性进出境公路交通工具"/>
+							</form:select>
+						</div>
+					</div>
+					<div class="span4">
+						<label class="control-label">备注：</label>
+						<div class="controls">
+							<form:input path="memo" htmlEscape="false" maxlength="512" class="input-xlarge "/>
+						</div>
+					</div>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
-		<div class="control-group">
+		<%-- <div class="control-group">
 			<label class="control-label">最新更新申请业务类型：</label>
 			<label class="control-label">最新更新申请业务类型：</label>
 			<div class="controls">
 			<div class="controls">
 				<form:select path="currApplyBussiness" class="input-xlarge ">
 				<form:select path="currApplyBussiness" class="input-xlarge ">
@@ -118,34 +213,8 @@
 					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 				</form:select>
 				</form:select>
 			</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">申请人：</label>
-			<div class="controls">
-				<form:input path="proposer" htmlEscape="false" maxlength="32" class="input-xlarge "/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">申请时间：</label>
-			<div class="controls">
-				<input name="proposeTime" type="text" readonly="readonly" maxlength="20" class="input-large Wdate "
-					value="<fmt:formatDate value="${landRoadDrRecord.proposeTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">驾驶员分类：</label>
-			<div class="controls">
-				<form:select path="drClassFlag" class="input-xlarge ">
-					<form:option value="" label=""/>
-					<form:option value="经营性进出境公路运输工具	" label="经营性进出境公路运输工具	"/>
-					<form:option value="经营性来往港澳公路运输工具" label="经营性来往港澳公路运输工具"/>
-					<form:option value="非经营性进出境交通工具" label="非经营性进出境交通工具"/>
-					<form:option value="非经营性来往港澳公路交通工具" label="非经营性来往港澳公路交通工具"/>
-				</form:select>
-			</div>
-		</div>
-		<div class="control-group">
+		</div> --%>
+	<%-- 	<div class="control-group">
 			<label class="control-label">数据操作类型：</label>
 			<label class="control-label">数据操作类型：</label>
 			<div class="controls">
 			<div class="controls">
 				<form:select path="operationType" class="input-xlarge ">
 				<form:select path="operationType" class="input-xlarge ">
@@ -159,34 +228,9 @@
 			<div class="controls">
 			<div class="controls">
 				<form:input path="drPic" htmlEscape="false" maxlength="255" class="input-xlarge "/>
 				<form:input path="drPic" htmlEscape="false" maxlength="255" class="input-xlarge "/>
 			</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">备注：</label>
-			<div class="controls">
-				<form:input path="memo" htmlEscape="false" maxlength="512" class="input-xlarge "/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">驾车资格编号：</label>
-			<div class="controls">
-				<form:input path="quaId" htmlEscape="false" maxlength="32" class="input-xlarge required"/>
-				<span class="help-inline"><font color="red">*</font> </span>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">驾车资格：</label>
-			<div class="controls">
-				<form:select path="drQua" class="input-xlarge ">
-					<form:option value="" label=""/>
-					<form:option value="经营性来往港澳公路运输工具" label="经营性来往港澳公路运输工具"/>
-					<form:option value="经营性进出境公路运输工具" label="经营性进出境公路运输工具"/>
-					<form:option value="境内公路承运海关监管货物运输工具" label="境内公路承运海关监管货物运输工具"/>
-					<form:option value="非经营性来往港澳公路交通工具" label="非经营性来往港澳公路交通工具"/>
-					<form:option value="非经营性进出境公路交通工具" label="非经营性进出境公路交通工具"/>
-				</form:select>
-			</div>
-		</div>
-		<div class="control-group">
+		</div> --%>
+		
+	<%-- 	<div class="control-group">
 			<label class="control-label">批文编号（N）：</label>
 			<label class="control-label">批文编号（N）：</label>
 			<div class="controls">
 			<div class="controls">
 				<form:input path="apprNo" htmlEscape="false" maxlength="32" class="input-xlarge "/>
 				<form:input path="apprNo" htmlEscape="false" maxlength="32" class="input-xlarge "/>
@@ -210,8 +254,8 @@
 					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 			</div>
 			</div>
 		</div>
 		</div>
-		
-		<span class="help-inline"><font color="red" >注：页面内容请全部填写</font></span>
+		 --%>
+		<!-- <span class="help-inline"><font color="red" >注：页面内容请全部填写</font></span> -->
 		<div class="form-actions">
 		<div class="form-actions">
 			<shiro:hasPermission name="land:landRoadDrRecord:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
 			<shiro:hasPermission name="land:landRoadDrRecord:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
 			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>

@@ -127,7 +127,7 @@ input {
 			<label class="row-lable">行驶证有效期：</label> 
 			<label class="row-lable">行驶证有效期：</label> 
 			<span class="row-controls">
 			<span class="row-controls">
 				<input name="veFactoryDate" type="text"
 				<input name="veFactoryDate" type="text"
-				maxlength="20" class="input-medium Wdate required"
+				maxlength="20" class="input-medium Wdate"
 				value="<fmt:formatDate value="${landRoadVeRecord.veFactoryDate}" pattern="yyyy-MM-dd"/>"
 				value="<fmt:formatDate value="${landRoadVeRecord.veFactoryDate}" pattern="yyyy-MM-dd"/>"
 				onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
 				onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
 				<span class="help-inline"><font color="red">*</font></span>
 				<span class="help-inline"><font color="red">*</font></span>

@@ -47,6 +47,7 @@
 				<th>自重</th>
 				<th>自重</th>
 				<th>载重</th>
 				<th>载重</th>
 				<th>备案结果</th>
 				<th>备案结果</th>
+				<th>申报状态</th>
 				<th>更新时间</th>
 				<th>更新时间</th>
 				<shiro:hasPermission name="land:landRoadVeRecord:edit"><th>操作</th></shiro:hasPermission>
 				<shiro:hasPermission name="land:landRoadVeRecord:edit"><th>操作</th></shiro:hasPermission>
 			</tr>
 			</tr>
@@ -64,13 +65,18 @@
 				<td>${landRoadVeRecord.selfWt }</td> 
 				<td>${landRoadVeRecord.selfWt }</td> 
 				<td>${landRoadVeRecord.veTon }</td> 
 				<td>${landRoadVeRecord.veTon }</td> 
 				<td>${landRoadVeRecord.returnmessage }</td> 
 				<td>${landRoadVeRecord.returnmessage }</td> 
-				<td><a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">
+				<td>
+					<c:if test="${landRoadVeRecord.operationType=='1' }">审批通过</c:if>
+					<c:if test="${landRoadVeRecord.operationType=='0' }">需手动审批</c:if>
+				</td> 
+				<td>
 					<fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 					<fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 				</a></td>
 				</a></td>
 				<shiro:hasPermission name="land:landRoadVeRecord:edit"><td>
 				<shiro:hasPermission name="land:landRoadVeRecord:edit"><td>
     				<a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">修改</a>
     				<a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">修改</a>
     				<shiro:hasAnyRoles name="dept,admin,leader">
     				<shiro:hasAnyRoles name="dept,admin,leader">
 						<a href="${ctx}/land/landRoadVeRecord/delete?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要删除该备案吗？', this.href)">删除</a>
 						<a href="${ctx}/land/landRoadVeRecord/delete?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要删除该备案吗？', this.href)">删除</a>
+						<a href="${ctx}/land/landRoadVeRecord/change?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要审批吗？', this.href)">审批</a>
 					</shiro:hasAnyRoles>
 					</shiro:hasAnyRoles>
 				</td></shiro:hasPermission>
 				</td></shiro:hasPermission>
 			</tr>
 			</tr>

@@ -165,8 +165,8 @@
 						<ul class="dropdown-menu">
 						<ul class="dropdown-menu">
 							<li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; 个人信息</a></li>
 							<li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; 个人信息</a></li>
 							<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp;  修改密码</a></li>
 							<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp;  修改密码</a></li>
-							<li><a href="${ctx}/oa/oaNotify/self" target="mainFrame"><i class="icon-bell"></i>&nbsp;  我的通知 <span id="notifyNum2" class="label label-info hide"></span></a></li>
-						</ul>
+<%-- 							<li><a href="${ctx}/oa/oaNotify/self" target="mainFrame"><i class="icon-bell"></i>&nbsp;  我的通知 <span id="notifyNum2" class="label label-info hide"></span></a></li>
+ --%>						</ul>
 					</li>
 					</li>
 					<li><a href="${ctx}/logout" title="退出登录">退出</a></li>
 					<li><a href="${ctx}/logout" title="退出登录">退出</a></li>
 					<li>&nbsp;</li>
 					<li>&nbsp;</li>

@@ -5,26 +5,28 @@
 <head>
 <head>
 	<title>${fns:getConfig('productName')} 登录</title>
 	<title>${fns:getConfig('productName')} 登录</title>
 	<meta name="decorator" content="blank"/>
 	<meta name="decorator" content="blank"/>
-	<style type="text/css">
-      html,body,table{background-color:#f5f5f5;width:100%;text-align:center;}.form-signin-heading{font-family:Helvetica, Georgia, Arial, sans-serif, 黑体;font-size:36px;margin-bottom:20px;color:#0663a2;}
-      .form-signin{position:relative;text-align:left;width:300px;padding:25px 29px 29px;margin:0 auto 20px;background-color:#fff;border:1px solid #e5e5e5;
+<!-- 		<style type="text/css">
+      html,body,table{background-color:#3E75C0;width:100%;text-align:center;}.form-signin-heading{font-family:Helvetica, Georgia, Arial, sans-serif, 黑体;font-size:36px;margin-bottom:20px;color:#0663a2;}
+      .form-signin{position:absolute;text-align:left;width:300px;padding:25px 29px 29px;margin:0 auto 20px;border:0;background:none;box-shadow:none;
         	-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05);}
         	-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05);}
-      .form-signin .checkbox{margin-bottom:10px;color:#0663a2;} .form-signin .input-label{font-size:16px;line-height:23px;color:#999;}
+      .form-signin .checkbox{margin-bottom:10px;color:#0663a2;} .form-signin .input-label{font-size:16px;line-height:23px;color:#fff;}
       .form-signin .input-block-level{font-size:16px;height:auto;margin-bottom:15px;padding:7px;*width:283px;*padding-bottom:0;_padding:7px 7px 9px 7px;}
       .form-signin .input-block-level{font-size:16px;height:auto;margin-bottom:15px;padding:7px;*width:283px;*padding-bottom:0;_padding:7px 7px 9px 7px;}
       .form-signin .btn.btn-large{font-size:16px;} .form-signin #themeSwitch{position:absolute;right:15px;bottom:10px;}
       .form-signin .btn.btn-large{font-size:16px;} .form-signin #themeSwitch{position:absolute;right:15px;bottom:10px;}
       .form-signin div.validateCode {padding-bottom:15px;} .mid{vertical-align:middle;}
       .form-signin div.validateCode {padding-bottom:15px;} .mid{vertical-align:middle;}
-      .header{height:80px;padding-top:20px;} .alert{position:relative;width:300px;margin:0 auto;*padding-bottom:0px;}
+      .header{height:80px;padding-top:20px;} .footer{position:absolute;} .footer, .footer a{color:#779ACA}
+      .alert{position:relative;width:300px;margin:0 auto;*padding-bottom:0px;}
       label.error{background:none;width:270px;font-weight:normal;color:inherit;margin:0;}
       label.error{background:none;width:270px;font-weight:normal;color:inherit;margin:0;}
-    </style>
+      body{background:url(${ctxStatic}/images/login_bg.jpg) no-repeat center center;}
+    </style> -->
 	<script type="text/javascript">
 	<script type="text/javascript">
 		$(document).ready(function() {
 		$(document).ready(function() {
 			$("#loginForm").validate({
 			$("#loginForm").validate({
-				rules: {
+				/* rules: {
 					validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"}
 					validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"}
-				},
+				}, */
 				messages: {
 				messages: {
-					username: {required: "请填写用户名."},password: {required: "请填写密码."},
-					validateCode: {remote: "验证码不正确.", required: "请填写验证码."}
+					username: {required: "请填写用户名."},password: {required: "请填写密码."}
+					/* validateCode: {remote: "验证码不正确.", required: "请填写验证码."} */
 				},
 				},
 				errorLabelContainer: "#messageBox",
 				errorLabelContainer: "#messageBox",
 				errorPlacement: function(error, element) {
 				errorPlacement: function(error, element) {
@@ -37,17 +39,30 @@
 			alert('未登录或登录超时。请重新登录，谢谢！');
 			alert('未登录或登录超时。请重新登录，谢谢！');
 			top.location = "${ctx}";
 			top.location = "${ctx}";
 		}
 		}
-	</script>
+</script>
+<style type="text/css">
+
+	body {
+		background:#3c7fb5 url(${ctxStatic}/images/bg_login.jpg) repeat-x left top;
+	}
+/* 	body,table,td,div {
+		font-size: 12px;
+		line-height: 24px;
+	} */
+	.textfile {
+		height: 29px; 
+		width: 143px; 
+	}
+</style>
 </head>
 </head>
 <body>
 <body>
-	<!--[if lte IE 6]><br/><div class='alert alert-block' style="text-align:left;padding-bottom:10px;"><a class="close" data-dismiss="alert">x</a><h4>温馨提示：</h4><p>你使用的浏览器版本过低。为了获得更好的浏览体验，我们强烈建议您 <a href="http://browsehappy.com" target="_blank">升级</a> 到最新版本的IE浏览器，或者使用较新版本的 Chrome、Firefox、Safari 等。</p></div><![endif]-->
 	<div class="header">
 	<div class="header">
 		<div id="messageBox" class="alert alert-error ${empty message ? 'hide' : ''}"><button data-dismiss="alert" class="close">×</button>
 		<div id="messageBox" class="alert alert-error ${empty message ? 'hide' : ''}"><button data-dismiss="alert" class="close">×</button>
 			<label id="loginError" class="error">${message}</label>
 			<label id="loginError" class="error">${message}</label>
 		</div>
 		</div>
 	</div>
 	</div>
-	<h1 class="form-signin-heading">${fns:getConfig('productName')}</h1>
-	<form id="loginForm" class="form-signin" action="${ctx}/login" method="post">
+	<%-- <h1 class="form-signin-heading">${fns:getConfig('productName')}</h1> --%>
+<%-- 	<form id="loginForm" class="form-signin" action="${ctx}/login" method="post">
 		<label class="input-label" for="username">登录名</label>
 		<label class="input-label" for="username">登录名</label>
 		<input type="text" id="username" name="username" class="input-block-level required" value="${username}">
 		<input type="text" id="username" name="username" class="input-block-level required" value="${username}">
 		<label class="input-label" for="password">密码</label>
 		<label class="input-label" for="password">密码</label>
@@ -55,8 +70,8 @@
 		<c:if test="${isValidateCodeLogin}"><div class="validateCode">
 		<c:if test="${isValidateCodeLogin}"><div class="validateCode">
 			<label class="input-label mid" for="validateCode">验证码</label>
 			<label class="input-label mid" for="validateCode">验证码</label>
 			<sys:validateCode name="validateCode" inputCssStyle="margin-bottom:0;"/>
 			<sys:validateCode name="validateCode" inputCssStyle="margin-bottom:0;"/>
-		</div></c:if><%--
-		<label for="mobile" title="手机登录"><input type="checkbox" id="mobileLogin" name="mobileLogin" ${mobileLogin ? 'checked' : ''}/></label> --%>
+		</div></c:if>
+		<label for="mobile" title="手机登录"><input type="checkbox" id="mobileLogin" name="mobileLogin" ${mobileLogin ? 'checked' : ''}/></label>
 		<input class="btn btn-large btn-primary" type="submit" value="登 录"/>&nbsp;&nbsp;
 		<input class="btn btn-large btn-primary" type="submit" value="登 录"/>&nbsp;&nbsp;
 		<label for="rememberMe" title="下次不需要再登录"><input type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''}/> 记住我（公共场所慎用）</label>
 		<label for="rememberMe" title="下次不需要再登录"><input type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''}/> 记住我（公共场所慎用）</label>
 		<div id="themeSwitch" class="dropdown">
 		<div id="themeSwitch" class="dropdown">
@@ -69,6 +84,67 @@
 	</form>
 	</form>
 	<div class="footer">
 	<div class="footer">
 		Copyright &copy; ${fns:getConfig('copyrightYear')} <a href="${pageContext.request.contextPath}${fns:getFrontPath()}">${fns:getConfig('productName')}</a> - Powered By <a href="#" target="_blank"></a> ${fns:getConfig('version')} 
 		Copyright &copy; ${fns:getConfig('copyrightYear')} <a href="${pageContext.request.contextPath}${fns:getFrontPath()}">${fns:getConfig('productName')}</a> - Powered By <a href="#" target="_blank"></a> ${fns:getConfig('version')} 
+	</div> --%>
+	<div class="loginTable">
+		<table width="596" border="0" align="center" cellpadding="0" cellspacing="0">
+		  <tr>
+		    <td width="596" height="331" background="${ctxStatic}/images/top_login.jpg"  ></td>
+		  </tr>
+		  <tr>
+		    <td>
+		    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+		      <tr height="139">
+		        <td width="99" background="${ctxStatic}/images/login_06.jpg"height="139" ></td>
+		         <td background="${ctxStatic}/images/bg_form.jpg" height="139">
+			        <table width="250" border="0" align="center" cellpadding="0" cellspacing="0">
+				         <form id="loginForm" action="${ctx}/login" method="post">
+						  <tr>
+				            <td height="35" align="right">用户名：</td>
+				            <td>
+				              <label>
+				                <input name="username" type="text" maxlength="20" id="txtUserName" class="textfile" />
+				                <span id="UserNameRequired" style="color:Red;visibility:hidden;">必填*</span>
+				              </label>            
+				            </td>
+				          </tr>
+				         <tr>
+				            <td height="35" align="right">密&nbsp;&nbsp;码：</td>
+				            <td><label>
+				              <input name="password" type="password" maxlength="30" id="txtPassword" class="textfile" />
+				              <span id="PasswordRequired" style="color:Red;visibility:hidden;">必填*</span>
+				            </label></td>
+				          </tr>
+				           <tr>
+				            <td height="35">&nbsp;</td>
+				            <td><label>
+				              <input class="btn btn-min btn-primary" type="submit" value="登 录"/>&nbsp;&nbsp;
+				            </label></td>
+				          </tr>
+		<!-- 		          <tr>
+				            <td height="30">&nbsp;</td>
+				            <td>&nbsp;</td>
+				          </tr> -->
+						</form>
+			        </table>
+		        </td>
+		        <td width="98" height="139" align="right" background="${ctxStatic}/images/login_08.jpg" ></td> 
+		      </tr>
+		    </table> 
+		    </td>
+		  </tr>
+		  <tr>
+		  	<td background="${ctxStatic}/images/bottom_login.jpg" width="596" height="39" align="center">
+		       <span id="lbMessage" style="display:inline-block;color:Red;width:350px;"></span>
+		   </td> 
+		    
+		  </tr>
+		  <tr>
+		    <td>&nbsp;</td>
+		  </tr>
+		  <!-- <tr>
+		    <td align="center" style="color:White"><b>三宝科技@版权所有</b></td>
+		  </tr> -->
+		</table>
 	</div>
 	</div>
 	<script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script>
 	<script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script>
 </body>
 </body>