Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	generatorConfig.xml
anderx 8 years ago
parent
commit
768f86a2c4
27 changed files with 3698 additions and 823 deletions
  1. 0 14
      generatorConfig.xml
  2. 3 3
      src/main/java/com/goafanti/achievement/bo/InputAchievement.java
  3. 11 11
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  4. 101 0
      src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java
  5. 11 11
      src/main/java/com/goafanti/common/dao/UserIdentityMapper.java
  6. 14 14
      src/main/java/com/goafanti/common/dao/UserMapper.java
  7. 36 21
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  8. 528 10
      src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml
  9. 115 20
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  10. 44 60
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  11. 38 35
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  12. 209 186
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  13. 76 16
      src/main/java/com/goafanti/common/model/OrganizationIdentityExample.java
  14. 283 0
      src/main/java/com/goafanti/common/model/OrganizationManagement.java
  15. 1082 0
      src/main/java/com/goafanti/common/model/OrganizationManagementExample.java
  16. 98 121
      src/main/java/com/goafanti/common/model/User.java
  17. 76 136
      src/main/java/com/goafanti/common/model/UserExample.java
  18. 234 96
      src/main/java/com/goafanti/common/model/UserIdentity.java
  19. 426 16
      src/main/java/com/goafanti/common/model/UserIdentityExample.java
  20. 2 1
      src/main/java/com/goafanti/common/utils/ExcelUtils.java
  21. 1 1
      src/main/java/com/goafanti/common/utils/MobileMessageUtils.java
  22. 10 10
      src/main/java/com/goafanti/customer/bo/CustomerListIn.java
  23. 11 12
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  24. 25 13
      src/main/java/com/goafanti/organization/bo/OrganizationListOut.java
  25. 80 1
      src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java
  26. 28 0
      src/main/java/com/goafanti/organization/service/OrganizationService.java
  27. 156 15
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

+ 0 - 14
generatorConfig.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-<generatorConfiguration>
-  <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" />
-  <context id="context1">	
-    <jdbcConnection connectionURL="jdbc:mysql://192.168.1.213:3306/aft" 
-    	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
-    <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="project_size"/>
-    <table schema="aft" tableName="business_project"/>
-  </context>
-</generatorConfiguration>

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

@@ -16,7 +16,7 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		dataCategory;
 
