Просмотр исходного кода

Merge remote-tracking branch 'origin/dev' into test

wanghui лет назад: 8
Родитель
Сommit
891aeb0f38
24 измененных файлов с 1688 добавлено и 2241 удалено
  1. 1 1
      generatorConfig.xml
  2. 440 440
      pom.xml
  3. 1 1
      src/main/java/com/goafanti/achievement/bo/InputAchievement.java
  4. 19 12
      src/main/java/com/goafanti/common/dao/CustomerMapper.java
  5. 0 90
      src/main/java/com/goafanti/common/dao/CustomerOrganizationInfoMapper.java
  6. 2 2
      src/main/java/com/goafanti/common/enums/CustomerStatusFiled.java
  7. 165 58
      src/main/java/com/goafanti/common/mapper/CustomerMapper.xml
  8. 0 381
      src/main/java/com/goafanti/common/mapper/CustomerOrganizationInfoMapper.xml
  9. 1 1
      src/main/java/com/goafanti/common/mapper/CustomerUserInfoMapper.xml
  10. 197 36
      src/main/java/com/goafanti/common/model/Customer.java
  11. 506 16
      src/main/java/com/goafanti/common/model/CustomerExample.java
  12. 0 212
      src/main/java/com/goafanti/common/model/CustomerOrganizationInfo.java
  13. 0 891
      src/main/java/com/goafanti/common/model/CustomerOrganizationInfoExample.java
  14. 151 0
      src/main/java/com/goafanti/common/utils/ExcelUtils.java
  15. 56 1
      src/main/java/com/goafanti/customer/bo/CustomerIn.java
  16. 7 7
      src/main/java/com/goafanti/customer/bo/CustomerOut.java
  17. 53 18
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  18. 0 24
      src/main/java/com/goafanti/customer/service/CustomerOrganizationService.java
  19. 12 2
      src/main/java/com/goafanti/customer/service/CustomerService.java
  20. 0 35
      src/main/java/com/goafanti/customer/service/impl/CustomerOrganizationServiceImp.java
  21. 74 10
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  22. 1 1
      src/main/java/com/goafanti/demand/bo/InputDemand.java
  23. 1 1
      src/main/resources/props/config_local.properties
  24. 1 1
      src/main/resources/props/config_test.properties

+ 1 - 1
generatorConfig.xml

@@ -8,6 +8,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="follow_up_record"/>
+    <table schema="aft" tableName="customer"/>
   </context>
 </generatorConfiguration>

+ 440 - 440
pom.xml

