Browse Source

客户管理BUG

wanghui 8 years ago
parent
commit
2a3a8d9acd

+ 2 - 2
GeneratorConfig.xml

@@ -1,13 +1,13 @@
 <?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" />
+  <classPathEntry location="E:/mysql-connector-java-5.1.40.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="business_varieties"/>
+    <table schema="aft" tableName="user_identity"/>
   </context>
 </generatorConfiguration>

+ 1 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -62,4 +62,5 @@ public interface AdminService {
 
 	Map<String, String> listAdminSelect();
 
+	List<Admin> listAdminByName(String name);
 }

+ 6 - 0
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -249,4 +249,10 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		return map;
 	}
 
+	@Override
+	public List<Admin> listAdminByName(String name) {
+		
+		return adminMapper.listAdminByName(name);
+	}
+
 }

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -87,6 +87,8 @@ public class AFTConstants {
 	
 	public static final String USER_RECEIVE							= "领取";
 	
+	public static final String USER_TRANSFER_TO_OTHER				= "转交客户给制定人";
+	
 	/**组织类型-公司*/
 	public static final String ORGANIZATION_TYPE_COMPANY			= "0";
 	/**组织类型-部门*/

+ 2 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -57,5 +57,7 @@ public interface AdminMapper {
 	List<Admin> listAdminSelectBySuperAdmin();
 
 	List<Admin> listAdminSelectByAreaAdmin(@Param("provinceList")List<Integer> provinceList, @Param("cityList")List<Integer> cityList);
+	
+	List<Admin> listAdminByName(@Param("name")String name);
 
 }

+ 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	long countByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	int deleteByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	int insert(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	int insertSelective(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	UserIdentity selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	int updateByPrimaryKeySelective(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	int updateByPrimaryKey(UserIdentity record);
 

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

@@ -178,11 +178,5 @@ public interface UserMapper {
 	 * @return
 	 */
 	List<User> checkUser(@Param("id")String id,@Param("identifyName")String identifyName, @Param("mobile")String mobile,@Param("type")Integer type);
-	
-	/**
-	 * 查询一个营销员的拜访数量 和客户数量
-	 * @param aid
-	 */
-	StatisticBo selectFollowAndCustomerCount(@Param("aid")String aid);
 
 }

+ 4 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -433,4 +433,8 @@
 			</foreach>
 	</if>
   </select>
+  
+  <select id="listAdminByName" parameterType="java.lang.String" resultMap="BaseResultMap">
+	select id,name from admin where name like concat('%',#{name},'%')  
+  </select>
 </mapper>

+ 37 - 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 Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -45,12 +45,13 @@
     <result column="major_category" jdbcType="VARCHAR" property="majorCategory" />
     <result column="qualification" jdbcType="VARCHAR" property="qualification" />
     <result column="investment" jdbcType="INTEGER" property="investment" />
+    <result column="graduate_school" jdbcType="VARCHAR" property="graduateSchool" />
   </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 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -84,7 +85,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -118,20 +119,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 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, professional_title, work_unit, education, major_category, qualification, 
-    investment
+    investment, graduate_school
   </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 Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     select
     <if test="distinct">
@@ -150,7 +151,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -161,7 +162,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     delete from user_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -170,7 +171,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     delete from user_identity
     <if test="_parameter != null">
@@ -181,7 +182,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     insert into user_identity (id, uid, username, 
       sex, date_of_birth_year, date_of_birth_month, 
@@ -195,7 +196,8 @@
       postcode, review_instructions, industry, 
       contacts, email, professional_title, 
       work_unit, education, major_category, 
-      qualification, investment)
+      qualification, investment, graduate_school
+      )
     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}, 
@@ -208,13 +210,14 @@
       #{postcode,jdbcType=VARCHAR}, #{reviewInstructions,jdbcType=VARCHAR}, #{industry,jdbcType=INTEGER}, 
       #{contacts,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{professionalTitle,jdbcType=VARCHAR}, 
       #{workUnit,jdbcType=VARCHAR}, #{education,jdbcType=VARCHAR}, #{majorCategory,jdbcType=VARCHAR}, 
-      #{qualification,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER})
+      #{qualification,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER}, #{graduateSchool,jdbcType=VARCHAR}
+      )
   </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 Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     insert into user_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -332,6 +335,9 @@
       <if test="investment != null">
         investment,
       </if>
+      <if test="graduateSchool != null">
+        graduate_school,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -448,13 +454,16 @@
       <if test="investment != null">
         #{investment,jdbcType=INTEGER},
       </if>
+      <if test="graduateSchool != null">
+        #{graduateSchool,jdbcType=VARCHAR},
+      </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 Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     select count(*) from user_identity
     <if test="_parameter != null">
@@ -465,7 +474,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     update user_identity
     <set>
@@ -583,6 +592,9 @@
       <if test="record.investment != null">
         investment = #{record.investment,jdbcType=INTEGER},
       </if>
+      <if test="record.graduateSchool != null">
+        graduate_school = #{record.graduateSchool,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -592,7 +604,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     update user_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -632,7 +644,8 @@
       education = #{record.education,jdbcType=VARCHAR},
       major_category = #{record.majorCategory,jdbcType=VARCHAR},
       qualification = #{record.qualification,jdbcType=VARCHAR},
-      investment = #{record.investment,jdbcType=INTEGER}
+      investment = #{record.investment,jdbcType=INTEGER},
+      graduate_school = #{record.graduateSchool,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -641,7 +654,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     update user_identity
     <set>
@@ -756,6 +769,9 @@
       <if test="investment != null">
         investment = #{investment,jdbcType=INTEGER},
       </if>
+      <if test="graduateSchool != null">
+        graduate_school = #{graduateSchool,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -763,7 +779,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 17:32:28 CST 2017.
+      This element was generated on Wed Dec 06 15:49:08 CST 2017.
     -->
     update user_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -802,7 +818,8 @@
       education = #{education,jdbcType=VARCHAR},
       major_category = #{majorCategory,jdbcType=VARCHAR},
       qualification = #{qualification,jdbcType=VARCHAR},
-      investment = #{investment,jdbcType=INTEGER}
+      investment = #{investment,jdbcType=INTEGER},
+      graduate_school = #{graduateSchool,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  

+ 2 - 3
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -642,17 +642,16 @@
     select
   <include refid="Base_Column_List" />
     from user
-    where mobile = #{0} and type=#{1}
+    where mobile = #{0} and type=#{1} and source = 0
   </select>
   
   <select id="selectUserPageHomeBoByUserId" parameterType="java.lang.String" resultMap="UserPageHomeBo">
    select 
    		u.lvl,mg.grade_name , u.nickname, u.email,
    		u.number, u.type, u.person_portrait_url, 
-   		o.logo_url , u.id as uid, adc.achievement_count as achievementNum,
+   		u.company_logo_url as logo_url, u.id as uid, adc.achievement_count as achievementNum,
    		adc.demand_count as demandNum
    from user u 
-   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
    where u.id = #{uid,jdbcType = VARCHAR}

+ 28 - 43
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -437,7 +437,8 @@
 			b.major_category as majorCategory,
 			b.qualification,
 			b.investment,
-			b.audit_status as auditStatus
+			b.audit_status as auditStatus,
+			b.graduate_school as graduateSchool
 		from
 			(
 				select
@@ -675,8 +676,9 @@
 	</select>
 	
 	<select id="followStatisticList" resultType="com.goafanti.customer.bo.StatisticBo">
-		select a.*,b.name as adminName,c.name as departmentName from (
+		select x.*,b.name as adminName,c.name as departmentName,y.*  from (
 		select
+			count(0) as followNo,
 			aid,
 			sum(case when contact_type = 0 then 1 else 0 end) as visitNo, <!-- 外出 -->
 			sum(case when contact_type = 1 then 1 else 0 end) as telNo, <!-- 电话 -->
@@ -692,9 +694,29 @@
 				and create_time &lt; #{eDate,jdbcType=DATE}
 			</if>
 			group by aid
-		)a
-		left join admin b on a.aid = b.id 
+		)x
+		left join admin b on x.aid = b.id 
 		left join department_management c on b.department_id = c.id
+		left join 
+		(
+				select
+					count( 0 ) as customerNo,
+					aid
+				from
+					(
+						select
+							aid,
+							uid
+						from
+							user_follow
+						
+						group by
+							aid,
+							uid
+					) a
+				group by
+					aid
+		)y on x.aid = y.aid
 		<if test="departmentId !=null">
 			where b.department_id = #{departmentId,jdbcType=VARCHAR}
 		</if>
@@ -712,50 +734,13 @@
 				and create_time &lt; #{eDate,jdbcType=DATE}
 			</if>
 			group by aid
-		)a
-		left join admin b on a.aid = b.id 
-		left join department_management c on b.department_id = c.id
+		)x
+		left join admin b on x.aid = b.id 
 		<if test="departmentId !=null">
 			where b.department_id = #{departmentId,jdbcType=VARCHAR}
 		</if>
 	</select>
 	
-	<select id="selectFollowAndCustomerCount" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.StatisticBo">
-		select
-			x.customerNo,
-			y.followNo
-		from
-			(
-				select
-					count( 0 ) as customerNo,
-					a.aid
-				from
-					(
-						select
-							aid,
-							uid
-						from
-							user_follow
-						where
-							aid = #{aid,jdbcType=VARCHAR}
-						group by
-							aid,
-							uid
-					) a
-				group by
-					a.aid
-			) x left join(
-				select
-					count( 0 ) as followNo,
-					aid
-				from
-					user_follow
-				where
-					aid = #{aid,jdbcType=VARCHAR}
-			) y on
-			x.aid = y.aid;
-	</select>
-	
 	<select id="findBusinessByFollowId" parameterType="java.lang.String" resultType="com.goafanti.common.model.UserBusiness">
 		select
 		a.id,

+ 137 - 114
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -7,199 +7,204 @@ public class UserIdentity {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.id
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.uid
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.username
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private String username;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.sex
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private String oppositeIdUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.province
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private Integer province;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.city
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private Integer city;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.area
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private Integer auditStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.process
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private Date paymentDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.expert
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private Integer expert;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.celebrity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private Integer celebrity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.international
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private String fixedTel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.qq
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private String postalAddress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.postcode
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private String reviewInstructions;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.industry
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private Integer industry;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.contacts
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private String contacts;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.email
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	private Integer investment;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.graduate_school
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 */
+	private String graduateSchool;
 
 	/**
 	 * 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -208,7 +213,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -217,7 +222,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getUid() {
 		return uid;
@@ -226,7 +231,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -235,7 +240,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getUsername() {
 		return username;
@@ -244,7 +249,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setUsername(String username) {
 		this.username = username;
@@ -253,7 +258,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getSex() {
 		return sex;
@@ -262,7 +267,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -271,7 +276,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getDateOfBirthYear() {
 		return dateOfBirthYear;
@@ -280,7 +285,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setDateOfBirthYear(String dateOfBirthYear) {
 		this.dateOfBirthYear = dateOfBirthYear;
@@ -289,7 +294,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getDateOfBirthMonth() {
 		return dateOfBirthMonth;
@@ -298,7 +303,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setDateOfBirthMonth(String dateOfBirthMonth) {
 		this.dateOfBirthMonth = dateOfBirthMonth;
@@ -307,7 +312,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getIdNumber() {
 		return idNumber;
@@ -316,7 +321,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setIdNumber(String idNumber) {
 		this.idNumber = idNumber;
@@ -325,7 +330,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getPositiveIdUrl() {
 		return positiveIdUrl;
@@ -334,7 +339,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setPositiveIdUrl(String positiveIdUrl) {
 		this.positiveIdUrl = positiveIdUrl;
@@ -343,7 +348,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getOppositeIdUrl() {
 		return oppositeIdUrl;
@@ -352,7 +357,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setOppositeIdUrl(String oppositeIdUrl) {
 		this.oppositeIdUrl = oppositeIdUrl;
@@ -361,7 +366,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getProvince() {
 		return province;
@@ -370,7 +375,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -379,7 +384,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getCity() {
 		return city;
@@ -388,7 +393,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setCity(Integer city) {
 		this.city = city;
@@ -397,7 +402,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getArea() {
 		return area;
@@ -406,7 +411,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setArea(Integer area) {
 		this.area = area;
@@ -415,7 +420,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -424,7 +429,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -433,7 +438,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getBankName() {
 		return bankName;
@@ -442,7 +447,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setBankName(String bankName) {
 		this.bankName = bankName;
@@ -451,7 +456,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getBankAccount() {
 		return bankAccount;
@@ -460,7 +465,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setBankAccount(String bankAccount) {
 		this.bankAccount = bankAccount;
@@ -469,7 +474,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getBankCardNumber() {
 		return bankCardNumber;
@@ -478,7 +483,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setBankCardNumber(String bankCardNumber) {
 		this.bankCardNumber = bankCardNumber;
@@ -487,7 +492,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public BigDecimal getAmountMoney() {
 		return amountMoney;
@@ -496,7 +501,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setAmountMoney(BigDecimal amountMoney) {
 		this.amountMoney = amountMoney;
@@ -505,7 +510,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -514,7 +519,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
@@ -523,7 +528,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getProcess() {
 		return process;
@@ -532,7 +537,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setProcess(Integer process) {
 		this.process = process;
@@ -541,7 +546,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getWrongCount() {
 		return wrongCount;
@@ -550,7 +555,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setWrongCount(Integer wrongCount) {
 		this.wrongCount = wrongCount;
@@ -559,7 +564,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Date getPaymentDate() {
 		return paymentDate;
@@ -568,7 +573,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setPaymentDate(Date paymentDate) {
 		this.paymentDate = paymentDate;
@@ -577,7 +582,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getExpert() {
 		return expert;
@@ -586,7 +591,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setExpert(Integer expert) {
 		this.expert = expert;
@@ -595,7 +600,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getCelebrity() {
 		return celebrity;
@@ -604,7 +609,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setCelebrity(Integer celebrity) {
 		this.celebrity = celebrity;
@@ -613,7 +618,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getInternational() {
 		return international;
@@ -622,7 +627,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setInternational(Integer international) {
 		this.international = international;
@@ -631,7 +636,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getFixedTel() {
 		return fixedTel;
@@ -640,7 +645,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setFixedTel(String fixedTel) {
 		this.fixedTel = fixedTel;
@@ -649,7 +654,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getQq() {
 		return qq;
@@ -658,7 +663,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -667,7 +672,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getPostalAddress() {
 		return postalAddress;
@@ -676,7 +681,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setPostalAddress(String postalAddress) {
 		this.postalAddress = postalAddress;
@@ -685,7 +690,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getPostcode() {
 		return postcode;
@@ -694,7 +699,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setPostcode(String postcode) {
 		this.postcode = postcode;
@@ -703,7 +708,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getReviewInstructions() {
 		return reviewInstructions;
@@ -712,7 +717,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setReviewInstructions(String reviewInstructions) {
 		this.reviewInstructions = reviewInstructions;
@@ -721,7 +726,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getIndustry() {
 		return industry;
@@ -730,7 +735,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setIndustry(Integer industry) {
 		this.industry = industry;
@@ -739,7 +744,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getContacts() {
 		return contacts;
@@ -748,7 +753,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -757,7 +762,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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -766,7 +771,7 @@ 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -775,7 +780,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getProfessionalTitle() {
 		return professionalTitle;
@@ -784,7 +789,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setProfessionalTitle(String professionalTitle) {
 		this.professionalTitle = professionalTitle;
@@ -793,7 +798,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getWorkUnit() {
 		return workUnit;
@@ -802,7 +807,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setWorkUnit(String workUnit) {
 		this.workUnit = workUnit;
@@ -811,7 +816,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getEducation() {
 		return education;
@@ -820,7 +825,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setEducation(String education) {
 		this.education = education;
@@ -829,7 +834,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getMajorCategory() {
 		return majorCategory;
@@ -838,7 +843,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setMajorCategory(String majorCategory) {
 		this.majorCategory = majorCategory;
@@ -847,7 +852,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public String getQualification() {
 		return qualification;
@@ -856,7 +861,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setQualification(String qualification) {
 		this.qualification = qualification;
@@ -865,7 +870,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public Integer getInvestment() {
 		return investment;
@@ -874,9 +879,27 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public void setInvestment(Integer investment) {
 		this.investment = investment;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.graduate_school
+	 * @return  the value of user_identity.graduate_school
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 */
+	public String getGraduateSchool() {
+		return graduateSchool;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.graduate_school
+	 * @param graduateSchool  the value for user_identity.graduate_school
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 */
+	public void setGraduateSchool(String graduateSchool) {
+		this.graduateSchool = graduateSchool;
+	}
 }

+ 86 - 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 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  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2693,11 +2693,81 @@ public class UserIdentityExample {
 			addCriterion("investment not between", value1, value2, "investment");
 			return (Criteria) this;
 		}
+
+		public Criteria andGraduateSchoolIsNull() {
+			addCriterion("graduate_school is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolIsNotNull() {
+			addCriterion("graduate_school is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolEqualTo(String value) {
+			addCriterion("graduate_school =", value, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolNotEqualTo(String value) {
+			addCriterion("graduate_school <>", value, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolGreaterThan(String value) {
+			addCriterion("graduate_school >", value, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolGreaterThanOrEqualTo(String value) {
+			addCriterion("graduate_school >=", value, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolLessThan(String value) {
+			addCriterion("graduate_school <", value, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolLessThanOrEqualTo(String value) {
+			addCriterion("graduate_school <=", value, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolLike(String value) {
+			addCriterion("graduate_school like", value, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolNotLike(String value) {
+			addCriterion("graduate_school not like", value, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolIn(List<String> values) {
+			addCriterion("graduate_school in", values, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolNotIn(List<String> values) {
+			addCriterion("graduate_school not in", values, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolBetween(String value1, String value2) {
+			addCriterion("graduate_school between", value1, value2, "graduateSchool");
+			return (Criteria) this;
+		}
+
+		public Criteria andGraduateSchoolNotBetween(String value1, String value2) {
+			addCriterion("graduate_school not between", value1, value2, "graduateSchool");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user_identity
-	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
+	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 12 - 1
src/main/java/com/goafanti/core/shiro/token/ShiroToken.java

@@ -8,10 +8,11 @@ public class ShiroToken extends UsernamePasswordToken implements Serializable {
 
 	private static final long serialVersionUID = 4364371216579943671L;
 
-	public ShiroToken(String username, String pwd, Integer type) {
+	public ShiroToken(String username, String pwd, Integer type,Integer source) {
 		super(username, pwd);
 		this.pwd = pwd;
 		this.type = type;
+		this.source = source;
 	}
 
 	public ShiroToken(String username, String pwd) {
@@ -26,6 +27,8 @@ public class ShiroToken extends UsernamePasswordToken implements Serializable {
 
 	private String	id;
 
+	private Integer source;
+	
 	public String getPwd() {
 		return pwd;
 	}
@@ -42,6 +45,14 @@ public class ShiroToken extends UsernamePasswordToken implements Serializable {
 		this.type = type;
 	}
 
+	public Integer getSource() {
+		return source;
+	}
+
+	public void setSource(Integer source) {
+		this.source = source;
+	}
+
 	@Override
 	public Object getPrincipal() {
 		return id;

+ 2 - 1
src/main/java/com/goafanti/core/shiro/token/TokenManager.java

@@ -5,6 +5,7 @@ import java.util.UUID;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AftUser;
 import com.goafanti.common.model.User;
@@ -165,7 +166,7 @@ public class TokenManager {
 	 * @return
 	 */
 	public static User login(User user, Boolean rememberMe) {
-		ShiroToken token = new ShiroToken(user.getMobile(), user.getPassword(), user.getType());
+		ShiroToken token = new ShiroToken(user.getMobile(), user.getPassword(), user.getType(),AFTConstants.USER_SOURCE_REGISTER);
 		token.setRememberMe(null == rememberMe ? false : rememberMe);
 		SecurityUtils.getSubject().login(token);
 		setVal2Session(CSRF_TOKEN, UUID.randomUUID().toString().replace("-", ""));

+ 26 - 5
src/main/java/com/goafanti/customer/controller/CustomerApiController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.AftFileService;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
@@ -58,7 +59,8 @@ public class CustomerApiController extends BaseApiController{
 	private AftFileService aftFileService;
 	@Value(value = "${upload.private.path}")
 	private String	uploadPrivatePath	= null;
-	
+	@Resource
+	private AdminService adminService;
 	/** 私有个人客户列表 **/
 	@RequestMapping(value = "/listPrivatePersonalCustomer" , method = RequestMethod.POST)
 	public Result listPrivatePersonalCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){
@@ -484,7 +486,7 @@ public class CustomerApiController extends BaseApiController{
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/customerStatistics",method = RequestMethod.GET)
-	public Result customerStatistics(String startDate,String endDate,String timeSpan,String depId,Integer pageNo, Integer pageSize) throws ParseException{
+	public Result customerStatistics(String startDate,String endDate,String timeSpan,String depId,String businessGlossoryId,Integer pageNo, Integer pageSize) throws ParseException{
 		Result res = new Result();
 		Date sDate = null;
 		Date eDate = null;
@@ -505,7 +507,7 @@ public class CustomerApiController extends BaseApiController{
 				sDate = DateUtils.getLastDayOfLastYear(date);
 			}		
 		}
-		res.setData(customerService.customerStatistics(sDate,eDate,depId,pageNo,pageSize));
+		res.setData(customerService.customerStatistics(sDate,eDate,depId,businessGlossoryId,pageNo,pageSize));
 		return res;
 	}
 	
@@ -561,7 +563,7 @@ public class CustomerApiController extends BaseApiController{
 	 */
 
 	@RequestMapping(value = "/followStatistic",method = RequestMethod.GET)
-	public Result followStatistic(String startDate,String endDate,String timeSpan,String depId,String businessGlossoryId,Integer pageNo, Integer pageSize) throws ParseException{
+	public Result followStatistic(String startDate,String endDate,String timeSpan,String depId,Integer pageNo, Integer pageSize) throws ParseException{
 		Result res = new Result();
 		Date sDate = null;
 		Date eDate = null;
@@ -582,7 +584,26 @@ public class CustomerApiController extends BaseApiController{
 				sDate = DateUtils.getLastDayOfLastYear(date);
 			}		
 		}
-		res.setData(customerService.followStatistic(sDate, eDate, businessGlossoryId, depId, pageNo, pageSize));
+		res.setData(customerService.followStatistic(sDate, eDate, depId, pageNo, pageSize));
+		return res;
+	}
+	
+	/** 管理员列表 **/
+	@RequestMapping(value = "/listAdminByName",method = RequestMethod.GET)
+	public Result listAdminByName(String adminName){
+		Result res = new Result();
+		if(StringUtils.isNotBlank(adminName))res.setData(adminService.listAdminByName(adminName));
+		return res;
+	}
+	
+	/** 转交客户到制定人 **/
+	@RequestMapping(value = "/transferToOther", method = RequestMethod.GET)
+	public Result transferToOther(String uid,String aid){
+		Result res = new Result();
+		if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "客户编号或管理员编号"));
+		}
+		customerService.updateByOperatorType(uid, AFTConstants.USER_TRANSFER_TO_OTHER, aid);
 		return res;
 	}
 }

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

@@ -225,7 +225,7 @@ public interface CustomerService {
 	 * @param operatorType
 	 * @return
 	 */
-	int updateByOperatorType(String uid,String operatorType);
+	int updateByOperatorType(String uid,String operatorType,Object... params);
 	
 	/**
 	 * 客户统计
@@ -234,7 +234,7 @@ public interface CustomerService {
 	 * @param depId
 	 * @return
 	 */
-	Pagination<StatisticBo> customerStatistics(Date sDate, Date eDate, String depId,Integer pageNo, Integer pageSize);
+	Pagination<StatisticBo> customerStatistics(Date sDate, Date eDate, String depId, String businessGlossoryId, Integer pageNo, Integer pageSize);
 	
 	/**
 	 * 业务进度统计
@@ -242,7 +242,7 @@ public interface CustomerService {
 	 * @param eDate
 	 * @return
 	 */
-	Pagination<StatisticBo> businessStatistic(Date sDate, Date eDate, String businessGlossoryId, String depId, Integer pageNo, Integer pageSize);
+	Pagination<StatisticBo> businessStatistic(Date sDate, Date eDate, String depId, String businessGlossoryId,Integer pageNo, Integer pageSize);
 	
 	/**
 	 * 拜访统计
@@ -250,5 +250,5 @@ public interface CustomerService {
 	 * @param eDate
 	 * @return
 	 */
-	Pagination<StatisticBo> followStatistic(Date sDate, Date eDate,String businessGlossoryId, String depId, Integer pageNo, Integer pageSize);
+	Pagination<StatisticBo> followStatistic(Date sDate, Date eDate, String depId, Integer pageNo, Integer pageSize);
 }

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

@@ -205,7 +205,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setUpdateTime(now);
 		user.setMobile(contactMobile);
 		user.setPassword(AFTConstants.INITIALPASSWORD);
-		user.setIsMember(AFTConstants.YES);
+		user.setIsMember(AFTConstants.NO);
 		user.setBusinessAudit(AFTConstants.NO);
 		passwordUtil.encryptPassword(user);
 		if(type == UserType.PERSONAL.getCode()){
@@ -598,7 +598,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setIdentifyName(bo.getIdentifyName());
 		user.setSource(AFTConstants.USER_SOURCE_CREATE);
 		user.setNickname(bo.getIdentifyName());
-		user.setStatus(AFTConstants.USER_STATUS_CANCEL);
+		user.setStatus(AFTConstants.USER_STATUS_NORMAL);
 		user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
 		user.setAid(TokenManager.getAdminId());
 		user.setType(Integer.parseInt(bo.getCustomerType()));
@@ -671,7 +671,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	}
 
 	@Override
-	public int updateByOperatorType(String uid, String operatorType) {
+	public int updateByOperatorType(String uid, String operatorType,Object... params) {
 		User user = new User();
 		user.setId(uid);
 		if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_PUBLIC)){
@@ -681,51 +681,44 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
 		}else if(operatorType.equals(AFTConstants.USER_DELETE)){
 			user.setStatus(AFTConstants.USER_STATUS_CANCEL);
+		}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
+			user.setAid(String.valueOf(params[0]));
 		}
 		return userMapper.updateByPrimaryKeySelective(user);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<StatisticBo> customerStatistics(Date sDate, Date eDate, String depId ,Integer pageNo, Integer pageSize) {
+	public Pagination<StatisticBo> customerStatistics(Date sDate, Date eDate, String depId, String businessGlossoryId, Integer pageNo, Integer pageSize) {
 		Map<String,Object> params = new HashMap<String,Object>();
 		if(null != sDate) params.put("sDate", sDate);
 		if(null != eDate) params.put("eDate", eDate);
 		if(StringUtils.isNotBlank(depId)) params.put("departmentId", depId);
+		if(StringUtils.isNotBlank(businessGlossoryId)) params.put("businessGlossoryId", businessGlossoryId);
 		Pagination<StatisticBo> page = (Pagination<StatisticBo>)findPage("customerStatisticsList", "customerStatisticsCount", params, pageNo, pageSize);
 		return page;
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<StatisticBo> businessStatistic(Date sDate, Date eDate, String businessGlossoryId, String depId ,Integer pageNo, Integer pageSize) {
+	public Pagination<StatisticBo> businessStatistic(Date sDate, Date eDate,String depId, String businessGlossoryId,Integer pageNo, Integer pageSize) {
 		Map<String,Object> params = new HashMap<String,Object>();
 		if(null != sDate) params.put("sDate", sDate);
 		if(null != eDate) params.put("eDate", eDate);
 		if(StringUtils.isNotBlank(depId)) params.put("departmentId", depId);
-		if(StringUtils.isNoneBlank(businessGlossoryId)) params.put("businessGlossoryId", businessGlossoryId);
+		if(StringUtils.isNotBlank(businessGlossoryId)) params.put("businessGlossoryId", businessGlossoryId);
 		Pagination<StatisticBo> page = (Pagination<StatisticBo>)findPage("businessStatisticList", "businessStatisticCount", params, pageNo, pageSize);
 		return page;
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<StatisticBo> followStatistic(Date sDate, Date eDate, String businessGlossoryId, String depId ,Integer pageNo, Integer pageSize) {
+	public Pagination<StatisticBo> followStatistic(Date sDate, Date eDate, String depId, Integer pageNo, Integer pageSize) {
 		Map<String,Object> params = new HashMap<String,Object>();
 		if(null != sDate) params.put("sDate", sDate);
 		if(null != eDate) params.put("eDate", eDate);
 		if(StringUtils.isNotBlank(depId)) params.put("departmentId", depId);
-		if(StringUtils.isNoneBlank(businessGlossoryId)) params.put("businessGlossoryId", businessGlossoryId);
 		Pagination<StatisticBo> page = (Pagination<StatisticBo>)findPage("followStatisticList", "followStatisticCount", params, pageNo, pageSize);
-		List<StatisticBo> list = (List<StatisticBo>)page.getList();
-		StatisticBo statisticBo = null;
-		for(StatisticBo bo:list){
-			statisticBo = userMapper.selectFollowAndCustomerCount(bo.getAid());
-				bo.setCustomerNo(statisticBo.getCustomerNo());
-				bo.setFollowNo(statisticBo.getFollowNo());
-		
-		}
-		page.setList(list);
 		return page;
 	}
 

+ 2 - 0
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.enums.UserFields;
@@ -90,6 +91,7 @@ public class UserRegisterController extends BaseController {
 			us.setCreateTime(now.getTime());
 			us.setPassword(passwordUtil.getEncryptPwd(us));
 			us.setLvl(0);
+			us.setSource(AFTConstants.USER_SOURCE_REGISTER);
 			/*
 			List<Admin> admins = adminService.selectAllAdmin();
 			if (!admins.isEmpty()) {