-	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		name;
 
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -29,7 +29,7 @@ public class InputAchievement {
 	@Size(min = 0, max = 1024, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		summary;
 
-	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 2048, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		introduction;
 
 	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -64,7 +64,7 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		innovation;
 
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		ownerName;
 
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")

+ 11 - 11
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -14,69 +14,69 @@ import org.apache.ibatis.annotations.Param;
 public interface OrganizationIdentityMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	long countByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int deleteByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int insert(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int insertSelective(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	List<OrganizationIdentity> selectByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	OrganizationIdentity selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") OrganizationIdentity record,
 			@Param("example") OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int updateByExample(@Param("record") OrganizationIdentity record,
 			@Param("example") OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int updateByPrimaryKeySelective(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int updateByPrimaryKey(OrganizationIdentity record);
 

+ 101 - 0
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -1,5 +1,106 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
+import com.goafanti.organization.bo.OrganizationListOut;
+import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.model.OrganizationManagement;
+import com.goafanti.common.model.OrganizationManagementExample;
+import org.apache.ibatis.annotations.Param;
+
 public interface OrganizationManagementMapper {
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	long countByExample(OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int deleteByExample(OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int insert(OrganizationManagement record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int insertSelective(OrganizationManagement record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	List<OrganizationManagement> selectByExample(OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	OrganizationManagement selectByPrimaryKey(String id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") OrganizationManagement record,
+			@Param("example") OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int updateByExample(@Param("record") OrganizationManagement record,
+			@Param("example") OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int updateByPrimaryKeySelective(OrganizationManagement record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int updateByPrimaryKey(OrganizationManagement record);
+	List<OrganizationListOut> selectSuperId();
+	/**
+	 * 新增
+	 * @param olo
+	 * @return
+	 */
+	int insert1(OrganizationListOut olo);
+	/**
+	 * 根据组织名称查组织编号
+	 */
+	String selectDepNoByName(String name);
+	/**
+	 * 查询相同上级下编号数量
+	 */
+	int selectDepNoCount(String superId);
+	/**
+	 * 模糊查询负责人名称
+	 */
+	List<AdminListBo> selectName(String name);
+	
+	OrganizationListOut selectAllById(String id);
+	
+	int deleteById(String id);
+	
+	String selectAdminNameById(String name);
+	
+	String selectIdByDepNo(String depNo);
+	/**
+	 * 查询有相同上级组织的信息
+	 * @param superId
+	 * @return
+	 */
+	List<OrganizationListOut> selectIDNBySuperId(String superId);
+	
+	int updateByNumber(OrganizationListOut olo);
 	
+	int selectCountBySuperId(String superId);
 }

+ 11 - 11
src/main/java/com/goafanti/common/dao/UserIdentityMapper.java

@@ -12,67 +12,67 @@ import org.apache.ibatis.annotations.Param;
 public interface UserIdentityMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	long countByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int deleteByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int insert(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int insertSelective(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	List<UserIdentity> selectByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	UserIdentity selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") UserIdentity record, @Param("example") UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int updateByExample(@Param("record") UserIdentity record, @Param("example") UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int updateByPrimaryKeySelective(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	int updateByPrimaryKey(UserIdentity record);
 

+ 14 - 14
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -21,67 +21,67 @@ import com.goafanti.customer.bo.FollowBusinessBo;
 public interface UserMapper {
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	long countByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	int deleteByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	int insert(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	int insertSelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	List<User> selectByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	User selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	int updateByPrimaryKeySelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	int updateByPrimaryKey(User record);
 
@@ -142,7 +142,7 @@ public interface UserMapper {
 	User findUserAccountDetail(@Param("uid")String uid);
 
 	/**
-	 * 查看客户�系人列表
+	 * 查看客户�系人列�
 	 * @param uid
 	 * @return
 	 */
@@ -156,14 +156,14 @@ public interface UserMapper {
 	FollowBusinessBo findFollowById(String followId);
 
 	/**
-	 * 查询�次拜访推进的客户业务
+	 * 查询�次拜访推进的客户业�
 	 * @param followId
 	 * @return
 	 */
 	List<UserBusiness> findBusinessByFollowId(String followId);
 
 	/**
-	 * æŸ¥è¯¢å®¢æˆ·æ‰æœ‰è�”系人
+	 * 查询客户�有�系人
 	 * @param uid
 	 * @return
 	 */

+ 36 - 21
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -69,12 +69,13 @@
     <result column="patent_prory_statement_url" jdbcType="VARCHAR" property="patentProryStatementUrl" />
     <result column="international" jdbcType="INTEGER" property="international" />
     <result column="review_instructions" jdbcType="VARCHAR" property="reviewInstructions" />
+    <result column="investment" jdbcType="INTEGER" property="investment" />
   </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 Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -108,7 +109,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -142,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     id, uid, contacts, contact_mobile, fixed_tel, qq, postal_address, postcode, unit_name, 
     registered_capital, licence_number, licence_province, licence_city, licence_area, 
@@ -154,13 +155,13 @@
     legal_person_fax, legal_person_email, registration_time, ratepay_code, industry, 
     enterprise_scale, register_type, foreign_investment, field, tax_authority, ratepay_method, 
     high_tech_zone, risk_investment, business_scope, high_tech_name, patent_prory_statement_url, 
-    international, review_instructions
+    international, review_instructions, investment
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationIdentityExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     select
     <if test="distinct">
@@ -179,7 +180,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -190,7 +191,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     delete from organization_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -199,7 +200,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     delete from organization_identity
     <if test="_parameter != null">
@@ -210,7 +211,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     insert into organization_identity (id, uid, contacts, 
       contact_mobile, fixed_tel, qq, 
@@ -233,7 +234,7 @@
       tax_authority, ratepay_method, high_tech_zone, 
       risk_investment, business_scope, high_tech_name, 
       patent_prory_statement_url, international, 
-      review_instructions)
+      review_instructions, investment)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{contactMobile,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
       #{postalAddress,jdbcType=VARCHAR}, #{postcode,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, 
@@ -255,13 +256,13 @@
       #{taxAuthority,jdbcType=INTEGER}, #{ratepayMethod,jdbcType=INTEGER}, #{highTechZone,jdbcType=INTEGER}, 
       #{riskInvestment,jdbcType=INTEGER}, #{businessScope,jdbcType=VARCHAR}, #{highTechName,jdbcType=VARCHAR}, 
       #{patentProryStatementUrl,jdbcType=VARCHAR}, #{international,jdbcType=INTEGER}, 
-      #{reviewInstructions,jdbcType=VARCHAR})
+      #{reviewInstructions,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     insert into organization_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -451,6 +452,9 @@
       <if test="reviewInstructions != null">
         review_instructions,
       </if>
+      <if test="investment != null">
+        investment,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -639,13 +643,16 @@
       <if test="reviewInstructions != null">
         #{reviewInstructions,jdbcType=VARCHAR},
       </if>
+      <if test="investment != null">
+        #{investment,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.OrganizationIdentityExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     select count(*) from organization_identity
     <if test="_parameter != null">
@@ -656,7 +663,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     update organization_identity
     <set>
@@ -846,6 +853,9 @@
       <if test="record.reviewInstructions != null">
         review_instructions = #{record.reviewInstructions,jdbcType=VARCHAR},
       </if>
+      <if test="record.investment != null">
+        investment = #{record.investment,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -855,7 +865,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     update organization_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -919,7 +929,8 @@
       high_tech_name = #{record.highTechName,jdbcType=VARCHAR},
       patent_prory_statement_url = #{record.patentProryStatementUrl,jdbcType=VARCHAR},
       international = #{record.international,jdbcType=INTEGER},
-      review_instructions = #{record.reviewInstructions,jdbcType=VARCHAR}
+      review_instructions = #{record.reviewInstructions,jdbcType=VARCHAR},
+      investment = #{record.investment,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -928,7 +939,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     update organization_identity
     <set>
@@ -1115,6 +1126,9 @@
       <if test="reviewInstructions != null">
         review_instructions = #{reviewInstructions,jdbcType=VARCHAR},
       </if>
+      <if test="investment != null">
+        investment = #{investment,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -1122,7 +1136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 12 10:00:10 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     update organization_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -1185,7 +1199,8 @@
       high_tech_name = #{highTechName,jdbcType=VARCHAR},
       patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR},
       international = #{international,jdbcType=INTEGER},
-      review_instructions = #{reviewInstructions,jdbcType=VARCHAR}
+      review_instructions = #{reviewInstructions,jdbcType=VARCHAR},
+      investment = #{investment,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 	<select id="selectOrgIdentityByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -1215,7 +1230,7 @@
 		organization_identity i on u.id = i.uid 
 		where
 		i.audit_status = 5
-		 and u.lvl > 0
+		 and u.lvl &gt; 0
 		<if test="_parameter != null">
 			and u.aid = #{aid,jdbcType=VARCHAR}
 		</if>

+ 528 - 10
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -1,24 +1,542 @@
 <?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.OrganizationManagementMapper">
-	<select id="selectOrganizationList" resultType="com.goafanti.organization.bo.OrganizationListOut">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_id" jdbcType="VARCHAR" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted_sign" jdbcType="VARCHAR" property="deletedSign" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="manager_id" jdbcType="VARCHAR" property="managerId" />
+    <result column="dep_no" jdbcType="VARCHAR" property="depNo" />
+    <result column="super_id" jdbcType="VARCHAR" property="superId" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+  </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 Thu Nov 30 11:09:29 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 Thu Nov 30 11:09:29 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 Thu Nov 30 11:09:29 CST 2017.
+    -->
+    id, create_id, create_time, update_time, deleted_sign, name, type, manager_id, dep_no, 
+    super_id, remarks, status
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from organization_management
+    <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 Thu Nov 30 11:09:29 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from organization_management
+    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 Thu Nov 30 11:09:29 CST 2017.
+    -->
+    delete from organization_management
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    delete from organization_management
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    insert into organization_management (id, create_id, create_time, 
+      update_time, deleted_sign, name, 
+      type, manager_id, dep_no, 
+      super_id, remarks, status
+      )
+    values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{deletedSign,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{depNo,jdbcType=VARCHAR}, 
+      #{superId,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    insert into organization_management
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="deletedSign != null">
+        deleted_sign,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="managerId != null">
+        manager_id,
+      </if>
+      <if test="depNo != null">
+        dep_no,
+      </if>
+      <if test="superId != null">
+        super_id,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deletedSign != null">
+        #{deletedSign,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="depNo != null">
+        #{depNo,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    select count(*) from organization_management
+    <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 Thu Nov 30 11:09:29 CST 2017.
+    -->
+    update organization_management
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deletedSign != null">
+        deleted_sign = #{record.deletedSign,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.managerId != null">
+        manager_id = #{record.managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.depNo != null">
+        dep_no = #{record.depNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.superId != null">
+        super_id = #{record.superId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,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 Thu Nov 30 11:09:29 CST 2017.
+    -->
+    update organization_management
+    set id = #{record.id,jdbcType=VARCHAR},
+      create_id = #{record.createId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      deleted_sign = #{record.deletedSign,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=VARCHAR},
+      manager_id = #{record.managerId,jdbcType=VARCHAR},
+      dep_no = #{record.depNo,jdbcType=VARCHAR},
+      super_id = #{record.superId,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    update organization_management
+    <set>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deletedSign != null">
+        deleted_sign = #{deletedSign,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        manager_id = #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="depNo != null">
+        dep_no = #{depNo,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        super_id = #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    update organization_management
+    set create_id = #{createId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      deleted_sign = #{deletedSign,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      type = #{type,jdbcType=VARCHAR},
+      manager_id = #{managerId,jdbcType=VARCHAR},
+      dep_no = #{depNo,jdbcType=VARCHAR},
+      super_id = #{superId,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+	<select id="selectOrganizationList" parameterType="String" resultType="com.goafanti.organization.bo.OrganizationListOut">
 		select
-		u.id as uid,om.id,om.create_id as createId,om.create_time as createTime,
+		om.id,om.create_id as createId,om.create_time as createTime,
 		om.update_time as updateTime,om.deleted_sign as deletedSign,
 		om.name,om.type,om.manager_id as managerId,
 		om.dep_no as depNo,
 		om.super_id as superId,
-		om.desc
-		from user u
-		left join organization_management om on om.id = u.id
+		om.remarks,om.status
+		from organization_management om 
+		where
+		om.deleted_sign = '0'
+		<if test="name !=null">
+			AND om.name=#{name,jdbcType=VARCHAR}
+		</if>
+		<if test="superId !=null">
+			AND om.super_id=#{superId,jdbcType=VARCHAR}
+		</if>
+		<if test="type !=null">
+			AND om.type=#{type,jdbcType=VARCHAR}
+		</if>
+		<if test="depNo !=null">
+			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
+		</if>
+		<if test="page_sql != null">
+    		${page_sql}
+   		</if>
 	</select>
 	<select id="selectOrganizationCount" resultType="java.lang.Integer">
 		select
 		count(0)
-		from 
-		(select
-		id
-		from idorganization_management
-		)	
+		from organization_management om
+		where
+		om.deleted_sign='0'
+		<if test="name !=null">
+			AND om.name=#{name,jdbcType=VARCHAR}
+		</if>
+		<if test="superId !=null">
+			AND om.super_id=#{superId,jdbcType=VARCHAR}
+		</if>
+		<if test="type !=null">
+			AND om.type=#{type,jdbcType=VARCHAR}
+		</if>
+		<if test="depNo !=null">
+			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
+		</if>	
 	</select>
+	<select id="selectSuperId" resultType="com.goafanti.organization.bo.OrganizationListOut">
+		select
+		id,name,dep_no as depNo
+		from organization_management
+		where
+		status ='0'
+	</select>
+	<insert id="insert1" parameterType="com.goafanti.organization.bo.OrganizationListOut">
+		insert into organization_management(
+		id,create_id,create_time,update_time,deleted_sign,
+		name,type,manager_id,dep_no,super_id,desc,status)
+		values(#{id,jdbcType=VARCHAR},#{createId,jdbcType=VARCHAR},
+		#{createTime,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR},
+		#{deletedSign,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},
+		#{type,jdbcType=VARCHAR},#{managerId,jdbcType=VARCHAR},
+		#{depNo,jdbcType=VARCHAR},#{superId,jdbcType=VARCHAR},
+		#{desc,jdbcType=VARCHAR},#{status,jdbcType=VARCHAR})	
+	</insert>
+	<select id="selectDepNoByName" resultType="String">
+		select
+		dep_no as depNo
+		from organization_management
+		where
+		name=#{name,jdbcType=VARCHAR}
+	</select>
+	<select id="selectDepNoCount" parameterType="String" resultType="java.lang.Integer">
+		select
+		count(0)
+		from organization_management
+		where
+		<!-- dep_no like concat(#{depNo,jdbcType=VARCHAR},'%') -->
+		super_id=#{superId,jdbcType=VARCHAR}
+	</select>
+	<select id="selectName" resultType="com.goafanti.admin.bo.AdminListBo">
+		select
+		name
+		from admin
+		where
+		name  like concat('%',#{name,jdbcType=VARCHAR},'%')
+	</select>
+	<select id="selectAllById" resultType="com.goafanti.organization.bo.OrganizationListOut">
+		select
+		id,create_id as createId,create_time as createTime,
+		update_time as updateTime,deleted_sign as deletedSign,
+		name,type,manager_id as managerId,
+		dep_no as depNo,
+		super_id as superId,
+		remarks,status
+		from organization_management
+		where 
+		id=#{id,jdbcType=VARCHAR}
+	</select>
+	<delete id="deleteById" parameterType="java.lang.String">
+	    delete from organization_management
+	    where id = #{id,jdbcType=VARCHAR}
+  	</delete>
+  	<select id="selectAdminNameById" parameterType="java.lang.String" resultType="java.lang.String">
+  		select 
+  		name
+  		from admin
+  		where 
+  		id=#{id,jdbcType=VARCHAR}
+  	</select>
+  	<select id="selectIdByDepNo" parameterType="java.lang.String" resultType="java.lang.String">
+  		select
+  		id
+  		from organization_management
+  		where
+  		dep_no=#{depNo,jdbcType=VARCHAR}
+  	</select>
+  	<select id="selectIDNBySuperId" parameterType="java.lang.String" resultType="com.goafanti.organization.bo.OrganizationListOut">
+  		select
+  		id,create_id as createId,create_time as createTime,
+		update_time as updateTime,deleted_sign as deletedSign,
+		name,type,manager_id as managerId,
+		dep_no as depNo,
+		super_id as superId,
+		remarks,status
+  		from organization_management 		
+  		where
+  		super_id=#{superId,jdbcType=VARCHAR}
+  		order by dep_no
+  	</select>
+  	<update id="updateByNumber" parameterType="com.goafanti.organization.bo.OrganizationListOut">
+  		update organization_management
+	    <set>
+	    	dep_no = #{depNo,jdbcType=VARCHAR}
+	    </set>
+	    where
+	    id=#{id,jdbcType=VARCHAR}
+  	</update>
+  	<select id="selectCountBySuperId" parameterType="String" resultType="java.lang.Integer">
+  		select
+		count(0)
+		from organization_management
+		where
+		super_id=#{superId,jdbcType=VARCHAR}
+  	</select>
 </mapper>

+ 115 - 20
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -39,12 +39,18 @@
     <result column="industry" jdbcType="INTEGER" property="industry" />
     <result column="contacts" jdbcType="VARCHAR" property="contacts" />
     <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="professional_title" jdbcType="VARCHAR" property="professionalTitle" />
+    <result column="work_unit" jdbcType="VARCHAR" property="workUnit" />
+    <result column="education" jdbcType="VARCHAR" property="education" />
+    <result column="major_category" jdbcType="VARCHAR" property="majorCategory" />
+    <result column="qualification" jdbcType="VARCHAR" property="qualification" />
+    <result column="investment" jdbcType="INTEGER" property="investment" />
   </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 Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -78,7 +84,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -112,19 +118,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     id, uid, username, sex, date_of_birth_year, date_of_birth_month, id_number, positive_id_url, 
     opposite_id_url, province, city, area, contact_mobile, bank_name, bank_account, bank_card_number, 
     amount_money, audit_status, process, wrong_count, payment_date, expert, celebrity, 
     international, fixed_tel, qq, postal_address, postcode, review_instructions, industry, 
-    contacts, email
+    contacts, email, professional_title, work_unit, education, major_category, qualification, 
+    investment
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     select
     <if test="distinct">
@@ -143,7 +150,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -154,7 +161,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     delete from user_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -163,7 +170,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     delete from user_identity
     <if test="_parameter != null">
@@ -174,7 +181,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     insert into user_identity (id, uid, username, 
       sex, date_of_birth_year, date_of_birth_month, 
@@ -186,7 +193,9 @@
       expert, celebrity, international, 
       fixed_tel, qq, postal_address, 
       postcode, review_instructions, industry, 
-      contacts, email)
+      contacts, email, professional_title, 
+      work_unit, education, major_category, 
+      qualification, investment)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
       #{sex,jdbcType=VARCHAR}, #{dateOfBirthYear,jdbcType=VARCHAR}, #{dateOfBirthMonth,jdbcType=VARCHAR}, 
       #{idNumber,jdbcType=VARCHAR}, #{positiveIdUrl,jdbcType=VARCHAR}, #{oppositeIdUrl,jdbcType=VARCHAR}, 
@@ -197,13 +206,15 @@
       #{expert,jdbcType=INTEGER}, #{celebrity,jdbcType=INTEGER}, #{international,jdbcType=INTEGER}, 
       #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, #{postalAddress,jdbcType=VARCHAR}, 
       #{postcode,jdbcType=VARCHAR}, #{reviewInstructions,jdbcType=VARCHAR}, #{industry,jdbcType=INTEGER}, 
-      #{contacts,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR})
+      #{contacts,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{professionalTitle,jdbcType=VARCHAR}, 
+      #{workUnit,jdbcType=VARCHAR}, #{education,jdbcType=VARCHAR}, #{majorCategory,jdbcType=VARCHAR}, 
+      #{qualification,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserIdentity">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     insert into user_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -303,6 +314,24 @@
       <if test="email != null">
         email,
       </if>
+      <if test="professionalTitle != null">
+        professional_title,
+      </if>
+      <if test="workUnit != null">
+        work_unit,
+      </if>
+      <if test="education != null">
+        education,
+      </if>
+      <if test="majorCategory != null">
+        major_category,
+      </if>
+      <if test="qualification != null">
+        qualification,
+      </if>
+      <if test="investment != null">
+        investment,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -401,13 +430,31 @@
       <if test="email != null">
         #{email,jdbcType=VARCHAR},
       </if>
+      <if test="professionalTitle != null">
+        #{professionalTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="workUnit != null">
+        #{workUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null">
+        #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="majorCategory != null">
+        #{majorCategory,jdbcType=VARCHAR},
+      </if>
+      <if test="qualification != null">
+        #{qualification,jdbcType=VARCHAR},
+      </if>
+      <if test="investment != null">
+        #{investment,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     select count(*) from user_identity
     <if test="_parameter != null">
@@ -418,7 +465,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     update user_identity
     <set>
@@ -518,6 +565,24 @@
       <if test="record.email != null">
         email = #{record.email,jdbcType=VARCHAR},
       </if>
+      <if test="record.professionalTitle != null">
+        professional_title = #{record.professionalTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.workUnit != null">
+        work_unit = #{record.workUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.education != null">
+        education = #{record.education,jdbcType=VARCHAR},
+      </if>
+      <if test="record.majorCategory != null">
+        major_category = #{record.majorCategory,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qualification != null">
+        qualification = #{record.qualification,jdbcType=VARCHAR},
+      </if>
+      <if test="record.investment != null">
+        investment = #{record.investment,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -527,7 +592,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     update user_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -561,7 +626,13 @@
       review_instructions = #{record.reviewInstructions,jdbcType=VARCHAR},
       industry = #{record.industry,jdbcType=INTEGER},
       contacts = #{record.contacts,jdbcType=VARCHAR},
-      email = #{record.email,jdbcType=VARCHAR}
+      email = #{record.email,jdbcType=VARCHAR},
+      professional_title = #{record.professionalTitle,jdbcType=VARCHAR},
+      work_unit = #{record.workUnit,jdbcType=VARCHAR},
+      education = #{record.education,jdbcType=VARCHAR},
+      major_category = #{record.majorCategory,jdbcType=VARCHAR},
+      qualification = #{record.qualification,jdbcType=VARCHAR},
+      investment = #{record.investment,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -570,7 +641,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     update user_identity
     <set>
@@ -667,6 +738,24 @@
       <if test="email != null">
         email = #{email,jdbcType=VARCHAR},
       </if>
+      <if test="professionalTitle != null">
+        professional_title = #{professionalTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="workUnit != null">
+        work_unit = #{workUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null">
+        education = #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="majorCategory != null">
+        major_category = #{majorCategory,jdbcType=VARCHAR},
+      </if>
+      <if test="qualification != null">
+        qualification = #{qualification,jdbcType=VARCHAR},
+      </if>
+      <if test="investment != null">
+        investment = #{investment,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -674,7 +763,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 25 15:28:31 CST 2017.
+      This element was generated on Thu Nov 30 17:32:28 CST 2017.
     -->
     update user_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -707,7 +796,13 @@
       review_instructions = #{reviewInstructions,jdbcType=VARCHAR},
       industry = #{industry,jdbcType=INTEGER},
       contacts = #{contacts,jdbcType=VARCHAR},
-      email = #{email,jdbcType=VARCHAR}
+      email = #{email,jdbcType=VARCHAR},
+      professional_title = #{professionalTitle,jdbcType=VARCHAR},
+      work_unit = #{workUnit,jdbcType=VARCHAR},
+      education = #{education,jdbcType=VARCHAR},
+      major_category = #{majorCategory,jdbcType=VARCHAR},
+      qualification = #{qualification,jdbcType=VARCHAR},
+      investment = #{investment,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  

+ 44 - 60
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
@@ -25,8 +25,6 @@
     <result column="head_portrait_url" jdbcType="VARCHAR" property="headPortraitUrl" />
     <result column="society_tag" jdbcType="VARCHAR" property="societyTag" />
     <result column="introduction" jdbcType="VARCHAR" property="introduction" />
-    <result column="service_certification" jdbcType="INTEGER" property="serviceCertification" />
-    <result column="user_certification" jdbcType="INTEGER" property="userCertification" />
     <result column="last_member_order_id" jdbcType="VARCHAR" property="lastMemberOrderId" />
     <result column="current_member_status" jdbcType="INTEGER" property="currentMemberStatus" />
     <result column="value_added_tag" jdbcType="VARCHAR" property="valueAddedTag" />
@@ -34,12 +32,13 @@
     <result column="share_type" jdbcType="INTEGER" property="shareType" />
     <result column="identify_name" jdbcType="VARCHAR" property="identifyName" />
     <result column="is_member" jdbcType="INTEGER" property="isMember" />
+    <result column="business_audit" jdbcType="INTEGER" property="businessAudit" />
   </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 Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -73,7 +72,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -107,18 +106,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     id, mobile, password, nickname, email, create_time, number, lvl, type, aid, mid, 
     status, source, update_time, company_logo_url, head_portrait_url, society_tag, introduction, 
-    service_certification, user_certification, last_member_order_id, current_member_status, 
-    value_added_tag, organization_id, share_type, identify_name, is_member
+    last_member_order_id, current_member_status, value_added_tag, organization_id, share_type, 
+    identify_name, is_member, business_audit
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     select
     <if test="distinct">
@@ -137,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -148,7 +147,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     delete from user
     where id = #{id,jdbcType=VARCHAR}
@@ -157,7 +156,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     delete from user
     <if test="_parameter != null">
@@ -168,32 +167,32 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     insert into user (id, mobile, password, 
       nickname, email, create_time, 
       number, lvl, type, aid, 
       mid, status, source, 
       update_time, company_logo_url, head_portrait_url, 
-      society_tag, introduction, service_certification, 
-      user_certification, last_member_order_id, current_member_status, 
-      value_added_tag, organization_id, share_type, 
-      identify_name, is_member)
+      society_tag, introduction, last_member_order_id, 
+      current_member_status, value_added_tag, organization_id, 
+      share_type, identify_name, is_member, 
+      business_audit)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=BIGINT}, #{lvl,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
       #{mid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{source,jdbcType=INTEGER}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{companyLogoUrl,jdbcType=VARCHAR}, #{headPortraitUrl,jdbcType=VARCHAR}, 
-      #{societyTag,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{serviceCertification,jdbcType=INTEGER}, 
-      #{userCertification,jdbcType=INTEGER}, #{lastMemberOrderId,jdbcType=VARCHAR}, #{currentMemberStatus,jdbcType=INTEGER}, 
-      #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, #{shareType,jdbcType=INTEGER}, 
-      #{identifyName,jdbcType=VARCHAR}, #{isMember,jdbcType=INTEGER})
+      #{societyTag,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{lastMemberOrderId,jdbcType=VARCHAR}, 
+      #{currentMemberStatus,jdbcType=INTEGER}, #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, 
+      #{shareType,jdbcType=INTEGER}, #{identifyName,jdbcType=VARCHAR}, #{isMember,jdbcType=INTEGER}, 
+      #{businessAudit,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     insert into user
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -251,12 +250,6 @@
       <if test="introduction != null">
         introduction,
       </if>
-      <if test="serviceCertification != null">
-        service_certification,
-      </if>
-      <if test="userCertification != null">
-        user_certification,
-      </if>
       <if test="lastMemberOrderId != null">
         last_member_order_id,
       </if>
@@ -278,6 +271,9 @@
       <if test="isMember != null">
         is_member,
       </if>
+      <if test="businessAudit != null">
+        business_audit,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -334,12 +330,6 @@
       <if test="introduction != null">
         #{introduction,jdbcType=VARCHAR},
       </if>
-      <if test="serviceCertification != null">
-        #{serviceCertification,jdbcType=INTEGER},
-      </if>
-      <if test="userCertification != null">
-        #{userCertification,jdbcType=INTEGER},
-      </if>
       <if test="lastMemberOrderId != null">
         #{lastMemberOrderId,jdbcType=VARCHAR},
       </if>
@@ -361,13 +351,16 @@
       <if test="isMember != null">
         #{isMember,jdbcType=INTEGER},
       </if>
+      <if test="businessAudit != null">
+        #{businessAudit,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.UserExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     select count(*) from user
     <if test="_parameter != null">
@@ -378,7 +371,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     update user
     <set>
@@ -436,12 +429,6 @@
       <if test="record.introduction != null">
         introduction = #{record.introduction,jdbcType=VARCHAR},
       </if>
-      <if test="record.serviceCertification != null">
-        service_certification = #{record.serviceCertification,jdbcType=INTEGER},
-      </if>
-      <if test="record.userCertification != null">
-        user_certification = #{record.userCertification,jdbcType=INTEGER},
-      </if>
       <if test="record.lastMemberOrderId != null">
         last_member_order_id = #{record.lastMemberOrderId,jdbcType=VARCHAR},
       </if>
@@ -463,6 +450,9 @@
       <if test="record.isMember != null">
         is_member = #{record.isMember,jdbcType=INTEGER},
       </if>
+      <if test="record.businessAudit != null">
+        business_audit = #{record.businessAudit,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -472,7 +462,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     update user
     set id = #{record.id,jdbcType=VARCHAR},
@@ -493,15 +483,14 @@
       head_portrait_url = #{record.headPortraitUrl,jdbcType=VARCHAR},
       society_tag = #{record.societyTag,jdbcType=VARCHAR},
       introduction = #{record.introduction,jdbcType=VARCHAR},
-      service_certification = #{record.serviceCertification,jdbcType=INTEGER},
-      user_certification = #{record.userCertification,jdbcType=INTEGER},
       last_member_order_id = #{record.lastMemberOrderId,jdbcType=VARCHAR},
       current_member_status = #{record.currentMemberStatus,jdbcType=INTEGER},
       value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       share_type = #{record.shareType,jdbcType=INTEGER},
       identify_name = #{record.identifyName,jdbcType=VARCHAR},
-      is_member = #{record.isMember,jdbcType=INTEGER}
+      is_member = #{record.isMember,jdbcType=INTEGER},
+      business_audit = #{record.businessAudit,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -510,7 +499,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     update user
     <set>
@@ -565,12 +554,6 @@
       <if test="introduction != null">
         introduction = #{introduction,jdbcType=VARCHAR},
       </if>
-      <if test="serviceCertification != null">
-        service_certification = #{serviceCertification,jdbcType=INTEGER},
-      </if>
-      <if test="userCertification != null">
-        user_certification = #{userCertification,jdbcType=INTEGER},
-      </if>
       <if test="lastMemberOrderId != null">
         last_member_order_id = #{lastMemberOrderId,jdbcType=VARCHAR},
       </if>
@@ -592,6 +575,9 @@
       <if test="isMember != null">
         is_member = #{isMember,jdbcType=INTEGER},
       </if>
+      <if test="businessAudit != null">
+        business_audit = #{businessAudit,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -599,7 +585,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     update user
     set mobile = #{mobile,jdbcType=VARCHAR},
@@ -619,15 +605,14 @@
       head_portrait_url = #{headPortraitUrl,jdbcType=VARCHAR},
       society_tag = #{societyTag,jdbcType=VARCHAR},
       introduction = #{introduction,jdbcType=VARCHAR},
-      service_certification = #{serviceCertification,jdbcType=INTEGER},
-      user_certification = #{userCertification,jdbcType=INTEGER},
       last_member_order_id = #{lastMemberOrderId,jdbcType=VARCHAR},
       current_member_status = #{currentMemberStatus,jdbcType=INTEGER},
       value_added_tag = #{valueAddedTag,jdbcType=VARCHAR},
       organization_id = #{organizationId,jdbcType=VARCHAR},
       share_type = #{shareType,jdbcType=INTEGER},
       identify_name = #{identifyName,jdbcType=VARCHAR},
-      is_member = #{isMember,jdbcType=INTEGER}
+      is_member = #{isMember,jdbcType=INTEGER},
+      business_audit = #{businessAudit,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  
@@ -663,14 +648,13 @@
   <select id="selectUserPageHomeBoByUserId" parameterType="java.lang.String" resultMap="UserPageHomeBo">
    select 
    		u.lvl,mg.grade_name , u.nickname, u.email,
-   		u.number, u.type, i.person_portrait_url, 
+   		u.number, u.type, u.person_portrait_url, 
    		o.logo_url , u.id as uid, adc.achievement_count as achievementNum,
    		adc.demand_count as demandNum
    from user u 
-   LEFT JOIN user_info  i on u.id = i.uid 
    LEFT JOIN organization_info o on u.id = o.uid 
    LEFT JOIN achievement_demand_count adc on adc.uid = u.id
-   LEFT JOIN   member_grade mg ON mg.member_rank=u.lvl
+   LEFT JOIN  member_grade mg ON mg.member_rank=u.lvl
    where u.id = #{uid,jdbcType = VARCHAR}
   </select>
   

+ 38 - 35
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -7,9 +7,7 @@
 			a.type,
 			a.status, 
 			date_format(a.create_time,'%Y-%m-%d %H:%i:%s') as createTime,
-			a.service_certification as serviceCertification,
-			a.user_certification as userCertification,
-			a.current_member_status as currentMemberStatus,
+			a.business_audit as businessAudit,
 			a.identify_name as name,
 			a.lvl,a.is_member as isMember,
 			a.society_tag as societyTag,
@@ -19,6 +17,7 @@
 			b.international,
 			b.expert,
 			b.celebrity,
+			b.audit_status as auditStatus,
 			dg1.name as province,
 			dg2.name as city, 
 			dg3.name as area,
@@ -29,8 +28,7 @@
 			type,
 			status,
 			create_time,
-			service_certification,
-			user_certification,
+			businessAudit,
 			current_member_status,
 			identify_name,
 			lvl,
@@ -51,11 +49,8 @@
 		<if test="status != null">
 			and status = #{status,jdbcType=INTEGER}
 		</if>
-		<if test="serviceCertification != null">
-			and service_certification = #{serviceCertification,jdbcType=INTEGER}
-		</if>
-		<if test="userCertification != null">
-			and user_certification = #{userCertification,jdbcType=INTEGER}
+		<if test="businessAudit != null">
+			and business_audit = #{businessAudit,jdbcType=INTEGER}
 		</if>
 		<if test="isMember != null">
 			and is_member = #{isMember,jdbcType=INTEGER}
@@ -102,6 +97,9 @@
 		<if test="international != null">
 			and b.international = #{international,jdbcType=INTEGER}
 		</if>
+		<if test="auditStatus != null">
+			and b.audit_status = #{auditStatus,jdbcType=INTEGER}
+		</if>
 			order by a.create_time desc 
 		 <if test="page_sql != null">
     		${page_sql}
@@ -127,11 +125,8 @@
 		<if test="status != null">
 			and status = #{status,jdbcType=INTEGER}
 		</if>
-		<if test="serviceCertification != null">
-			and service_certification = #{serviceCertification,jdbcType=INTEGER}
-		</if>
-		<if test="userCertification != null">
-			and user_certification = #{userCertification,jdbcType=INTEGER}
+		<if test="businessAudit != null">
+			and business_audit = #{businessAudit,jdbcType=INTEGER}
 		</if>
 		<if test="isMember != null">
 			and is_member = #{isMember,jdbcType=INTEGER}
@@ -174,6 +169,9 @@
 		<if test="international != null">
 			and b.international = #{international,jdbcType=INTEGER}
 		</if>
+		<if test="auditStatus != null">
+			and b.audit_status = #{auditStatus,jdbcType=INTEGER}
+		</if>
 	</select>
 	<select id="selectOrganizationCustomerList" resultType="com.goafanti.customer.bo.CustomerListOut">
 		select
@@ -181,8 +179,7 @@
 			a.type,
 			a.status, 
 			date_format(a.create_time,'%Y-%m-%d %H:%i:%s') as createTime,
-			a.service_certification as serviceCertification,
-			a.user_certification as userCertification,
+			a.business_audit as businessAudit,
 			a.current_member_status as currentMemberStatus,
 			a.identify_name as name,
 			a.lvl,
@@ -194,6 +191,7 @@
 			b.international,
 			b.listed,
 			b.high_tech_zone as highTechZone,
+			b.audit_status as auditStatus,
 			dg1.name as province,
 			dg2.name as city, 
 			dg3.name as area,
@@ -204,8 +202,7 @@
 			type,
 			status,
 			create_time,
-			service_certification,
-			user_certification,
+			business_audit,
 			current_member_status,
 			identify_name,lvl,
 			is_member,
@@ -225,12 +222,9 @@
 		<if test="status != null">
 			and status = #{status,jdbcType=INTEGER}
 		</if>
-		<if test="serviceCertification != null">
-			and service_certification = #{serviceCertification,jdbcType=INTEGER}
-		</if>
-		<if test="userCertification != null">
-			and user_certification = #{userCertification,jdbcType=INTEGER}
-		</if>
+		<if test="businessAudit != null">
+      		and business_audit = #{businessAudit,jdbcType=INTEGER}
+   		</if>
 		<if test="isMember != null">
 			and is_member = #{isMember,jdbcType=INTEGER}
 		</if>
@@ -276,6 +270,9 @@
 		<if test="international != null">
 			and b.international = #{international,jdbcType=INTEGER}
 		</if>
+		<if test="auditStatus != null">
+      		and b.audit_status = #{auditStatus,jdbcType=INTEGER}
+   		 </if>
 			order by a.create_time desc 
 		 <if test="page_sql != null">
     		${page_sql}
@@ -301,12 +298,9 @@
 		<if test="status != null">
 			and status = #{status,jdbcType=INTEGER}
 		</if>
-		<if test="serviceCertification != null">
-			and service_certification = #{serviceCertification,jdbcType=INTEGER}
-		</if>
-		<if test="userCertification != null">
-			and user_certification = #{userCertification,jdbcType=INTEGER}
-		</if>
+		<if test="businessAudit != null">
+      		and business_audit = #{businessAudit,jdbcType=INTEGER}
+   		</if>
 		<if test="currentMemberStatus != null">
 			and current_member_status = #{currentMemberStatus,jdbcType=INTEGER}
 		</if>
@@ -345,6 +339,9 @@
 		<if test="international != null">
 			and b.international = #{international,jdbcType=INTEGER}
 		</if>
+		<if test="auditStatus != null">
+     		and b.audit_status = #{auditStatus,jdbcType=INTEGER}
+    	</if>
 	</select>
 	
 	<select id="findCustomerByName" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
@@ -385,7 +382,8 @@
 			b.business_scope as businessScope,
 			b.id,
 			b.contacts,
-			b.contact_mobile as contactMobile
+			b.contact_mobile as contactMobile,
+			b.investment
 		from 
 		(select 
 			id,
@@ -427,7 +425,13 @@
 			b.international,
 			b.contacts,
 			b.contact_mobile as contactMobile,
-			b.qq
+			b.qq,
+			b.professional_title as professionalTitle,
+			b.work_unit as workUnit,
+			b.education,
+			b.major_category as majorCategory,
+			b.qualification,
+			b.investment
 		from
 			(
 				select
@@ -512,8 +516,7 @@
 			is_member as isMember,
 			lvl,
 			current_member_status currentMemberStatus,
-			service_certification as  serviceCertification,
-			user_certification as userCertification,
+			business_audit as businessAudit,
 			identify_name as identifyName,
 			status
 		from

File diff suppressed because it is too large
+ 209 - 186
src/main/java/com/goafanti/common/model/OrganizationIdentity.java


+ 76 - 16
src/main/java/com/goafanti/common/model/OrganizationIdentityExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class OrganizationIdentityExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public OrganizationIdentityExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -4243,11 +4243,71 @@ public class OrganizationIdentityExample {
 			addCriterion("review_instructions not between", value1, value2, "reviewInstructions");
 			return (Criteria) this;
 		}
+
+		public Criteria andInvestmentIsNull() {
+			addCriterion("investment is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentIsNotNull() {
+			addCriterion("investment is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentEqualTo(Integer value) {
+			addCriterion("investment =", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentNotEqualTo(Integer value) {
+			addCriterion("investment <>", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentGreaterThan(Integer value) {
+			addCriterion("investment >", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentGreaterThanOrEqualTo(Integer value) {
+			addCriterion("investment >=", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentLessThan(Integer value) {
+			addCriterion("investment <", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentLessThanOrEqualTo(Integer value) {
+			addCriterion("investment <=", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentIn(List<Integer> values) {
+			addCriterion("investment in", values, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentNotIn(List<Integer> values) {
+			addCriterion("investment not in", values, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentBetween(Integer value1, Integer value2) {
+			addCriterion("investment between", value1, value2, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentNotBetween(Integer value1, Integer value2) {
+			addCriterion("investment not between", value1, value2, "investment");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table organization_identity
-	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 283 - 0
src/main/java/com/goafanti/common/model/OrganizationManagement.java

@@ -0,0 +1,283 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class OrganizationManagement {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.create_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String createId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.create_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.update_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private Date updateTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.deleted_sign
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String deletedSign;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.name
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String name;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.type
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.manager_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String managerId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.dep_no
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String depNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.super_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String superId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.remarks
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.status
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String status;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.id
+	 * @return  the value of organization_management.id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.id
+	 * @param id  the value for organization_management.id
+	 * @mbg.generated  Thu Nov 30 11:09:29 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 organization_management.create_id
+	 * @return  the value of organization_management.create_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getCreateId() {
+		return createId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.create_id
+	 * @param createId  the value for organization_management.create_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.create_time
+	 * @return  the value of organization_management.create_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.create_time
+	 * @param createTime  the value for organization_management.create_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.update_time
+	 * @return  the value of organization_management.update_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.update_time
+	 * @param updateTime  the value for organization_management.update_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.deleted_sign
+	 * @return  the value of organization_management.deleted_sign
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getDeletedSign() {
+		return deletedSign;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.deleted_sign
+	 * @param deletedSign  the value for organization_management.deleted_sign
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setDeletedSign(String deletedSign) {
+		this.deletedSign = deletedSign;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.name
+	 * @return  the value of organization_management.name
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.name
+	 * @param name  the value for organization_management.name
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.type
+	 * @return  the value of organization_management.type
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.type
+	 * @param type  the value for organization_management.type
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.manager_id
+	 * @return  the value of organization_management.manager_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getManagerId() {
+		return managerId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.manager_id
+	 * @param managerId  the value for organization_management.manager_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setManagerId(String managerId) {
+		this.managerId = managerId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.dep_no
+	 * @return  the value of organization_management.dep_no
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getDepNo() {
+		return depNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.dep_no
+	 * @param depNo  the value for organization_management.dep_no
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setDepNo(String depNo) {
+		this.depNo = depNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.super_id
+	 * @return  the value of organization_management.super_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getSuperId() {
+		return superId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.super_id
+	 * @param superId  the value for organization_management.super_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.remarks
+	 * @return  the value of organization_management.remarks
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.remarks
+	 * @param remarks  the value for organization_management.remarks
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.status
+	 * @return  the value of organization_management.status
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.status
+	 * @param status  the value for organization_management.status
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setStatus(String status) {
+		this.status = status;
+	}
+}

File diff suppressed because it is too large
+ 1082 - 0
src/main/java/com/goafanti/common/model/OrganizationManagementExample.java


+ 98 - 121
src/main/java/com/goafanti/common/model/User.java

@@ -5,144 +5,139 @@ import java.util.Date;
 public class User implements AftUser{
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mobile
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.password
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String password;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.nickname
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String nickname;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.email
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.create_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.number
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Long number;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.lvl
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Integer lvl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.aid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String mid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.status
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.source
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Integer source;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.update_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.company_logo_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String companyLogoUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.head_portrait_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String headPortraitUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.society_tag
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String societyTag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.introduction
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String introduction;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.service_certification
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private Integer serviceCertification;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.user_certification
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private Integer userCertification;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.last_member_order_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String lastMemberOrderId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.current_member_status
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Integer currentMemberStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.value_added_tag
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String valueAddedTag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.organization_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String organizationId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.share_type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Integer shareType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.identify_name
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private String identifyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.is_member
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	private Integer isMember;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.business_audit
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
+	 */
+	private Integer businessAudit;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.id
 	 * @return  the value of user.id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -151,7 +146,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.id
 	 * @param id  the value for user.id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -160,7 +155,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mobile
 	 * @return  the value of user.mobile
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getMobile() {
 		return mobile;
@@ -169,7 +164,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.mobile
 	 * @param mobile  the value for user.mobile
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -178,7 +173,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.password
 	 * @return  the value of user.password
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getPassword() {
 		return password;
@@ -187,7 +182,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.password
 	 * @param password  the value for user.password
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setPassword(String password) {
 		this.password = password;
@@ -196,7 +191,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.nickname
 	 * @return  the value of user.nickname
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getNickname() {
 		return nickname;
@@ -205,7 +200,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.nickname
 	 * @param nickname  the value for user.nickname
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setNickname(String nickname) {
 		this.nickname = nickname;
@@ -214,7 +209,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.email
 	 * @return  the value of user.email
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -223,7 +218,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.email
 	 * @param email  the value for user.email
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -232,7 +227,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.create_time
 	 * @return  the value of user.create_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -241,7 +236,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.create_time
 	 * @param createTime  the value for user.create_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -250,7 +245,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.number
 	 * @return  the value of user.number
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Long getNumber() {
 		return number;
@@ -259,7 +254,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.number
 	 * @param number  the value for user.number
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setNumber(Long number) {
 		this.number = number;
@@ -268,7 +263,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.lvl
 	 * @return  the value of user.lvl
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Integer getLvl() {
 		return lvl;
@@ -277,7 +272,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.lvl
 	 * @param lvl  the value for user.lvl
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
@@ -286,7 +281,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.type
 	 * @return  the value of user.type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Integer getType() {
 		return type;
@@ -295,7 +290,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.type
 	 * @param type  the value for user.type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -304,7 +299,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.aid
 	 * @return  the value of user.aid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getAid() {
 		return aid;
@@ -313,7 +308,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.aid
 	 * @param aid  the value for user.aid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -322,7 +317,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mid
 	 * @return  the value of user.mid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getMid() {
 		return mid;
@@ -331,7 +326,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.mid
 	 * @param mid  the value for user.mid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setMid(String mid) {
 		this.mid = mid;
@@ -340,7 +335,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.status
 	 * @return  the value of user.status
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Integer getStatus() {
 		return status;
@@ -349,7 +344,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.status
 	 * @param status  the value for user.status
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -358,7 +353,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.source
 	 * @return  the value of user.source
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Integer getSource() {
 		return source;
@@ -367,7 +362,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.source
 	 * @param source  the value for user.source
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setSource(Integer source) {
 		this.source = source;
@@ -376,7 +371,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.update_time
 	 * @return  the value of user.update_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -385,7 +380,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.update_time
 	 * @param updateTime  the value for user.update_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -394,7 +389,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.company_logo_url
 	 * @return  the value of user.company_logo_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getCompanyLogoUrl() {
 		return companyLogoUrl;
@@ -403,7 +398,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.company_logo_url
 	 * @param companyLogoUrl  the value for user.company_logo_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setCompanyLogoUrl(String companyLogoUrl) {
 		this.companyLogoUrl = companyLogoUrl;
@@ -412,7 +407,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.head_portrait_url
 	 * @return  the value of user.head_portrait_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getHeadPortraitUrl() {
 		return headPortraitUrl;
@@ -421,7 +416,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.head_portrait_url
 	 * @param headPortraitUrl  the value for user.head_portrait_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setHeadPortraitUrl(String headPortraitUrl) {
 		this.headPortraitUrl = headPortraitUrl;
@@ -430,7 +425,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.society_tag
 	 * @return  the value of user.society_tag
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getSocietyTag() {
 		return societyTag;
@@ -439,7 +434,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.society_tag
 	 * @param societyTag  the value for user.society_tag
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setSocietyTag(String societyTag) {
 		this.societyTag = societyTag;
@@ -448,7 +443,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.introduction
 	 * @return  the value of user.introduction
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getIntroduction() {
 		return introduction;
@@ -457,52 +452,16 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.introduction
 	 * @param introduction  the value for user.introduction
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setIntroduction(String introduction) {
 		this.introduction = introduction;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.service_certification
-	 * @return  the value of user.service_certification
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public Integer getServiceCertification() {
-		return serviceCertification;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.service_certification
-	 * @param serviceCertification  the value for user.service_certification
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setServiceCertification(Integer serviceCertification) {
-		this.serviceCertification = serviceCertification;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.user_certification
-	 * @return  the value of user.user_certification
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public Integer getUserCertification() {
-		return userCertification;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.user_certification
-	 * @param userCertification  the value for user.user_certification
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setUserCertification(Integer userCertification) {
-		this.userCertification = userCertification;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.last_member_order_id
 	 * @return  the value of user.last_member_order_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getLastMemberOrderId() {
 		return lastMemberOrderId;
@@ -511,7 +470,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.last_member_order_id
 	 * @param lastMemberOrderId  the value for user.last_member_order_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setLastMemberOrderId(String lastMemberOrderId) {
 		this.lastMemberOrderId = lastMemberOrderId;
@@ -520,7 +479,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.current_member_status
 	 * @return  the value of user.current_member_status
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Integer getCurrentMemberStatus() {
 		return currentMemberStatus;
@@ -529,7 +488,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.current_member_status
 	 * @param currentMemberStatus  the value for user.current_member_status
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setCurrentMemberStatus(Integer currentMemberStatus) {
 		this.currentMemberStatus = currentMemberStatus;
@@ -538,7 +497,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.value_added_tag
 	 * @return  the value of user.value_added_tag
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getValueAddedTag() {
 		return valueAddedTag;
@@ -547,7 +506,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.value_added_tag
 	 * @param valueAddedTag  the value for user.value_added_tag
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setValueAddedTag(String valueAddedTag) {
 		this.valueAddedTag = valueAddedTag;
@@ -556,7 +515,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.organization_id
 	 * @return  the value of user.organization_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getOrganizationId() {
 		return organizationId;
@@ -565,7 +524,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.organization_id
 	 * @param organizationId  the value for user.organization_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setOrganizationId(String organizationId) {
 		this.organizationId = organizationId;
@@ -574,7 +533,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.share_type
 	 * @return  the value of user.share_type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Integer getShareType() {
 		return shareType;
@@ -583,7 +542,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.share_type
 	 * @param shareType  the value for user.share_type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setShareType(Integer shareType) {
 		this.shareType = shareType;
@@ -592,7 +551,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.identify_name
 	 * @return  the value of user.identify_name
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getIdentifyName() {
 		return identifyName;
@@ -601,7 +560,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.identify_name
 	 * @param identifyName  the value for user.identify_name
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setIdentifyName(String identifyName) {
 		this.identifyName = identifyName;
@@ -610,7 +569,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.is_member
 	 * @return  the value of user.is_member
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Integer getIsMember() {
 		return isMember;
@@ -619,13 +578,31 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.is_member
 	 * @param isMember  the value for user.is_member
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setIsMember(Integer isMember) {
 		this.isMember = isMember;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.business_audit
+	 * @return  the value of user.business_audit
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
+	 */
+	public Integer getBusinessAudit() {
+		return businessAudit;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.business_audit
+	 * @param businessAudit  the value for user.business_audit
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
+	 */
+	public void setBusinessAudit(Integer businessAudit) {
+		this.businessAudit = businessAudit;
+	}
+
+	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 3623836456120030806L;

+ 76 - 136
src/main/java/com/goafanti/common/model/UserExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class UserExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public UserExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class UserExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1353,126 +1353,6 @@ public class UserExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andServiceCertificationIsNull() {
-			addCriterion("service_certification is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationIsNotNull() {
-			addCriterion("service_certification is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationEqualTo(Integer value) {
-			addCriterion("service_certification =", value, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationNotEqualTo(Integer value) {
-			addCriterion("service_certification <>", value, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationGreaterThan(Integer value) {
-			addCriterion("service_certification >", value, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationGreaterThanOrEqualTo(Integer value) {
-			addCriterion("service_certification >=", value, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationLessThan(Integer value) {
-			addCriterion("service_certification <", value, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationLessThanOrEqualTo(Integer value) {
-			addCriterion("service_certification <=", value, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationIn(List<Integer> values) {
-			addCriterion("service_certification in", values, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationNotIn(List<Integer> values) {
-			addCriterion("service_certification not in", values, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationBetween(Integer value1, Integer value2) {
-			addCriterion("service_certification between", value1, value2, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andServiceCertificationNotBetween(Integer value1, Integer value2) {
-			addCriterion("service_certification not between", value1, value2, "serviceCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationIsNull() {
-			addCriterion("user_certification is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationIsNotNull() {
-			addCriterion("user_certification is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationEqualTo(Integer value) {
-			addCriterion("user_certification =", value, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationNotEqualTo(Integer value) {
-			addCriterion("user_certification <>", value, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationGreaterThan(Integer value) {
-			addCriterion("user_certification >", value, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationGreaterThanOrEqualTo(Integer value) {
-			addCriterion("user_certification >=", value, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationLessThan(Integer value) {
-			addCriterion("user_certification <", value, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationLessThanOrEqualTo(Integer value) {
-			addCriterion("user_certification <=", value, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationIn(List<Integer> values) {
-			addCriterion("user_certification in", values, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationNotIn(List<Integer> values) {
-			addCriterion("user_certification not in", values, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationBetween(Integer value1, Integer value2) {
-			addCriterion("user_certification between", value1, value2, "userCertification");
-			return (Criteria) this;
-		}
-
-		public Criteria andUserCertificationNotBetween(Integer value1, Integer value2) {
-			addCriterion("user_certification not between", value1, value2, "userCertification");
-			return (Criteria) this;
-		}
-
 		public Criteria andLastMemberOrderIdIsNull() {
 			addCriterion("last_member_order_id is null");
 			return (Criteria) this;
@@ -1932,11 +1812,71 @@ public class UserExample {
 			addCriterion("is_member not between", value1, value2, "isMember");
 			return (Criteria) this;
 		}
+
+		public Criteria andBusinessAuditIsNull() {
+			addCriterion("business_audit is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditIsNotNull() {
+			addCriterion("business_audit is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditEqualTo(Integer value) {
+			addCriterion("business_audit =", value, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditNotEqualTo(Integer value) {
+			addCriterion("business_audit <>", value, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditGreaterThan(Integer value) {
+			addCriterion("business_audit >", value, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditGreaterThanOrEqualTo(Integer value) {
+			addCriterion("business_audit >=", value, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditLessThan(Integer value) {
+			addCriterion("business_audit <", value, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditLessThanOrEqualTo(Integer value) {
+			addCriterion("business_audit <=", value, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditIn(List<Integer> values) {
+			addCriterion("business_audit in", values, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditNotIn(List<Integer> values) {
+			addCriterion("business_audit not in", values, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditBetween(Integer value1, Integer value2) {
+			addCriterion("business_audit between", value1, value2, "businessAudit");
+			return (Criteria) this;
+		}
+
+		public Criteria andBusinessAuditNotBetween(Integer value1, Integer value2) {
+			addCriterion("business_audit not between", value1, value2, "businessAudit");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
+	 * @mbg.generated  Thu Nov 30 16:41:39 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 234 - 96
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -7,169 +7,199 @@ public class UserIdentity {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.id
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.uid
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.username
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String username;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.sex
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.date_of_birth_year
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String dateOfBirthYear;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.date_of_birth_month
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String dateOfBirthMonth;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.id_number
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String idNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.positive_id_url
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String positiveIdUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.opposite_id_url
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String oppositeIdUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.province
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer province;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.city
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer city;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.area
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer area;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.contact_mobile
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String contactMobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_name
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String bankName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_account
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String bankAccount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_card_number
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String bankCardNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.amount_money
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private BigDecimal amountMoney;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.audit_status
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer auditStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.process
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer process;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.wrong_count
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer wrongCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.payment_date
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Date paymentDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.expert
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer expert;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.celebrity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer celebrity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.international
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer international;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.fixed_tel
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String fixedTel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.qq
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String qq;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.postal_address
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String postalAddress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.postcode
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String postcode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.review_instructions
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String reviewInstructions;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.industry
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private Integer industry;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.contacts
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String contacts;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.email
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	private String email;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.professional_title
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	private String professionalTitle;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.work_unit
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	private String workUnit;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.education
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	private String education;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.major_category
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	private String majorCategory;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.qualification
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	private String qualification;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.investment
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	private Integer investment;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.id
 	 * @return  the value of user_identity.id
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -178,7 +208,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.id
 	 * @param id  the value for user_identity.id
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -187,7 +217,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.uid
 	 * @return  the value of user_identity.uid
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getUid() {
 		return uid;
@@ -196,7 +226,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.uid
 	 * @param uid  the value for user_identity.uid
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -205,7 +235,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.username
 	 * @return  the value of user_identity.username
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getUsername() {
 		return username;
@@ -214,7 +244,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.username
 	 * @param username  the value for user_identity.username
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setUsername(String username) {
 		this.username = username;
@@ -223,7 +253,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.sex
 	 * @return  the value of user_identity.sex
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getSex() {
 		return sex;
@@ -232,7 +262,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.sex
 	 * @param sex  the value for user_identity.sex
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -241,7 +271,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.date_of_birth_year
 	 * @return  the value of user_identity.date_of_birth_year
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getDateOfBirthYear() {
 		return dateOfBirthYear;
@@ -250,7 +280,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.date_of_birth_year
 	 * @param dateOfBirthYear  the value for user_identity.date_of_birth_year
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setDateOfBirthYear(String dateOfBirthYear) {
 		this.dateOfBirthYear = dateOfBirthYear;
@@ -259,7 +289,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.date_of_birth_month
 	 * @return  the value of user_identity.date_of_birth_month
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getDateOfBirthMonth() {
 		return dateOfBirthMonth;
@@ -268,7 +298,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.date_of_birth_month
 	 * @param dateOfBirthMonth  the value for user_identity.date_of_birth_month
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setDateOfBirthMonth(String dateOfBirthMonth) {
 		this.dateOfBirthMonth = dateOfBirthMonth;
@@ -277,7 +307,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.id_number
 	 * @return  the value of user_identity.id_number
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getIdNumber() {
 		return idNumber;
@@ -286,7 +316,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.id_number
 	 * @param idNumber  the value for user_identity.id_number
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setIdNumber(String idNumber) {
 		this.idNumber = idNumber;
@@ -295,7 +325,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.positive_id_url
 	 * @return  the value of user_identity.positive_id_url
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getPositiveIdUrl() {
 		return positiveIdUrl;
@@ -304,7 +334,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.positive_id_url
 	 * @param positiveIdUrl  the value for user_identity.positive_id_url
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setPositiveIdUrl(String positiveIdUrl) {
 		this.positiveIdUrl = positiveIdUrl;
@@ -313,7 +343,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.opposite_id_url
 	 * @return  the value of user_identity.opposite_id_url
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getOppositeIdUrl() {
 		return oppositeIdUrl;
@@ -322,7 +352,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.opposite_id_url
 	 * @param oppositeIdUrl  the value for user_identity.opposite_id_url
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setOppositeIdUrl(String oppositeIdUrl) {
 		this.oppositeIdUrl = oppositeIdUrl;
@@ -331,7 +361,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.province
 	 * @return  the value of user_identity.province
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getProvince() {
 		return province;
@@ -340,7 +370,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.province
 	 * @param province  the value for user_identity.province
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -349,7 +379,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.city
 	 * @return  the value of user_identity.city
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getCity() {
 		return city;
@@ -358,7 +388,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.city
 	 * @param city  the value for user_identity.city
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setCity(Integer city) {
 		this.city = city;
@@ -367,7 +397,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.area
 	 * @return  the value of user_identity.area
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getArea() {
 		return area;
@@ -376,7 +406,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.area
 	 * @param area  the value for user_identity.area
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setArea(Integer area) {
 		this.area = area;
@@ -385,7 +415,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.contact_mobile
 	 * @return  the value of user_identity.contact_mobile
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -394,7 +424,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.contact_mobile
 	 * @param contactMobile  the value for user_identity.contact_mobile
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -403,7 +433,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_name
 	 * @return  the value of user_identity.bank_name
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getBankName() {
 		return bankName;
@@ -412,7 +442,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_name
 	 * @param bankName  the value for user_identity.bank_name
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setBankName(String bankName) {
 		this.bankName = bankName;
@@ -421,7 +451,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_account
 	 * @return  the value of user_identity.bank_account
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getBankAccount() {
 		return bankAccount;
@@ -430,7 +460,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_account
 	 * @param bankAccount  the value for user_identity.bank_account
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setBankAccount(String bankAccount) {
 		this.bankAccount = bankAccount;
@@ -439,7 +469,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_card_number
 	 * @return  the value of user_identity.bank_card_number
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getBankCardNumber() {
 		return bankCardNumber;
@@ -448,7 +478,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_card_number
 	 * @param bankCardNumber  the value for user_identity.bank_card_number
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setBankCardNumber(String bankCardNumber) {
 		this.bankCardNumber = bankCardNumber;
@@ -457,7 +487,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.amount_money
 	 * @return  the value of user_identity.amount_money
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public BigDecimal getAmountMoney() {
 		return amountMoney;
@@ -466,7 +496,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.amount_money
 	 * @param amountMoney  the value for user_identity.amount_money
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setAmountMoney(BigDecimal amountMoney) {
 		this.amountMoney = amountMoney;
@@ -475,7 +505,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.audit_status
 	 * @return  the value of user_identity.audit_status
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -484,7 +514,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.audit_status
 	 * @param auditStatus  the value for user_identity.audit_status
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
@@ -493,7 +523,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.process
 	 * @return  the value of user_identity.process
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getProcess() {
 		return process;
@@ -502,7 +532,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.process
 	 * @param process  the value for user_identity.process
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setProcess(Integer process) {
 		this.process = process;
@@ -511,7 +541,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.wrong_count
 	 * @return  the value of user_identity.wrong_count
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getWrongCount() {
 		return wrongCount;
@@ -520,7 +550,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.wrong_count
 	 * @param wrongCount  the value for user_identity.wrong_count
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setWrongCount(Integer wrongCount) {
 		this.wrongCount = wrongCount;
@@ -529,7 +559,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.payment_date
 	 * @return  the value of user_identity.payment_date
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Date getPaymentDate() {
 		return paymentDate;
@@ -538,7 +568,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.payment_date
 	 * @param paymentDate  the value for user_identity.payment_date
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setPaymentDate(Date paymentDate) {
 		this.paymentDate = paymentDate;
@@ -547,7 +577,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.expert
 	 * @return  the value of user_identity.expert
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getExpert() {
 		return expert;
@@ -556,7 +586,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.expert
 	 * @param expert  the value for user_identity.expert
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setExpert(Integer expert) {
 		this.expert = expert;
@@ -565,7 +595,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.celebrity
 	 * @return  the value of user_identity.celebrity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getCelebrity() {
 		return celebrity;
@@ -574,7 +604,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.celebrity
 	 * @param celebrity  the value for user_identity.celebrity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setCelebrity(Integer celebrity) {
 		this.celebrity = celebrity;
@@ -583,7 +613,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.international
 	 * @return  the value of user_identity.international
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getInternational() {
 		return international;
@@ -592,7 +622,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.international
 	 * @param international  the value for user_identity.international
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setInternational(Integer international) {
 		this.international = international;
@@ -601,7 +631,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.fixed_tel
 	 * @return  the value of user_identity.fixed_tel
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getFixedTel() {
 		return fixedTel;
@@ -610,7 +640,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.fixed_tel
 	 * @param fixedTel  the value for user_identity.fixed_tel
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setFixedTel(String fixedTel) {
 		this.fixedTel = fixedTel;
@@ -619,7 +649,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.qq
 	 * @return  the value of user_identity.qq
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getQq() {
 		return qq;
@@ -628,7 +658,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.qq
 	 * @param qq  the value for user_identity.qq
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -637,7 +667,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.postal_address
 	 * @return  the value of user_identity.postal_address
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getPostalAddress() {
 		return postalAddress;
@@ -646,7 +676,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.postal_address
 	 * @param postalAddress  the value for user_identity.postal_address
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setPostalAddress(String postalAddress) {
 		this.postalAddress = postalAddress;
@@ -655,7 +685,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.postcode
 	 * @return  the value of user_identity.postcode
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getPostcode() {
 		return postcode;
@@ -664,7 +694,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.postcode
 	 * @param postcode  the value for user_identity.postcode
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setPostcode(String postcode) {
 		this.postcode = postcode;
@@ -673,7 +703,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.review_instructions
 	 * @return  the value of user_identity.review_instructions
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getReviewInstructions() {
 		return reviewInstructions;
@@ -682,7 +712,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.review_instructions
 	 * @param reviewInstructions  the value for user_identity.review_instructions
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setReviewInstructions(String reviewInstructions) {
 		this.reviewInstructions = reviewInstructions;
@@ -691,7 +721,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.industry
 	 * @return  the value of user_identity.industry
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Integer getIndustry() {
 		return industry;
@@ -700,7 +730,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.industry
 	 * @param industry  the value for user_identity.industry
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setIndustry(Integer industry) {
 		this.industry = industry;
@@ -709,7 +739,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.contacts
 	 * @return  the value of user_identity.contacts
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getContacts() {
 		return contacts;
@@ -718,7 +748,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.contacts
 	 * @param contacts  the value for user_identity.contacts
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -727,7 +757,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.email
 	 * @return  the value of user_identity.email
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -736,9 +766,117 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.email
 	 * @param email  the value for user_identity.email
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.professional_title
+	 * @return  the value of user_identity.professional_title
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public String getProfessionalTitle() {
+		return professionalTitle;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.professional_title
+	 * @param professionalTitle  the value for user_identity.professional_title
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public void setProfessionalTitle(String professionalTitle) {
+		this.professionalTitle = professionalTitle;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.work_unit
+	 * @return  the value of user_identity.work_unit
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public String getWorkUnit() {
+		return workUnit;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.work_unit
+	 * @param workUnit  the value for user_identity.work_unit
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public void setWorkUnit(String workUnit) {
+		this.workUnit = workUnit;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.education
+	 * @return  the value of user_identity.education
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public String getEducation() {
+		return education;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.education
+	 * @param education  the value for user_identity.education
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public void setEducation(String education) {
+		this.education = education;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.major_category
+	 * @return  the value of user_identity.major_category
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public String getMajorCategory() {
+		return majorCategory;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.major_category
+	 * @param majorCategory  the value for user_identity.major_category
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public void setMajorCategory(String majorCategory) {
+		this.majorCategory = majorCategory;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.qualification
+	 * @return  the value of user_identity.qualification
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public String getQualification() {
+		return qualification;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.qualification
+	 * @param qualification  the value for user_identity.qualification
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public void setQualification(String qualification) {
+		this.qualification = qualification;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.investment
+	 * @return  the value of user_identity.investment
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public Integer getInvestment() {
+		return investment;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.investment
+	 * @param investment  the value for user_identity.investment
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 */
+	public void setInvestment(Integer investment) {
+		this.investment = investment;
+	}
 }

+ 426 - 16
src/main/java/com/goafanti/common/model/UserIdentityExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class UserIdentityExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public UserIdentityExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2283,11 +2283,421 @@ public class UserIdentityExample {
 			addCriterion("email not between", value1, value2, "email");
 			return (Criteria) this;
 		}
+
+		public Criteria andProfessionalTitleIsNull() {
+			addCriterion("professional_title is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleIsNotNull() {
+			addCriterion("professional_title is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleEqualTo(String value) {
+			addCriterion("professional_title =", value, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleNotEqualTo(String value) {
+			addCriterion("professional_title <>", value, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleGreaterThan(String value) {
+			addCriterion("professional_title >", value, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleGreaterThanOrEqualTo(String value) {
+			addCriterion("professional_title >=", value, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleLessThan(String value) {
+			addCriterion("professional_title <", value, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleLessThanOrEqualTo(String value) {
+			addCriterion("professional_title <=", value, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleLike(String value) {
+			addCriterion("professional_title like", value, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleNotLike(String value) {
+			addCriterion("professional_title not like", value, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleIn(List<String> values) {
+			addCriterion("professional_title in", values, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleNotIn(List<String> values) {
+			addCriterion("professional_title not in", values, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleBetween(String value1, String value2) {
+			addCriterion("professional_title between", value1, value2, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andProfessionalTitleNotBetween(String value1, String value2) {
+			addCriterion("professional_title not between", value1, value2, "professionalTitle");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitIsNull() {
+			addCriterion("work_unit is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitIsNotNull() {
+			addCriterion("work_unit is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitEqualTo(String value) {
+			addCriterion("work_unit =", value, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitNotEqualTo(String value) {
+			addCriterion("work_unit <>", value, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitGreaterThan(String value) {
+			addCriterion("work_unit >", value, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitGreaterThanOrEqualTo(String value) {
+			addCriterion("work_unit >=", value, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitLessThan(String value) {
+			addCriterion("work_unit <", value, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitLessThanOrEqualTo(String value) {
+			addCriterion("work_unit <=", value, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitLike(String value) {
+			addCriterion("work_unit like", value, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitNotLike(String value) {
+			addCriterion("work_unit not like", value, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitIn(List<String> values) {
+			addCriterion("work_unit in", values, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitNotIn(List<String> values) {
+			addCriterion("work_unit not in", values, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitBetween(String value1, String value2) {
+			addCriterion("work_unit between", value1, value2, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andWorkUnitNotBetween(String value1, String value2) {
+			addCriterion("work_unit not between", value1, value2, "workUnit");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationIsNull() {
+			addCriterion("education is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationIsNotNull() {
+			addCriterion("education is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationEqualTo(String value) {
+			addCriterion("education =", value, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationNotEqualTo(String value) {
+			addCriterion("education <>", value, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationGreaterThan(String value) {
+			addCriterion("education >", value, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationGreaterThanOrEqualTo(String value) {
+			addCriterion("education >=", value, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationLessThan(String value) {
+			addCriterion("education <", value, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationLessThanOrEqualTo(String value) {
+			addCriterion("education <=", value, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationLike(String value) {
+			addCriterion("education like", value, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationNotLike(String value) {
+			addCriterion("education not like", value, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationIn(List<String> values) {
+			addCriterion("education in", values, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationNotIn(List<String> values) {
+			addCriterion("education not in", values, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationBetween(String value1, String value2) {
+			addCriterion("education between", value1, value2, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andEducationNotBetween(String value1, String value2) {
+			addCriterion("education not between", value1, value2, "education");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryIsNull() {
+			addCriterion("major_category is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryIsNotNull() {
+			addCriterion("major_category is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryEqualTo(String value) {
+			addCriterion("major_category =", value, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryNotEqualTo(String value) {
+			addCriterion("major_category <>", value, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryGreaterThan(String value) {
+			addCriterion("major_category >", value, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryGreaterThanOrEqualTo(String value) {
+			addCriterion("major_category >=", value, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryLessThan(String value) {
+			addCriterion("major_category <", value, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryLessThanOrEqualTo(String value) {
+			addCriterion("major_category <=", value, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryLike(String value) {
+			addCriterion("major_category like", value, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryNotLike(String value) {
+			addCriterion("major_category not like", value, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryIn(List<String> values) {
+			addCriterion("major_category in", values, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryNotIn(List<String> values) {
+			addCriterion("major_category not in", values, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryBetween(String value1, String value2) {
+			addCriterion("major_category between", value1, value2, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andMajorCategoryNotBetween(String value1, String value2) {
+			addCriterion("major_category not between", value1, value2, "majorCategory");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationIsNull() {
+			addCriterion("qualification is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationIsNotNull() {
+			addCriterion("qualification is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationEqualTo(String value) {
+			addCriterion("qualification =", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationNotEqualTo(String value) {
+			addCriterion("qualification <>", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationGreaterThan(String value) {
+			addCriterion("qualification >", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationGreaterThanOrEqualTo(String value) {
+			addCriterion("qualification >=", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationLessThan(String value) {
+			addCriterion("qualification <", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationLessThanOrEqualTo(String value) {
+			addCriterion("qualification <=", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationLike(String value) {
+			addCriterion("qualification like", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationNotLike(String value) {
+			addCriterion("qualification not like", value, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationIn(List<String> values) {
+			addCriterion("qualification in", values, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationNotIn(List<String> values) {
+			addCriterion("qualification not in", values, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationBetween(String value1, String value2) {
+			addCriterion("qualification between", value1, value2, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andQualificationNotBetween(String value1, String value2) {
+			addCriterion("qualification not between", value1, value2, "qualification");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentIsNull() {
+			addCriterion("investment is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentIsNotNull() {
+			addCriterion("investment is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentEqualTo(Integer value) {
+			addCriterion("investment =", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentNotEqualTo(Integer value) {
+			addCriterion("investment <>", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentGreaterThan(Integer value) {
+			addCriterion("investment >", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentGreaterThanOrEqualTo(Integer value) {
+			addCriterion("investment >=", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentLessThan(Integer value) {
+			addCriterion("investment <", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentLessThanOrEqualTo(Integer value) {
+			addCriterion("investment <=", value, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentIn(List<Integer> values) {
+			addCriterion("investment in", values, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentNotIn(List<Integer> values) {
+			addCriterion("investment not in", values, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentBetween(Integer value1, Integer value2) {
+			addCriterion("investment between", value1, value2, "investment");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvestmentNotBetween(Integer value1, Integer value2) {
+			addCriterion("investment not between", value1, value2, "investment");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 25 15:28:31 CST 2017
+	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 2 - 1
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -137,11 +137,12 @@ public class ExcelUtils {
 			vacantRows.add(rowNumber);
 			return "";
 		}else{
-			return String.valueOf(cellValue);
+			return String.valueOf(cellValue).trim();
 		} 
 	}
 
 	public String checkMobile(String mobile, int rowNumber){
+		mobile = mobile.trim();
 		String mobileRegex = "^1[3|4|5|7|8][0-9]{9}$"; 
 		String telRegex = "^\\d{3,4}-\\d{7,8}$";
 		if(StringUtils.isBlank(mobile)) return "";

+ 1 - 1
src/main/java/com/goafanti/common/utils/MobileMessageUtils.java

@@ -13,7 +13,7 @@ import com.goafanti.common.constant.ErrorConstants;
 
 public class MobileMessageUtils {
 	
-	private final static String SIGN_NAME = "技淘网";
+	private final static String SIGN_NAME = "阿凡提信息科技";
 	
 	private final static String SERVER_EXCEPTION = "服务器端手机验证码异常:%s";
 	

+ 10 - 10
src/main/java/com/goafanti/customer/bo/CustomerListIn.java

@@ -36,10 +36,10 @@ public class CustomerListIn {
 	private String industry;
 	
 	/** 业务认证 0-未认证 1-已认证  **/
-	private String serviceCertification; 
+	private String businessAudit; 
 	
 	/** 实名认证 0-未认证  1-已认证 **/
-	private String userCertification;
+	private String auditStatus;
 	
 	/** 当前会员状态 0-正常、1-锁定、2-过期  **/
 	private String currentMemberStatus;
@@ -162,20 +162,20 @@ public class CustomerListIn {
 		this.industry = industry;
 	}
 
-	public String getServiceCertification() {
-		return serviceCertification;
+	public String getBusinessAudit() {
+		return businessAudit;
 	}
 
-	public void setServiceCertification(String serviceCertification) {
-		this.serviceCertification = serviceCertification;
+	public void setBusinessAudit(String businessAudit) {
+		this.businessAudit = businessAudit;
 	}
 
-	public String getUserCertification() {
-		return userCertification;
+	public String getAuditStatus() {
+		return auditStatus;
 	}
 
-	public void setUserCertification(String userCertification) {
-		this.userCertification = userCertification;
+	public void setAuditStatus(String auditStatus) {
+		this.auditStatus = auditStatus;
 	}
 
 	public String getCurrentMemberStatus() {

+ 11 - 12
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -6,7 +6,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -151,8 +150,8 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		if(StringUtils.isNotBlank(cli.getExpert())) params.put("expert", Integer.parseInt(cli.getExpert()));
 		if(StringUtils.isNotBlank(cli.getIndustry())) params.put("industry", Integer.parseInt(cli.getIndustry()));
 		if(StringUtils.isNotBlank(cli.getInternational())) params.put("international", Integer.parseInt(cli.getInternational()));
-		if(StringUtils.isNotBlank(cli.getServiceCertification())) params.put("serviceCertification", Integer.parseInt(cli.getServiceCertification()));
-		if(StringUtils.isNotBlank(cli.getUserCertification())) params.put("userCertification", Integer.parseInt(cli.getUserCertification()));
+		if(StringUtils.isNotBlank(cli.getAuditStatus())) params.put("auditStatus", Integer.parseInt(cli.getAuditStatus()));
+		if(StringUtils.isNotBlank(cli.getBusinessAudit())) params.put("businessAudit", Integer.parseInt(cli.getBusinessAudit()));
 		if(StringUtils.isNotBlank(cli.getCurrentMemberStatus())) params.put("currentMemberStatus", Integer.parseInt(cli.getCurrentMemberStatus()));
 		if(StringUtils.isNotBlank(cli.getLvl())) params.put("lvl", Integer.parseInt(cli.getLvl()));
 		if(StringUtils.isNotBlank(cli.getListed())) params.put("listed", Integer.parseInt(cli.getListed()));
@@ -191,8 +190,6 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setNickname(name);
 		user.setStatus(0);
 		user.setShareType(0);
-		user.setServiceCertification(0);
-		user.setUserCertification(0);
 		user.setAid(TokenManager.getAdminId());
 		user.setType(type);
 		user.setCurrentMemberStatus(0);
@@ -203,6 +200,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setMobile(contactMobile);
 		user.setPassword(AFTConstants.INITIALPASSWORD);
 		user.setIsMember(0);
+		user.setBusinessAudit(0);
 		passwordUtil.encryptPassword(user);
 		if(type == 0){
 			if(userMapper.checkUser("", "", contactMobile, type).size()>0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_EXIST, name,""));
@@ -215,7 +213,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			ui.setExpert(0);
 			ui.setCelebrity(0);
 			ui.setInternational(0);
-			ui.setAuditStatus(0);
+			ui.setAuditStatus(5);//认证个人
 			userIdentityMapper.insert(ui);
 		}else if(type == 1){
 			if(userMapper.judgeCustomerByName(name)>0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_EXIST, name,""));
@@ -518,10 +516,12 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	@Override
 	public void checkCustomer(Set<CustomerExcelBo> boSet, Set<Integer> existRows, Set<Integer> filterRows) {
 		List<User> list = null;
-		for (CustomerExcelBo bo : boSet) {
+		CustomerExcelBo[] bos = (CustomerExcelBo[])boSet.toArray(new CustomerExcelBo[] {});
+		for (int i=0;i<bos.length;i++) {
+			CustomerExcelBo bo = bos[i];
 			CustomerExcelBo ceb = null;
-			for(Iterator<CustomerExcelBo> it = boSet.iterator();it.hasNext();){ //先自检
-				ceb = it.next();
+			for(int j=0;j<i;j++){
+				ceb = bos[j];
 				if(bo.getCustomerType().equals(AFTConstants.USER_TYPE_PERSONAL)){ //个人
 					if(ceb.getMobile().equals(bo.getMobile()) && ceb.getCustomerType().equals(bo.getCustomerType())){
 						bo.setUid(ceb.getUid());
@@ -536,7 +536,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 						filterRows.add(bo.getRowNumber());
 						break;
 					}
-				}	
+				}
 			}
 			if(StringUtils.isBlank(bo.getUid())){ //是否已经存在
 				if(bo.getCustomerType().equals(AFTConstants.USER_TYPE_PERSONAL)){
@@ -592,8 +592,6 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setNickname(bo.getIdentifyName());
 		user.setStatus(0);
 		user.setShareType(0);
-		user.setServiceCertification(0);
-		user.setUserCertification(0);
 		user.setAid(TokenManager.getAdminId());
 		user.setType(Integer.parseInt(bo.getCustomerType()));
 		user.setCurrentMemberStatus(0);
@@ -603,6 +601,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setMobile(bo.getMobile());
 		user.setPassword(AFTConstants.INITIALPASSWORD);
 		user.setIsMember(0);
+		user.setBusinessAudit(0);
 		passwordUtil.encryptPassword(user);
 		userMapper.insert(user);	
 	}

+ 25 - 13
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -8,9 +8,9 @@ public class OrganizationListOut {
 	/**创建人**/
 	private String createId;
 	/**创建时间**/
-	private String updateTime;
+	private String createTime;
 	/**更新时间**/
-	private String datetime;
+	private String updateTime;
 	/**删除标识**/
 	private String deletedSign;
 	/**组织名称**/
@@ -24,7 +24,9 @@ public class OrganizationListOut {
 	/**上级组织**/
 	private String superId;
 	/**组织职能说明**/
-	private String desc;
+	private String remarks;
+	/**组织状态**/
+	private String status;
 	public String getUid() {
 		return uid;
 	}
@@ -43,18 +45,18 @@ public class OrganizationListOut {
 	public void setCreateId(String createId) {
 		this.createId = createId;
 	}
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
 	public String getUpdateTime() {
 		return updateTime;
 	}
 	public void setUpdateTime(String updateTime) {
 		this.updateTime = updateTime;
 	}
-	public String getDatetime() {
-		return datetime;
-	}
-	public void setDatetime(String datetime) {
-		this.datetime = datetime;
-	}
 	public String getDeletedSign() {
 		return deletedSign;
 	}
@@ -91,11 +93,21 @@ public class OrganizationListOut {
 	public void setSuperId(String superId) {
 		this.superId = superId;
 	}
-	public String getDesc() {
-		return desc;
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	public String getStatus() {
+		return status;
 	}
-	public void setDesc(String desc) {
-		this.desc = desc;
+	public void setStatus(String status) {
+		this.status = status;
 	}
+	
+	
+	
+	
 
 }

+ 80 - 1
src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java

@@ -2,19 +2,26 @@ package com.goafanti.organization.controller;
 
 import javax.annotation.Resource;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.dao.OrganizationManagementMapper;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
 
 @RestController
 @RequestMapping("api/admin/organization")
-public class OrganizationManagementController {
+public class OrganizationManagementController extends BaseApiController{
 	@Resource
 	private OrganizationService organizationService;
+	@Autowired
+	private OrganizationManagementMapper organizationManagementMapper;
 	/**部门组织管理列表 **/
 	@RequestMapping(value = "/listOrganizationManagement" , method = RequestMethod.POST)
 	public Result listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
@@ -23,4 +30,76 @@ public class OrganizationManagementController {
 		res.setData(organizationService.listOrganizationManagement(olo, pageNo, pageSize));
 		return res;		
 	}
+	/**部门组织管理上级组织查询 **/
+	@RequestMapping(value = "/selectSuperId" , method = RequestMethod.POST)
+	public Result selectsuperId(){
+		Result res = new Result();
+		res.setData(organizationService.selectSuperId());
+		return res;
+	}
+	/**部门组织管理新增**/
+	@RequestMapping(value = "/addOrganization" , method = RequestMethod.POST)
+	public Result addOrganization(String name, String managerId, String type, String superId, String remarks) throws Exception{
+		Result res = new Result();
+		if(StringUtils.isBlank(name) || StringUtils.isBlank(type) 
+				|| StringUtils.isBlank(superId)){
+			res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
+			return res;
+		}
+		String olo=organizationManagementMapper.selectDepNoByName(name);
+		if(olo!=null){
+			res.getError().add(buildError("","部门已存在"));
+			return res;
+		}
+		organizationService.addOrganization(name, managerId, type, superId, remarks);
+		return res;
+	}
+	/**负责人自动补全查询**/
+	@RequestMapping(value = "/selectName" , method = RequestMethod.POST)
+	public Result selectName(String name){
+		Result res = new Result();
+		res.setData(organizationService.selectName(name));
+		return res;
+	}
+	/**编辑页面数据读取**/
+	@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
+	public OrganizationListOut selectAllById(String id){
+		OrganizationListOut res = organizationService.selectAllById(id);
+		return res;
+	}
+	/**修改信息**/
+	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
+	public Result updateOrganization(String name, String type, String managerId, String superId, String status,
+			String remarks,String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
+				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
+				|| StringUtils.isBlank(status)|| StringUtils.isBlank(remarks)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
+			return res;
+		}
+		organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id);
+		return res;
+	}
+	
+	
+	/**删除列表信息**/
+	@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
+	public Result deleteById(String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "id"));
+			return res;
+		}
+		OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
+		String superId=olo.getName();
+		int subordinate=organizationManagementMapper.selectCountBySuperId(superId);
+		if(subordinate>0){
+			res.getError().add(buildError("","存在下级组织不能删除"));
+			return res;
+		}
+		organizationService.deleteById(id);
+		return res;
+	}
+	
 }

+ 28 - 0
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -1,5 +1,8 @@
 package com.goafanti.organization.service;
 
+import java.util.List;
+
+import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.organization.bo.OrganizationListOut;
 
@@ -13,4 +16,29 @@ public interface OrganizationService {
 	 */
 	Pagination<OrganizationListOut> 
 	listOrganizationManagement(OrganizationListOut olo,Integer pageNo, Integer pageSize);
+	/**组织名称查上级组织*/
+	List<OrganizationListOut> selectSuperId();
+	/**
+	 * 
+	 * @param name 组织名称
+	 * @param managerId 负责人ID
+	 * @param type 组织类型
+	 * @param superId 上级组织
+	 * @param desc 组织职能说明
+	 * @return
+	 */
+	int addOrganization(String name,String managerId,String type,String superId,String desc);
+	/**
+	 * 模糊查询负责人名称
+	 * @param name
+	 * @return
+	 */
+	List<AdminListBo> selectName(String name);
+	
+	OrganizationListOut selectAllById(String id);
+	
+	int deleteById(String id);
+	
+	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id);
+	
 }

+ 156 - 15
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -1,24 +1,31 @@
 package com.goafanti.organization.service.impl;
 
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
-import com.goafanti.common.dao.UserMapper;
+import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.dao.OrganizationManagementMapper;
+import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 @Service
-public class OrganizationServiceImpl extends BaseMybatisDao<UserMapper> implements OrganizationService {
-	
+public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManagementMapper> implements OrganizationService {
+	@Autowired
+	private OrganizationManagementMapper organizationManagementMapper;
 	@Override
 	public Pagination<OrganizationListOut> listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
 			Integer pageSize) {
-		olo.setId(TokenManager.getAdminId());
+		/*olo.setCreateId(TokenManager.getAdminId());*/
 		Map<String,Object> params =disposeParams(olo);
 		@SuppressWarnings("unchecked")
 		Pagination<OrganizationListOut> list=(Pagination<OrganizationListOut>)findPage("selectOrganizationList","selectOrganizationCount",params,pageNo,pageSize);
@@ -27,19 +34,153 @@ public class OrganizationServiceImpl extends BaseMybatisDao<UserMapper> implemen
 	private Map<String,Object> disposeParams(OrganizationListOut olo){
 		Map<String,Object> params = new HashMap<String, Object>();		
 		if(StringUtils.isNotBlank(olo.getId())) params.put("id", olo.getId());
-		if(StringUtils.isNotBlank(olo.getCreateId())) params.put("id", olo.getCreateId());
-		if(StringUtils.isNotBlank(olo.getUpdateTime())) params.put("id", olo.getUpdateTime());
-		if(StringUtils.isNotBlank(olo.getDatetime())) params.put("id", olo.getDatetime());
-		if(StringUtils.isNotBlank(olo.getDeletedSign())) params.put("id", olo.getDeletedSign());
-		if(StringUtils.isNotBlank(olo.getName())) params.put("id", olo.getName());
+		if(StringUtils.isNotBlank(olo.getCreateId())) params.put("createId", olo.getCreateId());
+		if(StringUtils.isNotBlank(olo.getCreateTime())) params.put("createTime", olo.getCreateTime());
+		if(StringUtils.isNotBlank(olo.getUpdateTime())) params.put("updateTime", olo.getUpdateTime());
+		if(StringUtils.isNotBlank(olo.getDeletedSign())) params.put("deletedSign", olo.getDeletedSign());
+		if(StringUtils.isNotBlank(olo.getName())) params.put("name", olo.getName());
 		if(StringUtils.isNotBlank(olo.getType())) params.put("type", olo.getType());
-		if(StringUtils.isNotBlank(olo.getManagerId())) params.put("id", olo.getManagerId());
-		if(StringUtils.isNotBlank(olo.getDepNo())) params.put("id", olo.getDepNo());
-		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("id", olo.getSuperId());
-		if(StringUtils.isNotBlank(olo.getDesc())) params.put("id", olo.getDesc());
+		if(StringUtils.isNotBlank(olo.getManagerId())) params.put("managerId", olo.getManagerId());
+		if(StringUtils.isNotBlank(olo.getDepNo())) params.put("depNo", olo.getDepNo());
+		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("superId", olo.getSuperId());
+		if(StringUtils.isNotBlank(olo.getRemarks())) params.put("remarks", olo.getRemarks());
+		if(StringUtils.isNotBlank(olo.getStatus())) params.put("status", olo.getStatus());
 		return params;
 	}
+	@Override
+	public List<OrganizationListOut> selectSuperId() {
+		return organizationManagementMapper.selectSuperId();
+	}
+	/**
+	 *   XXIn form 提交 ,bo包中
+	 *   xxOut 输出 bo包中
+	 *   domain 类 model中
+	 *
+	 */
+	@Override
+	public int addOrganization(String name, String managerId, String type, String superId, String remarks) {
+		String id = UUID.randomUUID().toString();
+		Date now = new Date();
+		OrganizationManagement om=new OrganizationManagement(); 
+		om.setId(id);
+		String createId =organizationManagementMapper.selectAdminNameById(TokenManager.getAdminId());
+		om.setCreateId(createId);
+		om.setCreateTime(now);
+		om.setUpdateTime(now);
+		om.setDeletedSign("0");
+		om.setName(name);
+		om.setType(type);
+		om.setManagerId(managerId);
+		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		int Count=organizationManagementMapper.selectDepNoCount(superId);
+		if(Count<10){
+			String dep=sdepNo+"0"+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=Count+1;				
+				if(Count>=10){
+					dep=sdepNo+Count;	
+				}else{
+					dep=sdepNo+"0"+Count;
+				}
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			om.setDepNo(dep);
+		}
+		if(Count>=10){
+			String dep=sdepNo+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=Count+1;				
+				dep=sdepNo+Count;
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			om.setDepNo(dep);
+		}
+		om.setSuperId(superId);
+		om.setRemarks(remarks);
+		om.setStatus("0");
+		organizationManagementMapper.insert(om);
+		return 1;
+	}
+	@Override
+	public List<AdminListBo> selectName(String name) {
+		List<AdminListBo> list=organizationManagementMapper.selectName(name);
+		return list;
+	}
+	@Override
+	public OrganizationListOut selectAllById(String id) {
+		OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
+		return olo;
+	}
+	@Override
+	public int deleteById(String id) {
+		organizationManagementMapper.deleteById(id);
+		return 1;
+	}
+	@Override
+	public int updateOrganization(String name, String type, String managerId, String superId, String status,
+			String remarks,String id) {
+		Date now=new Date();
+		OrganizationManagement om=new OrganizationManagement();
+		om.setName(name);
+		om.setType(type);
+		om.setUpdateTime(now);
+		om.setManagerId(managerId);
+		om.setSuperId(superId);
+		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		int Count=organizationManagementMapper.selectDepNoCount(superId);
+		if(Count<10){
+			String dep=sdepNo+"0"+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=Count+1;				
+				if(Count>=10){
+					dep=sdepNo+Count;	
+				}else{
+					dep=sdepNo+"0"+Count;
+				}
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			om.setDepNo(dep);
+		}
+		if(Count>=10){
+			String dep=sdepNo+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=Count+1;				
+				dep=sdepNo+Count;
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			om.setDepNo(dep);
+		}
+		om.setStatus(status);
+		om.setRemarks(remarks);
+		om.setId(id);
+		organizationManagementMapper.updateByPrimaryKeySelective(om);
+		//*******下级编号修改
+		int n=0;
+		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(name);
+		for(OrganizationListOut i:Nos){			
+			sdepNo=organizationManagementMapper.selectDepNoByName(i.getSuperId());
+			if(n<10){
+				String dep=sdepNo+"0"+n;			
+				if(n>=10){
+					dep=sdepNo+n;	
+				}else{
+					dep=sdepNo+"0"+n;
+				}	
+				i.setDepNo(dep);
+			}
+			if(n>=10){
+				String dep=sdepNo+n;			
+				dep=sdepNo+n;	
+				i.setDepNo(dep);
+			}
+			organizationManagementMapper.updateByNumber(i);
+			n++;
+		}
+		return 1;
+	}
 
-	
-	
 }