@@ -1,441 +1,441 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.goafanti</groupId>
-	<artifactId>aft</artifactId>
-	<name>aft</name>
-
-	<packaging>war</packaging>
-	<version>1.0.0-BUILD-SNAPSHOT</version>
-
-	<properties>
-		<java-version>1.8</java-version>
-		<org.springframework-version>4.2.5.RELEASE</org.springframework-version>
-		<org.slf4j-version>1.7.21</org.slf4j-version>
-		<shiro-version>1.3.2</shiro-version>
-		<mybatis-version>3.2.8</mybatis-version>
-		<mybatis-spring-version>1.2.2</mybatis-spring-version>
-		<org.aspectj-version>1.6.10</org.aspectj-version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<profiles>  
-        <profile>  
-            <id>aft_local</id>  
-            <activation>  
-                <activeByDefault>true</activeByDefault>  
-            </activation>  
-            <properties>  
-                <profiles.activation>local</profiles.activation>  
-            </properties>  
-        </profile>  
-        <profile>  
-            <id>aft_dev</id>  
-            <properties>  
-                <profiles.activation>dev</profiles.activation>  
-            </properties>  
-        </profile>  
-        <profile>  
-            <id>aft_prod</id>  
-            <properties>  
-                <profiles.activation>prod</profiles.activation>  
-            </properties>  
-        </profile>  
-        <profile>  
-            <id>aft_test</id>  
-            <properties>  
-                <profiles.activation>test</profiles.activation>  
-            </properties>  
-        </profile>  
-	</profiles> 
-
-	<dependencies>
-		<!-- spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${org.springframework-version}</version>
-			<exclusions>
-				<!-- Exclude Commons Logging in favor of SLF4j -->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-websocket</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-messaging</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		
-		<dependency>
-		    <groupId>org.springframework.data</groupId>
-		    <artifactId>spring-data-redis</artifactId>
-		    <version>1.8.3.RELEASE</version>
-		</dependency>
-		
-		<dependency>
-		    <groupId>org.thymeleaf</groupId>
-		    <artifactId>thymeleaf-spring4</artifactId>
-		    <version>3.0.5.RELEASE</version>
-		</dependency>
-		<dependency>
-		    <groupId>nz.net.ultraq.thymeleaf</groupId>
-		    <artifactId>thymeleaf-layout-dialect</artifactId>
-		    <version>2.2.1</version>
-		</dependency>
-		<dependency>
-            <groupId>com.github.theborakompanioni</groupId>
-            <artifactId>thymeleaf-extras-shiro</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-		<!-- spring end -->
-
-		<!-- redis begin -->
-		<dependency>
-			<groupId>redis.clients</groupId>
-			<artifactId>jedis</artifactId>
-			<version>2.9.0</version>
-		</dependency>
-		<!-- redis end -->
-
-		<!-- mybatis start -->
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>${mybatis-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis-spring</artifactId>
-			<version>${mybatis-spring-version}</version>
-		</dependency>
-		<!-- mybatis end -->
-
-		<!-- JDBC connections pooling -->
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid</artifactId>
-			<version>1.0.25</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.alibaba</groupId>
-					<artifactId>jconsole</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.alibaba</groupId>
-					<artifactId>tools</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!-- JDBC connections pooling end -->
-
-		<!-- jackson start -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.8.2</version>
-		</dependency>
-		<!-- jackson end -->
-
-		<!-- mysql -->
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.40</version>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${org.slf4j-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${org.slf4j-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${org.slf4j-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- common lang -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
-		</dependency>
-		<!-- common codec -->
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
-		</dependency>
-
-		<!-- common fileupload -->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.1</version>
-		</dependency>
-
-		<!-- quartz -->
-		<dependency>
-			<groupId>org.quartz-scheduler</groupId>
-			<artifactId>quartz</artifactId>
-			<version>1.8.5</version>
-		</dependency>
-		<!-- Servlet -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- shiro -->
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-web</artifactId>
-			<version>${shiro-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-quartz</artifactId>
-			<version>${shiro-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-spring</artifactId>
-			<version>${shiro-version}</version>
-		</dependency>
-		<!-- Test -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${org.springframework-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.31</version>
-		</dependency>
-
-		<!-- AspectJ -->
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>${org.aspectj-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>${org.aspectj-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib</artifactId>
-			<version>2.2.2</version>
-		</dependency>
-		<!-- JSR-303 bean validator -->
-		<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>5.2.4.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-			<version>1.1.0.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.logging</groupId>
-			<artifactId>jboss-logging</artifactId>
-			<version>3.2.1.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml</groupId>
-			<artifactId>classmate</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-	    <dependency>
-		    <groupId>com.googlecode.json-simple</groupId>
-		    <artifactId>json-simple</artifactId>
-		    <version>1.1.1</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.poi</groupId>
-		    <artifactId>poi</artifactId>
-		    <version>3.15</version>
-		</dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>2.4.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-sms</artifactId>
-            <version>3.0.0-rc1</version>
-        </dependency>
-        <dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpasyncclient</artifactId>
-			<version>4.1.3</version>
-		</dependency>
-        
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/resources</directory>
-				<includes>
-					<include>**/*.properties</include>
-					<include>**/*.xml</include>
-					<include>**/*.ini</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.xml</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<encoding>utf8</encoding>
-					<compilerArgument>-Xlint:all</compilerArgument>
-					<showWarnings>true</showWarnings>
-					<showDeprecation>true</showDeprecation>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>    
-			    <groupId>org.apache.maven.plugins</groupId>    
-			    <artifactId>maven-surefire-plugin</artifactId>    
-			    <version>2.5</version>    
-			    <configuration>    
-			        <skip>true</skip>    
-			    </configuration>    
-			</plugin> 
-			<plugin>  
-                <groupId>org.apache.maven.plugins</groupId>  
-                <artifactId>maven-war-plugin</artifactId>  
-                <version>3.1.0</version>  
-                <configuration>  
-                    <warName>${profiles.activation}</warName>  
-                    <!-- 激活spring profile -->  
-                    <webResources>  
-                        <resource>  
-                            <filtering>true</filtering>  
-                            <directory>src/main/webapp</directory>  
-                            <includes>  
-                                <include>**/**</include>  
-                            </includes>  
-                        </resource>  
-                        <resource>  
-                            <filtering>true</filtering>  
-                            <directory>src/main/resources</directory>
-                            <targetPath>WEB-INF/classes</targetPath>
-                            <includes>  
-                                <include>**/**</include>  
-                            </includes>  
-                        </resource>  
-                    </webResources>  
-                    <warSourceDirectory>src/main/webapp</warSourceDirectory>  
-                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>  
-                </configuration>  
-			</plugin>
-		</plugins>
-	</build>
-	
-	<repositories>
-		<repository>
-			<id>aliyun-repos</id>
-			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>aliyun-plugin</id>
-			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.goafanti</groupId>
+	<artifactId>aft</artifactId>
+	<name>aft</name>
+
+	<packaging>war</packaging>
+	<version>1.0.0-BUILD-SNAPSHOT</version>
+
+	<properties>
+		<java-version>1.8</java-version>
+		<org.springframework-version>4.2.5.RELEASE</org.springframework-version>
+		<org.slf4j-version>1.7.21</org.slf4j-version>
+		<shiro-version>1.3.2</shiro-version>
+		<mybatis-version>3.2.8</mybatis-version>
+		<mybatis-spring-version>1.2.2</mybatis-spring-version>
+		<org.aspectj-version>1.6.10</org.aspectj-version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<profiles>  
+        <profile>  
+            <id>aft_local</id>  
+            <activation>  
+                <activeByDefault>true</activeByDefault>  
+            </activation>  
+            <properties>  
+                <profiles.activation>local</profiles.activation>  
+            </properties>  
+        </profile>  
+        <profile>  
+            <id>aft_dev</id>  
+            <properties>  
+                <profiles.activation>dev</profiles.activation>  
+            </properties>  
+        </profile>  
+        <profile>  
+            <id>aft_prod</id>  
+            <properties>  
+                <profiles.activation>prod</profiles.activation>  
+            </properties>  
+        </profile>  
+        <profile>  
+            <id>aft_test</id>  
+            <properties>  
+                <profiles.activation>test</profiles.activation>  
+            </properties>  
+        </profile>  
+	</profiles> 
+
+	<dependencies>
+		<!-- spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${org.springframework-version}</version>
+			<exclusions>
+				<!-- Exclude Commons Logging in favor of SLF4j -->
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-websocket</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-messaging</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>org.springframework.data</groupId>
+		    <artifactId>spring-data-redis</artifactId>
+		    <version>1.8.3.RELEASE</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>org.thymeleaf</groupId>
+		    <artifactId>thymeleaf-spring4</artifactId>
+		    <version>3.0.5.RELEASE</version>
+		</dependency>
+		<dependency>
+		    <groupId>nz.net.ultraq.thymeleaf</groupId>
+		    <artifactId>thymeleaf-layout-dialect</artifactId>
+		    <version>2.2.1</version>
+		</dependency>
+		<dependency>
+            <groupId>com.github.theborakompanioni</groupId>
+            <artifactId>thymeleaf-extras-shiro</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+		<!-- spring end -->
+
+		<!-- redis begin -->
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>2.9.0</version>
+		</dependency>
+		<!-- redis end -->
+
+		<!-- mybatis start -->
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis</artifactId>
+			<version>${mybatis-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis-spring</artifactId>
+			<version>${mybatis-spring-version}</version>
+		</dependency>
+		<!-- mybatis end -->
+
+		<!-- JDBC connections pooling -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid</artifactId>
+			<version>1.0.25</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba</groupId>
+					<artifactId>jconsole</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.alibaba</groupId>
+					<artifactId>tools</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- JDBC connections pooling end -->
+
+		<!-- jackson start -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.2</version>
+		</dependency>
+		<!-- jackson end -->
+
+		<!-- mysql -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.40</version>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${org.slf4j-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${org.slf4j-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>${org.slf4j-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.mail</groupId>
+					<artifactId>mail</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.jms</groupId>
+					<artifactId>jms</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jdmk</groupId>
+					<artifactId>jmxtools</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jmx</groupId>
+					<artifactId>jmxri</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- common lang -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
+		</dependency>
+		<!-- common codec -->
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.10</version>
+		</dependency>
+
+		<!-- common fileupload -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+
+		<!-- quartz -->
+		<dependency>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+			<version>1.8.5</version>
+		</dependency>
+		<!-- Servlet -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- shiro -->
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-web</artifactId>
+			<version>${shiro-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-quartz</artifactId>
+			<version>${shiro-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-spring</artifactId>
+			<version>${shiro-version}</version>
+		</dependency>
+		<!-- Test -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${org.springframework-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.31</version>
+		</dependency>
+
+		<!-- AspectJ -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${org.aspectj-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>${org.aspectj-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>2.2.2</version>
+		</dependency>
+		<!-- JSR-303 bean validator -->
+		<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>5.2.4.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.1.0.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.logging</groupId>
+			<artifactId>jboss-logging</artifactId>
+			<version>3.2.1.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml</groupId>
+			<artifactId>classmate</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+	    <dependency>
+		    <groupId>com.googlecode.json-simple</groupId>
+		    <artifactId>json-simple</artifactId>
+		    <version>1.1.1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.poi</groupId>
+		    <artifactId>poi-ooxml</artifactId>
+		    <version>3.17</version>
+		</dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>2.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-sms</artifactId>
+            <version>3.0.0-rc1</version>
+        </dependency>
+        <dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpasyncclient</artifactId>
+			<version>4.1.3</version>
+		</dependency>
+        
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/resources</directory>
+				<includes>
+					<include>**/*.properties</include>
+					<include>**/*.xml</include>
+					<include>**/*.ini</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<encoding>utf8</encoding>
+					<compilerArgument>-Xlint:all</compilerArgument>
+					<showWarnings>true</showWarnings>
+					<showDeprecation>true</showDeprecation>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>    
+			    <groupId>org.apache.maven.plugins</groupId>    
+			    <artifactId>maven-surefire-plugin</artifactId>    
+			    <version>2.5</version>    
+			    <configuration>    
+			        <skip>true</skip>    
+			    </configuration>    
+			</plugin> 
+			<plugin>  
+                <groupId>org.apache.maven.plugins</groupId>  
+                <artifactId>maven-war-plugin</artifactId>  
+                <version>3.1.0</version>  
+                <configuration>  
+                    <warName>${profiles.activation}</warName>  
+                    <!-- 激活spring profile -->  
+                    <webResources>  
+                        <resource>  
+                            <filtering>true</filtering>  
+                            <directory>src/main/webapp</directory>  
+                            <includes>  
+                                <include>**/**</include>  
+                            </includes>  
+                        </resource>  
+                        <resource>  
+                            <filtering>true</filtering>  
+                            <directory>src/main/resources</directory>
+                            <targetPath>WEB-INF/classes</targetPath>
+                            <includes>  
+                                <include>**/**</include>  
+                            </includes>  
+                        </resource>  
+                    </webResources>  
+                    <warSourceDirectory>src/main/webapp</warSourceDirectory>  
+                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>  
+                </configuration>  
+			</plugin>
+		</plugins>
+	</build>
+	
+	<repositories>
+		<repository>
+			<id>aliyun-repos</id>
+			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>aliyun-plugin</id>
+			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 </project>

+ 1 - 1
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -29,7 +29,7 @@ public class InputAchievement {
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		summary;
 
-	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		introduction;
 
 	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

+ 19 - 12
src/main/java/com/goafanti/common/dao/CustomerMapper.java

@@ -10,70 +10,70 @@ import org.apache.ibatis.annotations.Param;
 public interface CustomerMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	long countByExample(CustomerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	int deleteByExample(CustomerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	int insert(Customer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	int insertSelective(Customer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	List<Customer> selectByExample(CustomerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	Customer selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") Customer record, @Param("example") CustomerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	int updateByExample(@Param("record") Customer record, @Param("example") CustomerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	int updateByPrimaryKeySelective(Customer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	int updateByPrimaryKey(Customer record);
-	
+
 	/**
 	 * 查询
 	 * @param id
@@ -94,5 +94,12 @@ public interface CustomerMapper {
      * @return
      */
     CustomerOut findCustomerHistory(@Param("id")String customerId);
+
+    /**
+     * 查询机构是否存在
+     * @param companyName
+     * @return
+     */
+	int findCustomerByName(String companyName);
     
 }

+ 0 - 90
src/main/java/com/goafanti/common/dao/CustomerOrganizationInfoMapper.java

@@ -1,90 +0,0 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.CustomerOrganizationInfo;
-import com.goafanti.common.model.CustomerOrganizationInfoExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface CustomerOrganizationInfoMapper {
-
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	long countByExample(CustomerOrganizationInfoExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	int deleteByExample(CustomerOrganizationInfoExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	int deleteByPrimaryKey(String id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	int insert(CustomerOrganizationInfo record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	int insertSelective(CustomerOrganizationInfo record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	List<CustomerOrganizationInfo> selectByExample(CustomerOrganizationInfoExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	CustomerOrganizationInfo selectByPrimaryKey(String id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	int updateByExampleSelective(@Param("record") CustomerOrganizationInfo record,
-			@Param("example") CustomerOrganizationInfoExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	int updateByExample(@Param("record") CustomerOrganizationInfo record,
-			@Param("example") CustomerOrganizationInfoExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	int updateByPrimaryKeySelective(CustomerOrganizationInfo record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	int updateByPrimaryKey(CustomerOrganizationInfo record);
-
-	/**
-	 * 修改
-	 */
-	int updateCustomerOrganizationByCid(CustomerOrganizationInfo coi);
-	
-	/**
-	 *  查询公司是否存在
-	 * @param companyName
-	 * @return
-	 */
-	int findCustomerOrganizationByName(@Param("companyName")String companyName);
-}

+ 2 - 2
src/main/java/com/goafanti/common/enums/CustomerStatusFiled.java

@@ -14,8 +14,8 @@ public enum CustomerStatusFiled {
 	STATUS_INTERVIEW(3,"面谈客户"),
 	/** 签单客户 **/
 	STATUS_SIGN(4,"签单客户"),
-	/** 拒绝客户 **/
-	STATUS_REFUSE(5,"拒绝客户"),
+	/** 拒绝客户 **/
+	STATUS_REFUSE(5,"拒绝客户"),
 	/** 未知  **/
 	OTHER(-1,"未知");
 	

+ 165 - 58
src/main/java/com/goafanti/common/mapper/CustomerMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
@@ -19,12 +19,19 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="follow_id" jdbcType="VARCHAR" property="followId" />
     <result column="effective" jdbcType="INTEGER" property="effective" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="location_province" jdbcType="CHAR" property="locationProvince" />
+    <result column="location_city" jdbcType="CHAR" property="locationCity" />
+    <result column="location_area" jdbcType="CHAR" property="locationArea" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="company_industry" jdbcType="VARCHAR" property="companyIndustry" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -58,7 +65,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -92,16 +99,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     id, aid, paid, share_type, customer_type, customer_status, company_intention, follow_situation, 
-    tag, create_time, follow_id, effective
+    tag, create_time, follow_id, effective, company_name, location_province, location_city, 
+    location_area, address, company_industry, remarks
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.CustomerExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     select
     <if test="distinct">
@@ -117,34 +125,30 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-      <!--
+    <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
     from customer
     where id = #{id,jdbcType=VARCHAR}
   </select>
-  <!-- <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
-   
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
+    -->
     delete from customer
     where id = #{id,jdbcType=VARCHAR}
-  </delete> -->
-  <update id="deleteByPrimaryKey" parameterType="java.lang.String">
-    update customer set effective =1 where id = #{id,jdbcType=VARCHAR}
-  </update>
-  
+  </delete>
   <delete id="deleteByExample" parameterType="com.goafanti.common.model.CustomerExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     delete from customer
     <if test="_parameter != null">
@@ -155,24 +159,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     insert into customer (id, aid, paid, 
       share_type, customer_type, customer_status, 
       company_intention, follow_situation, tag, 
-      create_time, follow_id, effective
-      )
+      create_time, follow_id, effective, 
+      company_name, location_province, location_city, 
+      location_area, address, company_industry, 
+      remarks)
     values (#{id,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{paid,jdbcType=VARCHAR}, 
       #{shareType,jdbcType=INTEGER}, #{customerType,jdbcType=INTEGER}, #{customerStatus,jdbcType=INTEGER}, 
       #{companyIntention,jdbcType=CHAR}, #{followSituation,jdbcType=INTEGER}, #{tag,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{followId,jdbcType=VARCHAR}, 0
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{followId,jdbcType=VARCHAR}, #{effective,jdbcType=INTEGER}, 
+      #{companyName,jdbcType=VARCHAR}, #{locationProvince,jdbcType=CHAR}, #{locationCity,jdbcType=CHAR}, 
+      #{locationArea,jdbcType=CHAR}, #{address,jdbcType=VARCHAR}, #{companyIndustry,jdbcType=VARCHAR}, 
+      #{remarks,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Customer">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     insert into customer
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -212,6 +220,27 @@
       <if test="effective != null">
         effective,
       </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="locationProvince != null">
+        location_province,
+      </if>
+      <if test="locationCity != null">
+        location_city,
+      </if>
+      <if test="locationArea != null">
+        location_area,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="companyIndustry != null">
+        company_industry,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -250,13 +279,34 @@
       <if test="effective != null">
         #{effective,jdbcType=INTEGER},
       </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="locationProvince != null">
+        #{locationProvince,jdbcType=CHAR},
+      </if>
+      <if test="locationCity != null">
+        #{locationCity,jdbcType=CHAR},
+      </if>
+      <if test="locationArea != null">
+        #{locationArea,jdbcType=CHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="companyIndustry != null">
+        #{companyIndustry,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.CustomerExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     select count(*) from customer
     <if test="_parameter != null">
@@ -267,7 +317,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     update customer
     <set>
@@ -307,6 +357,27 @@
       <if test="record.effective != null">
         effective = #{record.effective,jdbcType=INTEGER},
       </if>
+      <if test="record.companyName != null">
+        company_name = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.locationProvince != null">
+        location_province = #{record.locationProvince,jdbcType=CHAR},
+      </if>
+      <if test="record.locationCity != null">
+        location_city = #{record.locationCity,jdbcType=CHAR},
+      </if>
+      <if test="record.locationArea != null">
+        location_area = #{record.locationArea,jdbcType=CHAR},
+      </if>
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyIndustry != null">
+        company_industry = #{record.companyIndustry,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -316,7 +387,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     update customer
     set id = #{record.id,jdbcType=VARCHAR},
@@ -330,7 +401,14 @@
       tag = #{record.tag,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       follow_id = #{record.followId,jdbcType=VARCHAR},
-      effective = #{record.effective,jdbcType=INTEGER}
+      effective = #{record.effective,jdbcType=INTEGER},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      location_province = #{record.locationProvince,jdbcType=CHAR},
+      location_city = #{record.locationCity,jdbcType=CHAR},
+      location_area = #{record.locationArea,jdbcType=CHAR},
+      address = #{record.address,jdbcType=VARCHAR},
+      company_industry = #{record.companyIndustry,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -339,7 +417,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     update customer
     <set>
@@ -376,6 +454,27 @@
       <if test="effective != null">
         effective = #{effective,jdbcType=INTEGER},
       </if>
+      <if test="companyName != null">
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="locationProvince != null">
+        location_province = #{locationProvince,jdbcType=CHAR},
+      </if>
+      <if test="locationCity != null">
+        location_city = #{locationCity,jdbcType=CHAR},
+      </if>
+      <if test="locationArea != null">
+        location_area = #{locationArea,jdbcType=CHAR},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="companyIndustry != null">
+        company_industry = #{companyIndustry,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -383,7 +482,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 15:28:17 CST 2017.
+      This element was generated on Mon Nov 06 08:45:21 CST 2017.
     -->
     update customer
     set aid = #{aid,jdbcType=VARCHAR},
@@ -396,22 +495,28 @@
       tag = #{tag,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       follow_id = #{followId,jdbcType=VARCHAR},
-      effective = #{effective,jdbcType=INTEGER}
+      effective = #{effective,jdbcType=INTEGER},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      location_province = #{locationProvince,jdbcType=CHAR},
+      location_city = #{locationCity,jdbcType=CHAR},
+      location_area = #{locationArea,jdbcType=CHAR},
+      address = #{address,jdbcType=VARCHAR},
+      company_industry = #{companyIndustry,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 	 
-  <select id="selectCustomer"  resultType="com.goafanti.customer.bo.CustomerOut">
+  <select id="selectCustomer" resultType="com.goafanti.customer.bo.CustomerOut">
     select a.id,a.aid,a.customer_type as customerType,a.share_type as shareType,a.company_intention as CompanyIntention,
     a.tag,a.follow_situation as followSituation,a.customer_status as customerStatus,
+    a.company_name as companyName,a.location_province as locationProvince,
     b.follow_date as followDate,
     c.name as contactName ,c.mobile,c.tel_num as telNum,
-    d.company_name as companyName,d.location_province as locationProvince,
     e.name as adminName,
     b.follow_date as followDate
     from customer a
     left join follow_up_record b on a.follow_id = b.id 
     left join customer_user_info c on b.cuid = c.id 
-    left join customer_organization_info d on a.id = d.cid
     left join admin e on a.aid = e.id 
     where a.effective = 0
      <if test="aid != null and aid != ''">
@@ -423,7 +528,7 @@
     <if test="paid != null and paid != ''">
     	or a.paid like concat('%',#{paid,jdbcType=VARCHAR},'%'))
     </if>
-    <if  test="paid == null or paid == ''">
+    <if test="paid == null or paid == ''">
     	)
     </if>
     <if test="shareType != null">
@@ -441,18 +546,18 @@
     <if test="followSituation != null">
     	and a.follow_situation = #{followSituation,jdbcType=INTEGER}
     </if>
+    <if test="locationProvince != null">
+    	and a.location_province = #{locationProvince,jdbcType=VARCHAR}
+    </if>
+    <if test="companyName != null and companyName != ''">
+    	and a.company_name like concat('%',#{companyName,jdbcType=VARCHAR},'%')
+    </if>
     <if test="contactName != null">
     	and c.name = #{contactName,jdbcType=VARCHAR}
     </if>
     <if test="contactTel != null">
     	 and c.tel_num = #{contactTel,jdbcType=VARCHAR}
     </if>
-    <if test="companyName != null and companyName != ''">
-    	and d.company_name like concat('%',#{companyName,jdbcType=VARCHAR},'%')
-    </if>
-    <if test="locationProvince != null">
-    	and d.location_province = #{locationProvince,jdbcType=VARCHAR}
-    </if>
    	<if test="adminName != null and adminName != ''">
    	 	and e.name like concat('%',#{adminName,jdbcType=VARCHAR},'%')
    	</if>
@@ -462,12 +567,11 @@
 	</if>
   </select>
   
-  <select id="selectCustomerCount"  resultType="java.lang.Integer">
+  <select id="selectCustomerCount" resultType="java.lang.Integer">
     select count(0)
     from customer a
     left join follow_up_record b on a.follow_id = b.id 
     left join customer_user_info c on b.cuid = c.id 
-    left join customer_organization_info d on a.id = d.cid
     left join admin e on a.aid = e.id 
     where a.effective = 0
     <if test="aid != null and aid != ''">
@@ -479,7 +583,7 @@
     <if test="paid != null and paid != ''">
     	or a.paid like concat('%',#{paid,jdbcType=VARCHAR},'%'))
     </if>
-    <if  test="paid == null or paid == ''">
+    <if test="paid == null or paid == ''">
     	)
     </if>
     <if test="shareType != null">
@@ -497,18 +601,18 @@
     <if test="followSituation != null">
     	and a.follow_situation = #{followSituation,jdbcType=INTEGER}
     </if>
+     <if test="companyName != null and companyName != ''">
+    	and a.company_name like concat('%',#{companyName,jdbcType=VARCHAR},'%')
+    </if>
+    <if test="locationProvince != null">
+    	and a.location_province = #{locationProvince,jdbcType=VARCHAR}
+    </if>
     <if test="contactName != null">
     	and c.name = #{contactName,jdbcType=VARCHAR}
     </if>
     <if test="contactTel != null">
     	 and c.tel_num = #{contactTel,jdbcType=VARCHAR}
-    </if>
-    <if test="companyName != null and companyName != ''">
-    	and d.company_name like concat('%',#{companyName,jdbcType=VARCHAR},'%')
-    </if>
-    <if test="locationProvince != null">
-    	and d.location_province = #{locationProvince,jdbcType=VARCHAR}
-    </if>
+    </if> 
    	<if test="adminName != null and adminName != ''">
    	 	and e.name like concat('%',#{adminName,jdbcType=VARCHAR},'%')
    	</if>
@@ -524,13 +628,13 @@
     a.create_time as createTime,
     a.follow_situation as followSituation,
     a.customer_status as customerStatus,
-    c.company_name as companyName,
-    c.location_province as locationProvince,
-    c.company_industry as companyIndustry,
-    c.adress,c.remarks,
+    a.company_name as companyName,
+    a.location_province as locationProvince,
+    a.company_industry as companyIndustry,
+    a.address,
+    a.remarks,
     d.name as adminName
     from customer a 
-    left join customer_organization_info c on a.id=c.cid
     left join admin d on a.aid=d.id
     where a.id = #{id,jdbcType=VARCHAR}
   </select> 
@@ -546,14 +650,13 @@
   	select 
 		a.id as cid,a.aid, a.create_time as createTime,
 		a.follow_situation as followSituation,a.customer_status as customerStatus,
-		b.company_name as customerName,
+		a.company_name as customerName,
 		c.followCount,
 		d.follow_date as followDate,
 		e.name as contactName,
 		f.operatorTime,
 		g.name as adminName
 	from  customer  a 
-	left join customer_organization_info b on a.id = b.cid 
 	left join (select ifnull(0,count(0)) as followCount,r.aid,r.cid from follow_up_record r group by r.aid,r.cid) c 
 		on a.id = c.cid and a.aid = c.aid
 	left join follow_up_record d on a.follow_id = d.id
@@ -565,4 +668,8 @@
 	left join admin g on a.aid = g.id 
 	where a.id = #{id,jdbcType=VARCHAR}
   </select>
+  
+  <select id="findCustomerByName" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select count(0) from customer  where company_name = #{companyName,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 0 - 381
src/main/java/com/goafanti/common/mapper/CustomerOrganizationInfoMapper.xml

@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.CustomerOrganizationInfoMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.CustomerOrganizationInfo">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="cid" jdbcType="VARCHAR" property="cid" />
-    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
-    <result column="location_province" jdbcType="CHAR" property="locationProvince" />
-    <result column="location_city" jdbcType="VARCHAR" property="locationCity" />
-    <result column="location_area" jdbcType="VARCHAR" property="locationArea" />
-    <result column="adress" jdbcType="VARCHAR" property="adress" />
-    <result column="company_industry" jdbcType="VARCHAR" property="companyIndustry" />
-    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    id, cid, company_name, location_province, location_city, location_area, adress, company_industry, 
-    remarks
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.CustomerOrganizationInfoExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from customer_organization_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from customer_organization_info
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    delete from customer_organization_info
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.CustomerOrganizationInfoExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    delete from customer_organization_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    insert into customer_organization_info (id, cid, company_name, 
-      location_province, location_city, location_area, 
-      adress, company_industry, remarks
-      )
-    values (#{id,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{locationProvince,jdbcType=CHAR}, #{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR}, 
-      #{adress,jdbcType=VARCHAR}, #{companyIndustry,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    insert into customer_organization_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="cid != null">
-        cid,
-      </if>
-      <if test="companyName != null">
-        company_name,
-      </if>
-      <if test="locationProvince != null">
-        location_province,
-      </if>
-      <if test="locationCity != null">
-        location_city,
-      </if>
-      <if test="locationArea != null">
-        location_area,
-      </if>
-      <if test="adress != null">
-        adress,
-      </if>
-      <if test="companyIndustry != null">
-        company_industry,
-      </if>
-      <if test="remarks != null">
-        remarks,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="cid != null">
-        #{cid,jdbcType=VARCHAR},
-      </if>
-      <if test="companyName != null">
-        #{companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="locationProvince != null">
-        #{locationProvince,jdbcType=CHAR},
-      </if>
-      <if test="locationCity != null">
-        #{locationCity,jdbcType=VARCHAR},
-      </if>
-      <if test="locationArea != null">
-        #{locationArea,jdbcType=VARCHAR},
-      </if>
-      <if test="adress != null">
-        #{adress,jdbcType=VARCHAR},
-      </if>
-      <if test="companyIndustry != null">
-        #{companyIndustry,jdbcType=VARCHAR},
-      </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.CustomerOrganizationInfoExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    select count(*) from customer_organization_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    update customer_organization_info
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.cid != null">
-        cid = #{record.cid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyName != null">
-        company_name = #{record.companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.locationProvince != null">
-        location_province = #{record.locationProvince,jdbcType=CHAR},
-      </if>
-      <if test="record.locationCity != null">
-        location_city = #{record.locationCity,jdbcType=VARCHAR},
-      </if>
-      <if test="record.locationArea != null">
-        location_area = #{record.locationArea,jdbcType=VARCHAR},
-      </if>
-      <if test="record.adress != null">
-        adress = #{record.adress,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyIndustry != null">
-        company_industry = #{record.companyIndustry,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    update customer_organization_info
-    set id = #{record.id,jdbcType=VARCHAR},
-      cid = #{record.cid,jdbcType=VARCHAR},
-      company_name = #{record.companyName,jdbcType=VARCHAR},
-      location_province = #{record.locationProvince,jdbcType=CHAR},
-      location_city = #{record.locationCity,jdbcType=VARCHAR},
-      location_area = #{record.locationArea,jdbcType=VARCHAR},
-      adress = #{record.adress,jdbcType=VARCHAR},
-      company_industry = #{record.companyIndustry,jdbcType=VARCHAR},
-      remarks = #{record.remarks,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    update customer_organization_info
-    <set>
-      <if test="cid != null">
-        cid = #{cid,jdbcType=VARCHAR},
-      </if>
-      <if test="companyName != null">
-        company_name = #{companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="locationProvince != null">
-        location_province = #{locationProvince,jdbcType=CHAR},
-      </if>
-      <if test="locationCity != null">
-        location_city = #{locationCity,jdbcType=VARCHAR},
-      </if>
-      <if test="locationArea != null">
-        location_area = #{locationArea,jdbcType=VARCHAR},
-      </if>
-      <if test="adress != null">
-        adress = #{adress,jdbcType=VARCHAR},
-      </if>
-      <if test="companyIndustry != null">
-        company_industry = #{companyIndustry,jdbcType=VARCHAR},
-      </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 25 09:39:54 CST 2017.
-    -->
-    update customer_organization_info
-    set cid = #{cid,jdbcType=VARCHAR},
-      company_name = #{companyName,jdbcType=VARCHAR},
-      location_province = #{locationProvince,jdbcType=CHAR},
-      location_city = #{locationCity,jdbcType=VARCHAR},
-      location_area = #{locationArea,jdbcType=VARCHAR},
-      adress = #{adress,jdbcType=VARCHAR},
-      company_industry = #{companyIndustry,jdbcType=VARCHAR},
-      remarks = #{remarks,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateCustomerOrganizationByCid" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
-  	 update customer_organization_info
-  	 <set>
-      <if test="companyName != null">
-        company_name = #{companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="locationProvince != null">
-        location_province = #{locationProvince,jdbcType=CHAR},
-      </if>
-      <if test="locationCity != null">
-        location_city = #{locationCity,jdbcType=VARCHAR},
-      </if>
-      <if test="locationArea != null">
-        location_area = #{locationArea,jdbcType=VARCHAR},
-      </if>
-      <if test="adress != null">
-        adress = #{adress,jdbcType=VARCHAR},
-      </if>
-      <if test="companyIndustry != null">
-        company_industry = #{companyIndustry,jdbcType=VARCHAR},
-      </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
-      </if>
-     </set>  
-    where cid = #{cid,jdbcType=VARCHAR}
-  </update>
-  <select id="findCustomerOrganizationByName" parameterType="java.lang.String" resultType="java.lang.Integer">
-  	select count(0) from customer_organization_info  where company_name = #{companyName,jdbcType=VARCHAR}
-  </select>
-</mapper>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/CustomerUserInfoMapper.xml

@@ -417,7 +417,7 @@
 	  	a.id,a.cid,a.name,a.mobile,a.email,a.qq,a.wechat,a.tel_num as telNum,
 	  	a.depatrment,a.customer_position as customerPosition,a.sex,
 	  	b.company_name as companyName,primary_flg as primaryFlg
-    from customer_user_info a join customer_organization_info b on a.cid = b.cid
+    from customer_user_info a join customer b on a.cid = b.id
   	where a.id = #{id,jdbcType=VARCHAR}
   </select>
 </mapper>

+ 197 - 36
src/main/java/com/goafanti/common/model/Customer.java

@@ -6,69 +6,104 @@ public class Customer {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.id
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.aid
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.paid
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private String paid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.share_type
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private Integer shareType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.customer_type
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private Integer customerType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.customer_status
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private Integer customerStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.company_intention
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private String companyIntention;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.follow_situation
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private Integer followSituation;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.tag
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private String tag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.create_time
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.follow_id
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private String followId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.effective
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	private Integer effective;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.company_name
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	private String companyName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.location_province
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	private String locationProvince;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.location_city
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	private String locationCity;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.location_area
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	private String locationArea;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.address
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	private String address;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.company_industry
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	private String companyIndustry;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.remarks
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	private String remarks;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.id
 	 * @return  the value of customer.id
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -77,7 +112,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.id
 	 * @param id  the value for customer.id
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -86,7 +121,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.aid
 	 * @return  the value of customer.aid
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public String getAid() {
 		return aid;
@@ -95,7 +130,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.aid
 	 * @param aid  the value for customer.aid
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -104,7 +139,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.paid
 	 * @return  the value of customer.paid
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public String getPaid() {
 		return paid;
@@ -113,7 +148,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.paid
 	 * @param paid  the value for customer.paid
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setPaid(String paid) {
 		this.paid = paid;
@@ -122,7 +157,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.share_type
 	 * @return  the value of customer.share_type
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public Integer getShareType() {
 		return shareType;
@@ -131,7 +166,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.share_type
 	 * @param shareType  the value for customer.share_type
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setShareType(Integer shareType) {
 		this.shareType = shareType;
@@ -140,7 +175,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.customer_type
 	 * @return  the value of customer.customer_type
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public Integer getCustomerType() {
 		return customerType;
@@ -149,7 +184,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.customer_type
 	 * @param customerType  the value for customer.customer_type
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setCustomerType(Integer customerType) {
 		this.customerType = customerType;
@@ -158,7 +193,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.customer_status
 	 * @return  the value of customer.customer_status
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public Integer getCustomerStatus() {
 		return customerStatus;
@@ -167,7 +202,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.customer_status
 	 * @param customerStatus  the value for customer.customer_status
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setCustomerStatus(Integer customerStatus) {
 		this.customerStatus = customerStatus;
@@ -176,7 +211,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.company_intention
 	 * @return  the value of customer.company_intention
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public String getCompanyIntention() {
 		return companyIntention;
@@ -185,7 +220,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.company_intention
 	 * @param companyIntention  the value for customer.company_intention
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setCompanyIntention(String companyIntention) {
 		this.companyIntention = companyIntention;
@@ -194,7 +229,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.follow_situation
 	 * @return  the value of customer.follow_situation
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public Integer getFollowSituation() {
 		return followSituation;
@@ -203,7 +238,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.follow_situation
 	 * @param followSituation  the value for customer.follow_situation
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setFollowSituation(Integer followSituation) {
 		this.followSituation = followSituation;
@@ -212,7 +247,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.tag
 	 * @return  the value of customer.tag
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public String getTag() {
 		return tag;
@@ -221,7 +256,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.tag
 	 * @param tag  the value for customer.tag
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setTag(String tag) {
 		this.tag = tag;
@@ -230,7 +265,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.create_time
 	 * @return  the value of customer.create_time
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -239,7 +274,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.create_time
 	 * @param createTime  the value for customer.create_time
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -248,7 +283,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.follow_id
 	 * @return  the value of customer.follow_id
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public String getFollowId() {
 		return followId;
@@ -257,7 +292,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.follow_id
 	 * @param followId  the value for customer.follow_id
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setFollowId(String followId) {
 		this.followId = followId;
@@ -266,7 +301,7 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.effective
 	 * @return  the value of customer.effective
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public Integer getEffective() {
 		return effective;
@@ -275,9 +310,135 @@ public class Customer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.effective
 	 * @param effective  the value for customer.effective
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setEffective(Integer effective) {
 		this.effective = effective;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.company_name
+	 * @return  the value of customer.company_name
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.company_name
+	 * @param companyName  the value for customer.company_name
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.location_province
+	 * @return  the value of customer.location_province
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public String getLocationProvince() {
+		return locationProvince;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.location_province
+	 * @param locationProvince  the value for customer.location_province
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public void setLocationProvince(String locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.location_city
+	 * @return  the value of customer.location_city
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public String getLocationCity() {
+		return locationCity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.location_city
+	 * @param locationCity  the value for customer.location_city
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public void setLocationCity(String locationCity) {
+		this.locationCity = locationCity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.location_area
+	 * @return  the value of customer.location_area
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public String getLocationArea() {
+		return locationArea;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.location_area
+	 * @param locationArea  the value for customer.location_area
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public void setLocationArea(String locationArea) {
+		this.locationArea = locationArea;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.address
+	 * @return  the value of customer.address
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public String getAddress() {
+		return address;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.address
+	 * @param address  the value for customer.address
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.company_industry
+	 * @return  the value of customer.company_industry
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public String getCompanyIndustry() {
+		return companyIndustry;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.company_industry
+	 * @param companyIndustry  the value for customer.company_industry
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public void setCompanyIndustry(String companyIndustry) {
+		this.companyIndustry = companyIndustry;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.remarks
+	 * @return  the value of customer.remarks
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.remarks
+	 * @param remarks  the value for customer.remarks
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 }

+ 506 - 16
src/main/java/com/goafanti/common/model/CustomerExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class CustomerExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public CustomerExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class CustomerExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -942,11 +942,501 @@ public class CustomerExample {
 			addCriterion("effective not between", value1, value2, "effective");
 			return (Criteria) this;
 		}
+
+		public Criteria andCompanyNameIsNull() {
+			addCriterion("company_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameIsNotNull() {
+			addCriterion("company_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameEqualTo(String value) {
+			addCriterion("company_name =", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameNotEqualTo(String value) {
+			addCriterion("company_name <>", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameGreaterThan(String value) {
+			addCriterion("company_name >", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
+			addCriterion("company_name >=", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameLessThan(String value) {
+			addCriterion("company_name <", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameLessThanOrEqualTo(String value) {
+			addCriterion("company_name <=", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameLike(String value) {
+			addCriterion("company_name like", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameNotLike(String value) {
+			addCriterion("company_name not like", value, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameIn(List<String> values) {
+			addCriterion("company_name in", values, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameNotIn(List<String> values) {
+			addCriterion("company_name not in", values, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameBetween(String value1, String value2) {
+			addCriterion("company_name between", value1, value2, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyNameNotBetween(String value1, String value2) {
+			addCriterion("company_name not between", value1, value2, "companyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceIsNull() {
+			addCriterion("location_province is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceIsNotNull() {
+			addCriterion("location_province is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceEqualTo(String value) {
+			addCriterion("location_province =", value, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceNotEqualTo(String value) {
+			addCriterion("location_province <>", value, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceGreaterThan(String value) {
+			addCriterion("location_province >", value, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceGreaterThanOrEqualTo(String value) {
+			addCriterion("location_province >=", value, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceLessThan(String value) {
+			addCriterion("location_province <", value, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceLessThanOrEqualTo(String value) {
+			addCriterion("location_province <=", value, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceLike(String value) {
+			addCriterion("location_province like", value, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceNotLike(String value) {
+			addCriterion("location_province not like", value, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceIn(List<String> values) {
+			addCriterion("location_province in", values, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceNotIn(List<String> values) {
+			addCriterion("location_province not in", values, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceBetween(String value1, String value2) {
+			addCriterion("location_province between", value1, value2, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationProvinceNotBetween(String value1, String value2) {
+			addCriterion("location_province not between", value1, value2, "locationProvince");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityIsNull() {
+			addCriterion("location_city is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityIsNotNull() {
+			addCriterion("location_city is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityEqualTo(String value) {
+			addCriterion("location_city =", value, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityNotEqualTo(String value) {
+			addCriterion("location_city <>", value, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityGreaterThan(String value) {
+			addCriterion("location_city >", value, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityGreaterThanOrEqualTo(String value) {
+			addCriterion("location_city >=", value, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityLessThan(String value) {
+			addCriterion("location_city <", value, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityLessThanOrEqualTo(String value) {
+			addCriterion("location_city <=", value, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityLike(String value) {
+			addCriterion("location_city like", value, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityNotLike(String value) {
+			addCriterion("location_city not like", value, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityIn(List<String> values) {
+			addCriterion("location_city in", values, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityNotIn(List<String> values) {
+			addCriterion("location_city not in", values, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityBetween(String value1, String value2) {
+			addCriterion("location_city between", value1, value2, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationCityNotBetween(String value1, String value2) {
+			addCriterion("location_city not between", value1, value2, "locationCity");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaIsNull() {
+			addCriterion("location_area is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaIsNotNull() {
+			addCriterion("location_area is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaEqualTo(String value) {
+			addCriterion("location_area =", value, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaNotEqualTo(String value) {
+			addCriterion("location_area <>", value, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaGreaterThan(String value) {
+			addCriterion("location_area >", value, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaGreaterThanOrEqualTo(String value) {
+			addCriterion("location_area >=", value, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaLessThan(String value) {
+			addCriterion("location_area <", value, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaLessThanOrEqualTo(String value) {
+			addCriterion("location_area <=", value, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaLike(String value) {
+			addCriterion("location_area like", value, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaNotLike(String value) {
+			addCriterion("location_area not like", value, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaIn(List<String> values) {
+			addCriterion("location_area in", values, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaNotIn(List<String> values) {
+			addCriterion("location_area not in", values, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaBetween(String value1, String value2) {
+			addCriterion("location_area between", value1, value2, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andLocationAreaNotBetween(String value1, String value2) {
+			addCriterion("location_area not between", value1, value2, "locationArea");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressIsNull() {
+			addCriterion("adress is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressIsNotNull() {
+			addCriterion("adress is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressEqualTo(String value) {
+			addCriterion("adress =", value, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressNotEqualTo(String value) {
+			addCriterion("adress <>", value, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressGreaterThan(String value) {
+			addCriterion("adress >", value, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressGreaterThanOrEqualTo(String value) {
+			addCriterion("adress >=", value, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressLessThan(String value) {
+			addCriterion("adress <", value, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressLessThanOrEqualTo(String value) {
+			addCriterion("adress <=", value, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressLike(String value) {
+			addCriterion("adress like", value, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressNotLike(String value) {
+			addCriterion("adress not like", value, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressIn(List<String> values) {
+			addCriterion("adress in", values, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressNotIn(List<String> values) {
+			addCriterion("adress not in", values, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressBetween(String value1, String value2) {
+			addCriterion("adress between", value1, value2, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdressNotBetween(String value1, String value2) {
+			addCriterion("adress not between", value1, value2, "adress");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryIsNull() {
+			addCriterion("company_industry is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryIsNotNull() {
+			addCriterion("company_industry is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryEqualTo(String value) {
+			addCriterion("company_industry =", value, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryNotEqualTo(String value) {
+			addCriterion("company_industry <>", value, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryGreaterThan(String value) {
+			addCriterion("company_industry >", value, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryGreaterThanOrEqualTo(String value) {
+			addCriterion("company_industry >=", value, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryLessThan(String value) {
+			addCriterion("company_industry <", value, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryLessThanOrEqualTo(String value) {
+			addCriterion("company_industry <=", value, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryLike(String value) {
+			addCriterion("company_industry like", value, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryNotLike(String value) {
+			addCriterion("company_industry not like", value, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryIn(List<String> values) {
+			addCriterion("company_industry in", values, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryNotIn(List<String> values) {
+			addCriterion("company_industry not in", values, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryBetween(String value1, String value2) {
+			addCriterion("company_industry between", value1, value2, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andCompanyIndustryNotBetween(String value1, String value2) {
+			addCriterion("company_industry not between", value1, value2, "companyIndustry");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNull() {
+			addCriterion("remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNotNull() {
+			addCriterion("remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksEqualTo(String value) {
+			addCriterion("remarks =", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotEqualTo(String value) {
+			addCriterion("remarks <>", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThan(String value) {
+			addCriterion("remarks >", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("remarks >=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThan(String value) {
+			addCriterion("remarks <", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThanOrEqualTo(String value) {
+			addCriterion("remarks <=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLike(String value) {
+			addCriterion("remarks like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotLike(String value) {
+			addCriterion("remarks not like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIn(List<String> values) {
+			addCriterion("remarks in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotIn(List<String> values) {
+			addCriterion("remarks not in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksBetween(String value1, String value2) {
+			addCriterion("remarks between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotBetween(String value1, String value2) {
+			addCriterion("remarks not between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer
-	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 * @mbg.generated  Mon Nov 06 08:45:21 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 0 - 212
src/main/java/com/goafanti/common/model/CustomerOrganizationInfo.java

@@ -1,212 +0,0 @@
-package com.goafanti.common.model;
-
-public class CustomerOrganizationInfo {
-
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.id
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.cid
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String cid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.company_name
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String companyName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_province
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String locationProvince;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_city
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String locationCity;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_area
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String locationArea;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.adress
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String adress;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.company_industry
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String companyIndustry;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.remarks
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	private String remarks;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.id
-	 * @return  the value of customer_organization_info.id
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.id
-	 * @param id  the value for customer_organization_info.id
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.cid
-	 * @return  the value of customer_organization_info.cid
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getCid() {
-		return cid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.cid
-	 * @param cid  the value for customer_organization_info.cid
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setCid(String cid) {
-		this.cid = cid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.company_name
-	 * @return  the value of customer_organization_info.company_name
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.company_name
-	 * @param companyName  the value for customer_organization_info.company_name
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_province
-	 * @return  the value of customer_organization_info.location_province
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getLocationProvince() {
-		return locationProvince;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_province
-	 * @param locationProvince  the value for customer_organization_info.location_province
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setLocationProvince(String locationProvince) {
-		this.locationProvince = locationProvince;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_city
-	 * @return  the value of customer_organization_info.location_city
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getLocationCity() {
-		return locationCity;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_city
-	 * @param locationCity  the value for customer_organization_info.location_city
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setLocationCity(String locationCity) {
-		this.locationCity = locationCity;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_area
-	 * @return  the value of customer_organization_info.location_area
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getLocationArea() {
-		return locationArea;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_area
-	 * @param locationArea  the value for customer_organization_info.location_area
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setLocationArea(String locationArea) {
-		this.locationArea = locationArea;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.adress
-	 * @return  the value of customer_organization_info.adress
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getAdress() {
-		return adress;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.adress
-	 * @param adress  the value for customer_organization_info.adress
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setAdress(String adress) {
-		this.adress = adress;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.company_industry
-	 * @return  the value of customer_organization_info.company_industry
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getCompanyIndustry() {
-		return companyIndustry;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.company_industry
-	 * @param companyIndustry  the value for customer_organization_info.company_industry
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setCompanyIndustry(String companyIndustry) {
-		this.companyIndustry = companyIndustry;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.remarks
-	 * @return  the value of customer_organization_info.remarks
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.remarks
-	 * @param remarks  the value for customer_organization_info.remarks
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-}

+ 0 - 891
src/main/java/com/goafanti/common/model/CustomerOrganizationInfoExample.java

@@ -1,891 +0,0 @@
-package com.goafanti.common.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CustomerOrganizationInfoExample {
-    /**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	protected String orderByClause;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	protected boolean distinct;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	protected List<Criteria> oredCriteria;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public CustomerOrganizationInfoExample() {
-		oredCriteria = new ArrayList<Criteria>();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setOrderByClause(String orderByClause) {
-		this.orderByClause = orderByClause;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public String getOrderByClause() {
-		return orderByClause;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void setDistinct(boolean distinct) {
-		this.distinct = distinct;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public boolean isDistinct() {
-		return distinct;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public List<Criteria> getOredCriteria() {
-		return oredCriteria;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void or(Criteria criteria) {
-		oredCriteria.add(criteria);
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public Criteria or() {
-		Criteria criteria = createCriteriaInternal();
-		oredCriteria.add(criteria);
-		return criteria;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public Criteria createCriteria() {
-		Criteria criteria = createCriteriaInternal();
-		if (oredCriteria.size() == 0) {
-			oredCriteria.add(criteria);
-		}
-		return criteria;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	protected Criteria createCriteriaInternal() {
-		Criteria criteria = new Criteria();
-		return criteria;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public void clear() {
-		oredCriteria.clear();
-		orderByClause = null;
-		distinct = false;
-	}
-
-	/**
-	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	protected abstract static class GeneratedCriteria {
-		protected List<Criterion> criteria;
-
-		protected GeneratedCriteria() {
-			super();
-			criteria = new ArrayList<Criterion>();
-		}
-
-		public boolean isValid() {
-			return criteria.size() > 0;
-		}
-
-		public List<Criterion> getAllCriteria() {
-			return criteria;
-		}
-
-		public List<Criterion> getCriteria() {
-			return criteria;
-		}
-
-		protected void addCriterion(String condition) {
-			if (condition == null) {
-				throw new RuntimeException("Value for condition cannot be null");
-			}
-			criteria.add(new Criterion(condition));
-		}
-
-		protected void addCriterion(String condition, Object value, String property) {
-			if (value == null) {
-				throw new RuntimeException("Value for " + property + " cannot be null");
-			}
-			criteria.add(new Criterion(condition, value));
-		}
-
-		protected void addCriterion(String condition, Object value1, Object value2, String property) {
-			if (value1 == null || value2 == null) {
-				throw new RuntimeException("Between values for " + property + " cannot be null");
-			}
-			criteria.add(new Criterion(condition, value1, value2));
-		}
-
-		public Criteria andIdIsNull() {
-			addCriterion("id is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdIsNotNull() {
-			addCriterion("id is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdEqualTo(String value) {
-			addCriterion("id =", value, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdNotEqualTo(String value) {
-			addCriterion("id <>", value, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdGreaterThan(String value) {
-			addCriterion("id >", value, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdGreaterThanOrEqualTo(String value) {
-			addCriterion("id >=", value, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdLessThan(String value) {
-			addCriterion("id <", value, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdLessThanOrEqualTo(String value) {
-			addCriterion("id <=", value, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdLike(String value) {
-			addCriterion("id like", value, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdNotLike(String value) {
-			addCriterion("id not like", value, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdIn(List<String> values) {
-			addCriterion("id in", values, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdNotIn(List<String> values) {
-			addCriterion("id not in", values, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdBetween(String value1, String value2) {
-			addCriterion("id between", value1, value2, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andIdNotBetween(String value1, String value2) {
-			addCriterion("id not between", value1, value2, "id");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidIsNull() {
-			addCriterion("cid is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidIsNotNull() {
-			addCriterion("cid is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidEqualTo(String value) {
-			addCriterion("cid =", value, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidNotEqualTo(String value) {
-			addCriterion("cid <>", value, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidGreaterThan(String value) {
-			addCriterion("cid >", value, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidGreaterThanOrEqualTo(String value) {
-			addCriterion("cid >=", value, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidLessThan(String value) {
-			addCriterion("cid <", value, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidLessThanOrEqualTo(String value) {
-			addCriterion("cid <=", value, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidLike(String value) {
-			addCriterion("cid like", value, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidNotLike(String value) {
-			addCriterion("cid not like", value, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidIn(List<String> values) {
-			addCriterion("cid in", values, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidNotIn(List<String> values) {
-			addCriterion("cid not in", values, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidBetween(String value1, String value2) {
-			addCriterion("cid between", value1, value2, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCidNotBetween(String value1, String value2) {
-			addCriterion("cid not between", value1, value2, "cid");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameIsNull() {
-			addCriterion("company_name is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameIsNotNull() {
-			addCriterion("company_name is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameEqualTo(String value) {
-			addCriterion("company_name =", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameNotEqualTo(String value) {
-			addCriterion("company_name <>", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameGreaterThan(String value) {
-			addCriterion("company_name >", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
-			addCriterion("company_name >=", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameLessThan(String value) {
-			addCriterion("company_name <", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameLessThanOrEqualTo(String value) {
-			addCriterion("company_name <=", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameLike(String value) {
-			addCriterion("company_name like", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameNotLike(String value) {
-			addCriterion("company_name not like", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameIn(List<String> values) {
-			addCriterion("company_name in", values, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameNotIn(List<String> values) {
-			addCriterion("company_name not in", values, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameBetween(String value1, String value2) {
-			addCriterion("company_name between", value1, value2, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameNotBetween(String value1, String value2) {
-			addCriterion("company_name not between", value1, value2, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceIsNull() {
-			addCriterion("location_province is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceIsNotNull() {
-			addCriterion("location_province is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceEqualTo(String value) {
-			addCriterion("location_province =", value, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceNotEqualTo(String value) {
-			addCriterion("location_province <>", value, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceGreaterThan(String value) {
-			addCriterion("location_province >", value, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceGreaterThanOrEqualTo(String value) {
-			addCriterion("location_province >=", value, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceLessThan(String value) {
-			addCriterion("location_province <", value, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceLessThanOrEqualTo(String value) {
-			addCriterion("location_province <=", value, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceLike(String value) {
-			addCriterion("location_province like", value, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceNotLike(String value) {
-			addCriterion("location_province not like", value, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceIn(List<String> values) {
-			addCriterion("location_province in", values, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceNotIn(List<String> values) {
-			addCriterion("location_province not in", values, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceBetween(String value1, String value2) {
-			addCriterion("location_province between", value1, value2, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationProvinceNotBetween(String value1, String value2) {
-			addCriterion("location_province not between", value1, value2, "locationProvince");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityIsNull() {
-			addCriterion("location_city is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityIsNotNull() {
-			addCriterion("location_city is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityEqualTo(String value) {
-			addCriterion("location_city =", value, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityNotEqualTo(String value) {
-			addCriterion("location_city <>", value, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityGreaterThan(String value) {
-			addCriterion("location_city >", value, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityGreaterThanOrEqualTo(String value) {
-			addCriterion("location_city >=", value, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityLessThan(String value) {
-			addCriterion("location_city <", value, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityLessThanOrEqualTo(String value) {
-			addCriterion("location_city <=", value, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityLike(String value) {
-			addCriterion("location_city like", value, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityNotLike(String value) {
-			addCriterion("location_city not like", value, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityIn(List<String> values) {
-			addCriterion("location_city in", values, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityNotIn(List<String> values) {
-			addCriterion("location_city not in", values, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityBetween(String value1, String value2) {
-			addCriterion("location_city between", value1, value2, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationCityNotBetween(String value1, String value2) {
-			addCriterion("location_city not between", value1, value2, "locationCity");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaIsNull() {
-			addCriterion("location_area is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaIsNotNull() {
-			addCriterion("location_area is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaEqualTo(String value) {
-			addCriterion("location_area =", value, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaNotEqualTo(String value) {
-			addCriterion("location_area <>", value, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaGreaterThan(String value) {
-			addCriterion("location_area >", value, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaGreaterThanOrEqualTo(String value) {
-			addCriterion("location_area >=", value, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaLessThan(String value) {
-			addCriterion("location_area <", value, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaLessThanOrEqualTo(String value) {
-			addCriterion("location_area <=", value, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaLike(String value) {
-			addCriterion("location_area like", value, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaNotLike(String value) {
-			addCriterion("location_area not like", value, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaIn(List<String> values) {
-			addCriterion("location_area in", values, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaNotIn(List<String> values) {
-			addCriterion("location_area not in", values, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaBetween(String value1, String value2) {
-			addCriterion("location_area between", value1, value2, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andLocationAreaNotBetween(String value1, String value2) {
-			addCriterion("location_area not between", value1, value2, "locationArea");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressIsNull() {
-			addCriterion("adress is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressIsNotNull() {
-			addCriterion("adress is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressEqualTo(String value) {
-			addCriterion("adress =", value, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressNotEqualTo(String value) {
-			addCriterion("adress <>", value, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressGreaterThan(String value) {
-			addCriterion("adress >", value, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressGreaterThanOrEqualTo(String value) {
-			addCriterion("adress >=", value, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressLessThan(String value) {
-			addCriterion("adress <", value, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressLessThanOrEqualTo(String value) {
-			addCriterion("adress <=", value, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressLike(String value) {
-			addCriterion("adress like", value, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressNotLike(String value) {
-			addCriterion("adress not like", value, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressIn(List<String> values) {
-			addCriterion("adress in", values, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressNotIn(List<String> values) {
-			addCriterion("adress not in", values, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressBetween(String value1, String value2) {
-			addCriterion("adress between", value1, value2, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andAdressNotBetween(String value1, String value2) {
-			addCriterion("adress not between", value1, value2, "adress");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryIsNull() {
-			addCriterion("company_industry is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryIsNotNull() {
-			addCriterion("company_industry is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryEqualTo(String value) {
-			addCriterion("company_industry =", value, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryNotEqualTo(String value) {
-			addCriterion("company_industry <>", value, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryGreaterThan(String value) {
-			addCriterion("company_industry >", value, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryGreaterThanOrEqualTo(String value) {
-			addCriterion("company_industry >=", value, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryLessThan(String value) {
-			addCriterion("company_industry <", value, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryLessThanOrEqualTo(String value) {
-			addCriterion("company_industry <=", value, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryLike(String value) {
-			addCriterion("company_industry like", value, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryNotLike(String value) {
-			addCriterion("company_industry not like", value, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryIn(List<String> values) {
-			addCriterion("company_industry in", values, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryNotIn(List<String> values) {
-			addCriterion("company_industry not in", values, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryBetween(String value1, String value2) {
-			addCriterion("company_industry between", value1, value2, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyIndustryNotBetween(String value1, String value2) {
-			addCriterion("company_industry not between", value1, value2, "companyIndustry");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksIsNull() {
-			addCriterion("remarks is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksIsNotNull() {
-			addCriterion("remarks is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksEqualTo(String value) {
-			addCriterion("remarks =", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotEqualTo(String value) {
-			addCriterion("remarks <>", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksGreaterThan(String value) {
-			addCriterion("remarks >", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
-			addCriterion("remarks >=", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLessThan(String value) {
-			addCriterion("remarks <", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLessThanOrEqualTo(String value) {
-			addCriterion("remarks <=", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLike(String value) {
-			addCriterion("remarks like", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotLike(String value) {
-			addCriterion("remarks not like", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksIn(List<String> values) {
-			addCriterion("remarks in", values, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotIn(List<String> values) {
-			addCriterion("remarks not in", values, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksBetween(String value1, String value2) {
-			addCriterion("remarks between", value1, value2, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotBetween(String value1, String value2) {
-			addCriterion("remarks not between", value1, value2, "remarks");
-			return (Criteria) this;
-		}
-	}
-
-	/**
-	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_organization_info
-	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
-	 */
-	public static class Criterion {
-		private String condition;
-		private Object value;
-		private Object secondValue;
-		private boolean noValue;
-		private boolean singleValue;
-		private boolean betweenValue;
-		private boolean listValue;
-		private String typeHandler;
-
-		public String getCondition() {
-			return condition;
-		}
-
-		public Object getValue() {
-			return value;
-		}
-
-		public Object getSecondValue() {
-			return secondValue;
-		}
-
-		public boolean isNoValue() {
-			return noValue;
-		}
-
-		public boolean isSingleValue() {
-			return singleValue;
-		}
-
-		public boolean isBetweenValue() {
-			return betweenValue;
-		}
-
-		public boolean isListValue() {
-			return listValue;
-		}
-
-		public String getTypeHandler() {
-			return typeHandler;
-		}
-
-		protected Criterion(String condition) {
-			super();
-			this.condition = condition;
-			this.typeHandler = null;
-			this.noValue = true;
-		}
-
-		protected Criterion(String condition, Object value, String typeHandler) {
-			super();
-			this.condition = condition;
-			this.value = value;
-			this.typeHandler = typeHandler;
-			if (value instanceof List<?>) {
-				this.listValue = true;
-			} else {
-				this.singleValue = true;
-			}
-		}
-
-		protected Criterion(String condition, Object value) {
-			this(condition, value, null);
-		}
-
-		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-			super();
-			this.condition = condition;
-			this.value = value;
-			this.secondValue = secondValue;
-			this.typeHandler = typeHandler;
-			this.betweenValue = true;
-		}
-
-		protected Criterion(String condition, Object value, Object secondValue) {
-			this(condition, value, secondValue, null);
-		}
-	}
-
-	/**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table customer_organization_info
-     *
-     * @mbg.generated do_not_delete_during_merge Mon Oct 09 17:18:27 CST 2017
-     */
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-}

+ 151 - 0
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -0,0 +1,151 @@
+package com.goafanti.common.utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import com.goafanti.customer.bo.CustomerIn;
+
+public class ExcelUtils {
+	private Set repeatRows = new TreeSet<Integer>(); //数据重复的
+	private Set vacantRows = new TreeSet<Integer>(); //数据不完整的
+	DecimalFormat df = new DecimalFormat("0");  
+	public  List<CustomerIn> parseExcel(String excelPath) throws IOException{
+		InputStream excelFile = new FileInputStream(new File(excelPath));
+		XSSFWorkbook wb = new XSSFWorkbook(excelFile);	
+		List<CustomerIn> result = new ArrayList<CustomerIn>();	
+		XSSFSheet sheet = wb.getSheetAt(0);
+		Iterator<Row> rowIterator = sheet.iterator();
+		Row currentRow = rowIterator.next(); //表头
+		int rowNumber = 1;		
+		while(rowIterator.hasNext()){
+			rowNumber++;
+			System.out.println(rowNumber);
+			currentRow = rowIterator.next();
+			Iterator<Cell> cellIterator = currentRow.iterator();
+			CustomerIn cin = new CustomerIn();
+			cin.setCustomerType(checkCustomerType(cellIterator.next().getStringCellValue(), rowNumber));
+			cin.setCompanyName(cellIterator.next().getStringCellValue());
+			cin.setFollowSituation(checkFollowSituation(cellIterator.next().getStringCellValue(),rowNumber));
+			cin.setCustomerStatus(checkCustomerStatus(cellIterator.next().getStringCellValue(), rowNumber));	
+			cin.setCompanyIntention(checkCompanyIntention(cellIterator.next().getStringCellValue(), rowNumber));
+			cin.setContactName(checkOther(cellIterator.next().getStringCellValue(),rowNumber));
+			cin.setContactTel(checkOther(df.format(cellIterator.next().getNumericCellValue()), rowNumber));
+			if(checkRepeat(cin, result)) repeatRows.add(rowNumber);
+			result.add(cin);
+		}
+		return result;
+	}
+	
+	@SuppressWarnings("unchecked")
+	private String checkCustomerType(String customerType,int rowNumber){
+		if(StringUtils.isEmpty(customerType)) {
+			vacantRows.add(rowNumber);
+			return "";
+		}
+		if(customerType.equals("个人客户")) return "0"; 
+		if(customerType.equals("公司客户")) return "1";
+		if(customerType.equals("团体客户")) return "2";
+		vacantRows.add(rowNumber);
+		return "";
+	}
+	@SuppressWarnings("unchecked")
+	private String checkFollowSituation(String followSituation,int rowNumber){
+		if(StringUtils.isEmpty(followSituation)){
+			vacantRows.add(rowNumber);
+			return "";
+		}
+		if(followSituation.equals("已发项目介绍资料")) return "0";
+		if(followSituation.equals("已约面谈")) return "1";
+		if(followSituation.equals("已发合同计划书")) return "2";
+		if(followSituation.equals("已报价")) return "3";
+		if(followSituation.equals("已发合同")) return "4";
+		if(followSituation.equals("已签合同")) return "5";
+		if(followSituation.equals("面谈中")) return "6";
+		if(followSituation.equals("已面签")) return "7";
+		if(followSituation.equals("无进度")) return "8";
+		vacantRows.add(rowNumber);
+		return "";
+	}
+	@SuppressWarnings("unchecked")
+	private String checkCustomerStatus(String customerStatus,int rowNumber){
+		if(StringUtils.isEmpty(customerStatus)) {
+			vacantRows.add(rowNumber);
+			return "";
+		}
+		if(customerStatus.equals("新客户")) return "0";
+		if(customerStatus.equals("意向客户")) return "1";
+		if(customerStatus.equals("重点客户")) return "2";
+		if(customerStatus.equals("面谈客户")) return "3";
+		if(customerStatus.equals("签单客户")) return "4";
+		if(customerStatus.equals("被拒绝客户")) return "5";
+		vacantRows.add(rowNumber);
+		return "";
+	}
+
+	public boolean checkRepeat(CustomerIn cin,List<CustomerIn> cinList){
+		boolean flag = false;
+		for(CustomerIn c:cinList){
+			if(c.getCompanyName().equals(cin.getCompanyName())) 
+				flag = true;
+		}
+		return flag;
+	}
+	@SuppressWarnings("unchecked")
+	private String checkCompanyIntention(String companyIntention,int rowNumber){
+		if(StringUtils.isEmpty(companyIntention)){
+			vacantRows.add(rowNumber);
+			return "";
+		}
+		if(companyIntention.equals("发明专利")) return "0";
+		if(companyIntention.equals("实用型新型专利")) return "1";
+		if(companyIntention.equals("外观专利")) return "2";
+		if(companyIntention.equals("软件著作权")) return "3";
+		if(companyIntention.equals("知识产权贯标")) return "4";
+		if(companyIntention.equals("高企认定")) return "5";
+		if(companyIntention.equals("技术成果")) return "6";
+		if(companyIntention.equals("技术需求")) return "7";
+		if(companyIntention.equals("专家咨询")) return "8";
+		if(companyIntention.equals("团单合作")) return "9";
+		if(companyIntention.equals("商标")) return "10";
+		if(companyIntention.equals("系统集成")) return "11";
+		vacantRows.add(rowNumber);
+		return "";
+	}
+	
+	@SuppressWarnings("unchecked")
+	private String checkOther(String cellValue,int rowNumber){
+		if(StringUtils.isEmpty(cellValue)){
+			vacantRows.add(rowNumber);
+			return "";
+		}else{
+			return String.valueOf(cellValue);
+		} 
+	}
+
+	public String getRepeatRows(){
+		if(repeatRows.size()>0)
+			return StringUtils.join(repeatRows.toArray(),",")+ " 行数据重复;";
+		else 
+			return "";
+	}
+	
+	public String getVacantRows(){
+		if(vacantRows.size()>0)
+			return StringUtils.join(vacantRows.toArray(),",")+" 行数据不全或格式有误;";
+		else 
+			return "";
+	}
+
+}

+ 56 - 1
src/main/java/com/goafanti/customer/bo/CustomerIn.java

@@ -66,11 +66,26 @@ public class CustomerIn {
 	private String tag;
 	
 	/** 上级ID **/
-	private String  paid;
+	private String paid;
 	
 	/** 省份 **/
 	private String locationProvince;
 	
+	/** 市区 **/
+	private String locationCity;
+	
+	/** 区域 **/
+	private String locationArea;
+	
+	/** 详细地址 **/
+	private String address;
+	
+	/** 产业 **/
+	private String companyIndustry;
+	
+	/** 备注 **/
+	private String remarks;
+	
 	public String getCuid() {
 		return cuid;
 	}
@@ -257,4 +272,44 @@ public class CustomerIn {
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 	}
+
+	public String getLocationCity() {
+		return locationCity;
+	}
+
+	public void setLocationCity(String locationCity) {
+		this.locationCity = locationCity;
+	}
+
+	public String getLocationArea() {
+		return locationArea;
+	}
+
+	public void setLocationArea(String locationArea) {
+		this.locationArea = locationArea;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getCompanyIndustry() {
+		return companyIndustry;
+	}
+
+	public void setCompanyIndustry(String companyIndustry) {
+		this.companyIndustry = companyIndustry;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 }

+ 7 - 7
src/main/java/com/goafanti/customer/bo/CustomerOut.java

@@ -2,7 +2,7 @@ package com.goafanti.customer.bo;
 
 public class CustomerOut {
 	/**
-	 * 客户类型(1-个人客户,2-机构单位,3-团体单位)
+	 * 客户类型(1-个人客户,2-公司客户,3-团体客户)
 	 */
 	private Integer customerType;
 	
@@ -112,7 +112,7 @@ public class CustomerOut {
 	/**
 	 * 详细地址
 	 */
-	private String adress;
+	private String address;
 	/**
 	 * 跟单人ID
 	 */
@@ -375,12 +375,12 @@ public class CustomerOut {
 		this.locationArea = locationArea;
 	}
 
-	public String getAdress() {
-		return adress;
+	public String getAddress() {
+		return address;
 	}
 
-	public void setAdress(String adress) {
-		this.adress = adress;
+	public void setAddress(String address) {
+		this.address = address;
 	}
 
 	public String getAid() {
@@ -466,7 +466,7 @@ public class CustomerOut {
 				+ ", email=" + email + ", qq=" + qq + ", wechat=" + wechat + ", depatrment=" + depatrment
 				+ ", customerPosition=" + customerPosition + ", remarks=" + remarks + ", companyName=" + companyName
 				+ ", locationProvince=" + locationProvince + ", companyIndustry=" + companyIndustry + ", locationCity="
-				+ locationCity + ", locationArea=" + locationArea + ", adress=" + adress + ", adminName=" + adminName
+				+ locationCity + ", locationArea=" + locationArea + ", address=" + address + ", adminName=" + adminName
 				+ ", followDate=" + followDate + "]";
 	}
 	

+ 53 - 18
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -1,5 +1,6 @@
 package com.goafanti.customer.controller;
 
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -13,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.customer.bo.AdminOut;
 import com.goafanti.customer.bo.CustomerIn;
 import com.goafanti.customer.bo.CustomerOut;
-import com.goafanti.customer.service.CustomerOrganizationService;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.customer.service.CustomerUserService;
 import com.goafanti.customer.service.FollowUpService;
@@ -31,9 +32,9 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.Customer;
-import com.goafanti.common.model.CustomerOrganizationInfo;
 import com.goafanti.common.model.CustomerUserInfo;
 import com.goafanti.common.model.FollowUpRecord;
+import com.goafanti.common.utils.ExcelUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 
@@ -46,12 +47,12 @@ public class AdminCustomerApiController extends BaseApiController {
 	@Resource
 	private CustomerUserService customerUserService;
 	@Resource
-	private CustomerOrganizationService customerOrganizationService;
-	@Resource
 	private AdminService adminService;
 	@Resource
 	private FollowUpService followUpService;
-
+	
+	@Value(value = "${upload.private.path}")
+	private String	uploadPrivatePath	= null;
 	/**
 	 * 新增客户
 	 * 
@@ -61,7 +62,7 @@ public class AdminCustomerApiController extends BaseApiController {
 	 * @throws IllegalAccessException 
 	 */
 	@RequestMapping(value = "/addCustomer", method = RequestMethod.POST)
-	public Result addCustomer(CustomerIn cusIn,CustomerOrganizationInfo coi,CustomerUserInfo cui,FollowUpRecord fur) throws ParseException, IllegalAccessException, InvocationTargetException {
+	public Result addCustomer(CustomerIn cusIn,CustomerUserInfo cui,FollowUpRecord fur) throws IllegalAccessException, InvocationTargetException {
 		Result res=new Result();
 		//查询客户是否已经存在
 		if(StringUtils.isEmpty(cusIn.getCompanyName())) res.getError().add(new Error("公司名字不能为空"));
@@ -70,7 +71,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		if(StringUtils.isEmpty(cusIn.getCustomerStatus())) res.getError().add(new Error("客户状态不能为空"));
 		if(StringUtils.isEmpty(cui.getName())) res.getError().add(new Error("联系人姓名不能为空"));
 		if(StringUtils.isEmpty(cui.getMobile())&&StringUtils.isEmpty(cui.getTelNum())) res.getError().add(new Error("手机号码和座机不能同时为空"));
-		if(customerOrganizationService.findCustomerOrganizationByName(cusIn.getCompanyName())>0){
+		if(customerService.findCustomerByName(cusIn.getCompanyName())>0){
 			res.getError().add(buildError(ErrorConstants.CUSTOMER_ALREADY_EXIST));
 			return res;
 		}
@@ -83,23 +84,25 @@ public class AdminCustomerApiController extends BaseApiController {
 		BeanUtils.copyProperties(cus, cusIn);
 		cus.setId(customerId);
 		cus.setFollowId(followId);
-		cus.setShareType(Integer.parseInt(cusIn.getShareType()));
-		cus.setCustomerType(Integer.parseInt(cusIn.getCustomerType()));
 		cus.setAid(TokenManager.getAdminId());
 		cus.setCreateTime(new Date());
+		cus.setEffective(0);
 		//公司信息和联系人信息表
 		cui.setId(customerUserId);
 		cui.setCid(customerId);//客户联系人表中的cid		
-		coi.setId(UUID.randomUUID().toString());//客户公司ID
-		coi.setCid(customerId);//客户公司表中的cid
 		//跟进信息表
 		SimpleDateFormat format = new SimpleDateFormat(AFTConstants.YYYYMMDDHHMMSS);
-		fur.setFollowDate(format.parse(cusIn.getFollowDates()));
+		try {
+			fur.setFollowDate(format.parse(cusIn.getFollowDates()));
+		} catch (ParseException e) {
+			res.getError().add(new Error("时间格式有误"));
+		}
 		fur.setId(followId);//跟进记录的ID
 		fur.setCid(customerId);//跟进记录表中的cid
 		fur.setCuid(customerUserId);//跟进记录表中的联系人id
 		fur.setAid(TokenManager.getAdminId());
-		customerService.addCustomer(cus,cui,coi,fur);
+		if(res.getError().size()>0) return res;
+		customerService.addCustomer(cus,cui,fur);
 		//添加日志
 		cusIn.setId(customerId);
 		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_CREATE);
@@ -226,16 +229,13 @@ public class AdminCustomerApiController extends BaseApiController {
 	 * @throws IllegalAccessException 
 	 */
 	@RequestMapping(value = "/updateCustomer", method = RequestMethod.POST)
-	public Result updateCustomer (CustomerIn cusIn,CustomerOrganizationInfo coi,HttpServletResponse rsp) throws IllegalAccessException, InvocationTargetException  {
+	public Result updateCustomer (CustomerIn cusIn,HttpServletResponse rsp) throws IllegalAccessException, InvocationTargetException  {
 		Result res=new Result();
 		Customer c =new Customer();
 		BeanUtils.copyProperties(c, cusIn);
 		c.setCustomerType(Integer.parseInt(cusIn.getCustomerType()));
-		coi.setCid(cusIn.getId());
 		//更新客户信息和客户公司信息
-		customerService.updateCustomer(c);
-		//更新公司表
-		customerOrganizationService.updateCustomerOrganizationInfo(coi);
+		customerService.updateCustomer(c);	
 		//插入日志表
 		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_MODIFY);
 	    return res;
@@ -503,4 +503,39 @@ public class AdminCustomerApiController extends BaseApiController {
 		res.setData(customerService.findCustomerHistory(customerId));
 		return res;
 	}
+	
+	/**
+	 * 上传excel文档
+	 * @param req
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadExcel")
+	public Result uploadExcel(HttpServletRequest req){
+		Result res = new Result();
+		boolean existRows = false;
+		String excelPath = handleFile(res, "/customer_sys_file/", true, req, "");
+		ExcelUtils utils = new ExcelUtils();
+		try {
+			List<CustomerIn> list = utils.parseExcel(uploadPrivatePath + excelPath);
+			String errorMessage = "";
+			if(list.size()>100)	errorMessage += "导入数据不能超过一百条;";
+			errorMessage += utils.getVacantRows() + utils.getRepeatRows();
+			for(CustomerIn cui:list){
+				if(customerService.findCustomerByName(cui.getCompanyName())>0){
+					existRows = true;
+					errorMessage += cui.getCompanyName();
+				} 
+			}
+			if(existRows) errorMessage += "	已经存在;";
+			if(StringUtils.isNotBlank(errorMessage)) {
+				res.getError().add(new Error(errorMessage));
+				return res;
+			}
+			customerService.saveUploadData(list);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return res;
+	}
+	
 }

+ 0 - 24
src/main/java/com/goafanti/customer/service/CustomerOrganizationService.java

@@ -1,24 +0,0 @@
-package com.goafanti.customer.service;
-
-import com.goafanti.common.model.CustomerOrganizationInfo;
-
-public interface CustomerOrganizationService {
-	/**
-	 * 添加客户公司信息
-	 * @param coi
-	 * @return
-	 */
-	int addCustomerOrganizationInfo(CustomerOrganizationInfo coi);
-	
-	/**
-	 * 添加客户公司信息
-	 * @param coi
-	 * @return
-	 */
-	int updateCustomerOrganizationInfo(CustomerOrganizationInfo coi);
-	
-	/**
-	 * 查看客户是否已经存在
-	 */
-	int findCustomerOrganizationByName(String companyName);
-}

+ 12 - 2
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import com.goafanti.common.model.Customer;
 import com.goafanti.common.model.CustomerLog;
-import com.goafanti.common.model.CustomerOrganizationInfo;
 import com.goafanti.common.model.CustomerUserInfo;
 import com.goafanti.common.model.FollowUpRecord;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -18,7 +17,7 @@ public interface CustomerService {
 	 * @param cus
 	 * @return
 	 */
-	int addCustomer(Customer cus,CustomerUserInfo cui,CustomerOrganizationInfo coi,FollowUpRecord fur);
+	int addCustomer(Customer cus,CustomerUserInfo cui,FollowUpRecord fur);
 	
 	/**
 	 * 删除客户信息
@@ -103,4 +102,15 @@ public interface CustomerService {
 	 * @return
 	 */
 	public CustomerOut findCustomerHistory(String customerId);
+	
+	/**
+	 *  保存上传的客户资料
+	 * @param excelPath
+	 */
+	public void saveUploadData(List<CustomerIn> cinList);
+	
+	/**
+	 * 查看客户是否已经存在
+	 */
+	int findCustomerByName(String companyName);
 }

+ 0 - 35
src/main/java/com/goafanti/customer/service/impl/CustomerOrganizationServiceImp.java

@@ -1,35 +0,0 @@
-package com.goafanti.customer.service.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.common.dao.CustomerOrganizationInfoMapper;
-import com.goafanti.common.model.CustomerOrganizationInfo;
-import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.customer.service.CustomerOrganizationService;
-@Service
-public class CustomerOrganizationServiceImp extends BaseMybatisDao<CustomerOrganizationInfoMapper> implements CustomerOrganizationService{
-	@Autowired
-	private CustomerOrganizationInfoMapper customerOrganizationInfoMapper ;
-
-	@Override
-	public int addCustomerOrganizationInfo(CustomerOrganizationInfo coi) {
-		return customerOrganizationInfoMapper.insert(coi);
-	}
-	/**
-	 *  更新客户公司信息
-	 * @param intentions
-	 * @return
-	 */
-	@Override
-	public int updateCustomerOrganizationInfo(CustomerOrganizationInfo coi) {
-		return customerOrganizationInfoMapper.updateCustomerOrganizationByCid(coi);
-	}
-	@Override
-	public int findCustomerOrganizationByName(String companyName) {
-		return customerOrganizationInfoMapper.findCustomerOrganizationByName(companyName);
-	}
-
-
-}

+ 74 - 10
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -13,6 +13,8 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -23,7 +25,6 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.CustomerLogMapper;
 import com.goafanti.common.dao.CustomerMapper;
-import com.goafanti.common.dao.CustomerOrganizationInfoMapper;
 import com.goafanti.common.dao.CustomerUserInfoMapper;
 import com.goafanti.common.dao.FollowUpRecordMapper;
 import com.goafanti.common.enums.CustomerFollowFiled;
@@ -32,7 +33,6 @@ import com.goafanti.common.enums.CustomerStatusFiled;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Customer;
 import com.goafanti.common.model.CustomerLog;
-import com.goafanti.common.model.CustomerOrganizationInfo;
 import com.goafanti.common.model.CustomerUserInfo;
 import com.goafanti.common.model.FollowUpRecord;
 import com.goafanti.common.utils.StringUtils;
@@ -47,15 +47,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	@Autowired
 	private CustomerUserInfoMapper customerUserInfoMapper;
 	@Autowired
-	private CustomerOrganizationInfoMapper customerOrganizationInfoMapper;
-	@Autowired
 	private FollowUpRecordMapper followUpRecordMapper;
 	@Override
-	public int addCustomer(Customer cus,CustomerUserInfo cui,CustomerOrganizationInfo coi,FollowUpRecord fur) {
+	public int addCustomer(Customer cus,CustomerUserInfo cui,FollowUpRecord fur) {
 		//插入 customerUserInfo
 		customerUserInfoMapper.insert(cui);
-		//插入 customerOrganizationInfo
-		customerOrganizationInfoMapper.insert(coi);
 		//插入跟进表
 		followUpRecordMapper.insert(fur);
 		String paid = findLadderIds(TokenManager.getAdminId());//查询上级管理员ID集合
@@ -67,7 +63,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 
 	@Override
 	public void deleteCustomer(String id) {
-		customerMapper.deleteByPrimaryKey(id);
+		Customer cus = new Customer();
+		cus.setId(id);
+		cus.setEffective(1);
+		customerMapper.updateByPrimaryKeySelective(cus);
 	}
 
 	@Override
@@ -175,8 +174,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	private CustomerOut setFiled(CustomerOut co) {
 		switch(co.getCustomerType()){
 			case 0 : co.set_customerType("个人客户") ;break;
-			case 1 : co.set_customerType("机构单位") ;break;
-			case 2 : co.set_customerType("团体单位") ;break;
+			case 1 : co.set_customerType("公司客户") ;break;
+			case 2 : co.set_customerType("团体客户") ;break;
 		}
 		switch(co.getCustomerStatus()){
 			case 0 : co.set_customerStatus("新客户") ;break;
@@ -385,4 +384,69 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		
 		return customerMapper.findCustomerHistory(customerId);
 	}
+	
+	@Override
+	public int findCustomerByName(String companyName) {
+		return customerMapper.findCustomerByName(companyName);
+	}
+	
+	@Override
+	@Transactional
+	public void saveUploadData(List<CustomerIn> cinList) {
+		String aid = TokenManager.getAdminId();
+		String paid = findLadderIds(TokenManager.getAdminId());//查询上级管理员ID集合
+		if(StringUtils.isNotBlank(paid)) paid = paid.substring(0, paid.length()-1);	
+		Date createDate = new Date();
+		Customer cus = null;
+		CustomerUserInfo cui = null;
+		FollowUpRecord fur = null;
+		String customerId = "";//客户记录ID
+		String customerUserId= "";//客户联系人ID
+		String followId= "" ;//跟进记录ID
+		for(CustomerIn cusIn:cinList){
+			customerId = UUID.randomUUID().toString();
+			customerUserId = UUID.randomUUID().toString();
+			followId = UUID.randomUUID().toString();
+			cus = new Customer();
+			cui = new CustomerUserInfo();
+			fur = new FollowUpRecord();
+			try {
+				BeanUtils.copyProperties(cus, cusIn);
+				/** 客户信息 **/
+				cus.setId(customerId);
+				cus.setAid(aid);
+				cus.setPaid(paid);
+				cus.setFollowId(followId);
+				cus.setShareType(0); //默认私有
+				cus.setCustomerType(Integer.parseInt(cusIn.getCustomerType()));
+				cus.setFollowSituation(Integer.parseInt(cusIn.getFollowSituation()));
+				cus.setCustomerStatus(Integer.parseInt(cusIn.getCustomerStatus()));
+				cus.setCompanyIntention(cusIn.getCompanyIntention());
+				cus.setCreateTime(createDate);
+				cus.setEffective(0);
+				/** 设置用户信息  **/
+				cui.setId(customerUserId);
+				cui.setCid(customerId);
+				cui.setName(cusIn.getContactName());
+				cui.setTelNum(cusIn.getContactTel());
+				/** 设置跟进信息 **/
+				fur.setId(followId);
+				fur.setCid(customerId);
+				fur.setAid(aid);
+				fur.setCuid(customerUserId);
+				fur.setFollowSituation(Integer.parseInt(cusIn.getFollowSituation()));
+				fur.setCustomerStatus(Integer.parseInt(cusIn.getCustomerStatus()));
+				fur.setContactInfo("电话  - "+cusIn.getContactTel());
+				fur.setFollowDate(createDate);
+				fur.setEffective(0);
+				customerMapper.insert(cus);
+				customerUserInfoMapper.insert(cui);
+				followUpRecordMapper.insert(fur);
+			} catch (IllegalAccessException | InvocationTargetException e) {
+				e.printStackTrace();
+			}
+		}
+		
+	}
+
 }

+ 1 - 1
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -48,7 +48,7 @@ public class InputDemand {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		demandType;
 
-	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		problemDes;
 
 	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//sb.jishutao.com/1.0.48
+static.host=//sb.jishutao.com/1.0.49
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.0.48
+static.host=//static.jishutao.com/1.0.49
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload