Przeglądaj źródła

修改数据库

wanghui 8 lat temu
rodzic
commit
67db501cf2

+ 1 - 1
generatorConfig.xml

@@ -1,7 +1,7 @@
 <?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="E:/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" />

+ 67 - 103
src/main/java/com/goafanti/common/dao/CustomerMapper.java

@@ -7,112 +7,76 @@ import org.apache.ibatis.annotations.Param;
 
 public interface CustomerMapper {
     /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    long countByExample(CustomerExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    int deleteByExample(CustomerExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    int deleteByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    int insert(Customer record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    int insertSelective(Customer record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    List<Customer> selectByExample(CustomerExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    Customer selectByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    int updateByExampleSelective(@Param("record") Customer record, @Param("example") CustomerExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    int updateByExample(@Param("record") Customer record, @Param("example") CustomerExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    int updateByPrimaryKeySelective(Customer record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table customer
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    int updateByPrimaryKey(Customer record);
-    
-
-    /**
-     * 删除客户信�
-     */
-    int deleteCustomerByPrimaryKey(String id);
-
-
-    /**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	long countByExample(CustomerExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	int deleteByExample(CustomerExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	int insert(Customer record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	int insertSelective(Customer record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	List<Customer> selectByExample(CustomerExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	Customer selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") Customer record, @Param("example") CustomerExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	int updateByExample(@Param("record") Customer record, @Param("example") CustomerExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	int updateByPrimaryKeySelective(Customer record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	int updateByPrimaryKey(Customer record);
+
+	/**
      * 查询客户详情
      */
     Customer selectCustomerByPrimaryKey(String id);
 
-
-
-    /**
-     * 修改客户信�
-     */
-    int updateCustomerByPrimaryKey(String id);
-
     /**
      * 新增
      */
@@ -121,7 +85,7 @@ public interface CustomerMapper {
     /**
      * 
      * @param ladderId 上层领导ID
-     * @return 所有包�上层领导ID的 客户记录
+     * @return �?有包�上层领导ID�? 客户记录
      */
     List<Customer> selectByLadderId(@Param("ladderId")String ladderId);
 }

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

@@ -9,68 +9,68 @@ public interface FollowUpRecordMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	long countByExample(FollowUpRecordExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	int deleteByExample(FollowUpRecordExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	int insert(FollowUpRecord record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	int insertSelective(FollowUpRecord record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	List<FollowUpRecord> selectByExample(FollowUpRecordExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	FollowUpRecord selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") FollowUpRecord record,
 			@Param("example") FollowUpRecordExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	int updateByExample(@Param("record") FollowUpRecord record, @Param("example") FollowUpRecordExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	int updateByPrimaryKeySelective(FollowUpRecord record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	int updateByPrimaryKey(FollowUpRecord record);
 }

+ 176 - 229
src/main/java/com/goafanti/common/mapper/CustomerMapper.xml

@@ -5,25 +5,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
-    <result column="customer_typ" jdbcType="VARCHAR" property="customerTyp" />
-    <result column="share_typ" jdbcType="INTEGER" property="shareTyp" />
-    <result column="agent_id" jdbcType="VARCHAR" property="agentId" />
-    <result column="company_intention" jdbcType="VARCHAR" property="companyIntention" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="follow_situation" jdbcType="VARCHAR" property="followSituation" />
-    <result column="customer_statue" jdbcType="VARCHAR" property="customerStatue" />
     <result column="paid" jdbcType="VARCHAR" property="paid" />
+    <result column="share_type" jdbcType="INTEGER" property="shareType" />
+    <result column="customer_type" jdbcType="INTEGER" property="customerType" />
+    <result column="customer_status" jdbcType="INTEGER" property="customerStatus" />
+    <result column="company_intention" jdbcType="CHAR" property="companyIntention" />
+    <result column="follow_situation" jdbcType="INTEGER" property="followSituation" />
     <result column="tag" jdbcType="VARCHAR" property="tag" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="follow_id" jdbcType="VARCHAR" property="followId" />
+    <result column="effective" jdbcType="INTEGER" property="effective" />
   </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 Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +58,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +92,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
-    id, aid, customer_typ, share_typ, agent_id, company_intention, create_time, follow_situation, 
-    customer_statue, paid, tag
+    id, aid, paid, share_type, customer_type, customer_status, company_intention, follow_situation, 
+    tag, create_time, follow_id, effective
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.CustomerExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     select
     <if test="distinct">
@@ -119,7 +120,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,7 +131,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     delete from customer
     where id = #{id,jdbcType=VARCHAR}
@@ -139,7 +140,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     delete from customer
     <if test="_parameter != null">
@@ -150,22 +151,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
-    insert into customer (id, aid, customer_typ, 
-      share_typ, agent_id, company_intention, 
-      create_time, follow_situation, customer_statue, 
-      paid, tag)
-    values (#{id,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{customerTyp,jdbcType=VARCHAR}, 
-      #{shareTyp,jdbcType=INTEGER}, #{agentId,jdbcType=VARCHAR}, #{companyIntention,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{followSituation,jdbcType=VARCHAR}, #{customerStatue,jdbcType=VARCHAR}, 
-      #{paid,jdbcType=VARCHAR}, #{tag,jdbcType=VARCHAR})
+    insert into customer (id, aid, paid, 
+      share_type, customer_type, customer_status, 
+      company_intention, follow_situation, tag, 
+      create_time, follow_id, effective
+      )
+    values (#{id,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{paid,jdbcType=VARCHAR}, 
+      #{shareType,jdbcType=INTEGER}, #{customerType,jdbcType=INTEGER}, #{customerStatus,jdbcType=INTEGER}, 
+      #{companyIntention,jdbcType=CHAR}, #{followSituation,jdbcType=INTEGER}, #{tag,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{followId,jdbcType=VARCHAR}, #{effective,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Customer">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     insert into customer
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -175,33 +178,36 @@
       <if test="aid != null">
         aid,
       </if>
-      <if test="customerTyp != null">
-        customer_typ,
+      <if test="paid != null">
+        paid,
+      </if>
+      <if test="shareType != null">
+        share_type,
       </if>
-      <if test="shareTyp != null">
-        share_typ,
+      <if test="customerType != null">
+        customer_type,
       </if>
-      <if test="agentId != null">
-        agent_id,
+      <if test="customerStatus != null">
+        customer_status,
       </if>
       <if test="companyIntention != null">
         company_intention,
       </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
       <if test="followSituation != null">
         follow_situation,
       </if>
-      <if test="customerStatue != null">
-        customer_statue,
-      </if>
-      <if test="paid != null">
-        paid,
-      </if>
       <if test="tag != null">
         tag,
       </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="followId != null">
+        follow_id,
+      </if>
+      <if test="effective != null">
+        effective,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -210,40 +216,43 @@
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
-      <if test="customerTyp != null">
-        #{customerTyp,jdbcType=VARCHAR},
+      <if test="paid != null">
+        #{paid,jdbcType=VARCHAR},
       </if>
-      <if test="shareTyp != null">
-        #{shareTyp,jdbcType=INTEGER},
+      <if test="shareType != null">
+        #{shareType,jdbcType=INTEGER},
       </if>
-      <if test="agentId != null">
-        #{agentId,jdbcType=VARCHAR},
+      <if test="customerType != null">
+        #{customerType,jdbcType=INTEGER},
       </if>
-      <if test="companyIntention != null">
-        #{companyIntention,jdbcType=VARCHAR},
+      <if test="customerStatus != null">
+        #{customerStatus,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+      <if test="companyIntention != null">
+        #{companyIntention,jdbcType=CHAR},
       </if>
       <if test="followSituation != null">
-        #{followSituation,jdbcType=VARCHAR},
-      </if>
-      <if test="customerStatue != null">
-        #{customerStatue,jdbcType=VARCHAR},
-      </if>
-      <if test="paid != null">
-        #{paid,jdbcType=VARCHAR},
+        #{followSituation,jdbcType=INTEGER},
       </if>
       <if test="tag != null">
         #{tag,jdbcType=VARCHAR},
       </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="followId != null">
+        #{followId,jdbcType=VARCHAR},
+      </if>
+      <if test="effective != null">
+        #{effective,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.CustomerExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     select count(*) from customer
     <if test="_parameter != null">
@@ -254,7 +263,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     update customer
     <set>
@@ -264,33 +273,36 @@
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
-      <if test="record.customerTyp != null">
-        customer_typ = #{record.customerTyp,jdbcType=VARCHAR},
+      <if test="record.paid != null">
+        paid = #{record.paid,jdbcType=VARCHAR},
       </if>
-      <if test="record.shareTyp != null">
-        share_typ = #{record.shareTyp,jdbcType=INTEGER},
+      <if test="record.shareType != null">
+        share_type = #{record.shareType,jdbcType=INTEGER},
       </if>
-      <if test="record.agentId != null">
-        agent_id = #{record.agentId,jdbcType=VARCHAR},
+      <if test="record.customerType != null">
+        customer_type = #{record.customerType,jdbcType=INTEGER},
       </if>
-      <if test="record.companyIntention != null">
-        company_intention = #{record.companyIntention,jdbcType=VARCHAR},
+      <if test="record.customerStatus != null">
+        customer_status = #{record.customerStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      <if test="record.companyIntention != null">
+        company_intention = #{record.companyIntention,jdbcType=CHAR},
       </if>
       <if test="record.followSituation != null">
-        follow_situation = #{record.followSituation,jdbcType=VARCHAR},
-      </if>
-      <if test="record.customerStatue != null">
-        customer_statue = #{record.customerStatue,jdbcType=VARCHAR},
-      </if>
-      <if test="record.paid != null">
-        paid = #{record.paid,jdbcType=VARCHAR},
+        follow_situation = #{record.followSituation,jdbcType=INTEGER},
       </if>
       <if test="record.tag != null">
         tag = #{record.tag,jdbcType=VARCHAR},
       </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.followId != null">
+        follow_id = #{record.followId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.effective != null">
+        effective = #{record.effective,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -300,20 +312,21 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     update customer
     set id = #{record.id,jdbcType=VARCHAR},
       aid = #{record.aid,jdbcType=VARCHAR},
-      customer_typ = #{record.customerTyp,jdbcType=VARCHAR},
-      share_typ = #{record.shareTyp,jdbcType=INTEGER},
-      agent_id = #{record.agentId,jdbcType=VARCHAR},
-      company_intention = #{record.companyIntention,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      follow_situation = #{record.followSituation,jdbcType=VARCHAR},
-      customer_statue = #{record.customerStatue,jdbcType=VARCHAR},
       paid = #{record.paid,jdbcType=VARCHAR},
-      tag = #{record.tag,jdbcType=VARCHAR}
+      share_type = #{record.shareType,jdbcType=INTEGER},
+      customer_type = #{record.customerType,jdbcType=INTEGER},
+      customer_status = #{record.customerStatus,jdbcType=INTEGER},
+      company_intention = #{record.companyIntention,jdbcType=CHAR},
+      follow_situation = #{record.followSituation,jdbcType=INTEGER},
+      tag = #{record.tag,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      follow_id = #{record.followId,jdbcType=VARCHAR},
+      effective = #{record.effective,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -322,179 +335,72 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
     update customer
     <set>
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
-      <if test="customerTyp != null">
-        customer_typ = #{customerTyp,jdbcType=VARCHAR},
+      <if test="paid != null">
+        paid = #{paid,jdbcType=VARCHAR},
       </if>
-      <if test="shareTyp != null">
-        share_typ = #{shareTyp,jdbcType=INTEGER},
+      <if test="shareType != null">
+        share_type = #{shareType,jdbcType=INTEGER},
       </if>
-      <if test="agentId != null">
-        agent_id = #{agentId,jdbcType=VARCHAR},
+      <if test="customerType != null">
+        customer_type = #{customerType,jdbcType=INTEGER},
       </if>
-      <if test="companyIntention != null">
-        company_intention = #{companyIntention,jdbcType=VARCHAR},
+      <if test="customerStatus != null">
+        customer_status = #{customerStatus,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
+      <if test="companyIntention != null">
+        company_intention = #{companyIntention,jdbcType=CHAR},
       </if>
       <if test="followSituation != null">
-        follow_situation = #{followSituation,jdbcType=VARCHAR},
-      </if>
-      <if test="customerStatue != null">
-        customer_statue = #{customerStatue,jdbcType=VARCHAR},
-      </if>
-      <if test="paid != null">
-        paid = #{paid,jdbcType=VARCHAR},
+        follow_situation = #{followSituation,jdbcType=INTEGER},
       </if>
       <if test="tag != null">
         tag = #{tag,jdbcType=VARCHAR},
       </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.Customer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 12 20:42:55 CST 2017.
-    -->
-    update customer
-    set aid = #{aid,jdbcType=VARCHAR},
-      customer_typ = #{customerTyp,jdbcType=VARCHAR},
-      share_typ = #{shareTyp,jdbcType=INTEGER},
-      agent_id = #{agentId,jdbcType=VARCHAR},
-      company_intention = #{companyIntention,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      follow_situation = #{followSituation,jdbcType=VARCHAR},
-      customer_statue = #{customerStatue,jdbcType=VARCHAR},
-      paid = #{paid,jdbcType=VARCHAR},
-      tag = #{tag,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  
-    <update id="updateCustomerByPrimaryKey" parameterType="com.goafanti.common.model.Customer">
-    update customer
-    <set>
-      <if test="aid != null">
-        aid = #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="customerTyp != null">
-        customer_typ = #{customerTyp,jdbcType=VARCHAR},
-      </if>
-      <if test="shareTyp != null">
-        share_typ = #{shareTyp,jdbcType=INTEGER},
-      </if>
-      <if test="agentId != null">
-        agent_id = #{agentId,jdbcType=VARCHAR},
-      </if>
-      <if test="companyIntention != null">
-        company_intention = #{companyIntention,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="followSituation != null">
-        follow_situation = #{followSituation,jdbcType=VARCHAR},
+      <if test="followId != null">
+        follow_id = #{followId,jdbcType=VARCHAR},
       </if>
-      <if test="customerStatue != null">
-        customer_statue = #{customerStatue,jdbcType=VARCHAR},
-      </if>
-      <if test="paid != null">
-        paid = #{paid,jdbcType=VARCHAR},
+      <if test="effective != null">
+        effective = #{effective,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-
-   <insert id="insertCustomer" parameterType="com.goafanti.common.model.Customer">
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.Customer">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 15:40:31 CST 2017.
+      This element was generated on Fri Oct 13 15:28:17 CST 2017.
     -->
-    insert into customer
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="aid != null">
-        aid,
-      </if>
-      <if test="customerTyp != null">
-        customer_typ,
-      </if>
-      <if test="shareTyp != null">
-        share_typ,
-      </if>
-      <if test="agentId != null">
-        agent_id,
-      </if>
-      <if test="companyIntention != null">
-        company_intention,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="followSituation != null">
-        follow_situation,
-      </if>
-      <if test="customerStatue != null">
-        customer_statue,
-      </if>
-      <if test="paid != null">
-        paid,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="aid != null">
-        #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="customerTyp != null">
-        #{customerTyp,jdbcType=VARCHAR},
-      </if>
-      <if test="shareTyp != null">
-        #{shareTyp,jdbcType=INTEGER},
-      </if>
-      <if test="agentId != null">
-        #{agentId,jdbcType=VARCHAR},
-      </if>
-      <if test="companyIntention != null">
-        #{companyIntention,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="followSituation != null">
-        #{followSituation,jdbcType=VARCHAR},
-      </if>
-      <if test="customerStatue != null">
-        #{customerStatue,jdbcType=VARCHAR},
-      </if>
-      <if test="paid != null">
-        #{paid,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-
-  <delete id="deleteCustomerByPrimaryKey" parameterType="java.lang.String">
-    delete from customer
+    update customer
+    set aid = #{aid,jdbcType=VARCHAR},
+      paid = #{paid,jdbcType=VARCHAR},
+      share_type = #{shareType,jdbcType=INTEGER},
+      customer_type = #{customerType,jdbcType=INTEGER},
+      customer_status = #{customerStatus,jdbcType=INTEGER},
+      company_intention = #{companyIntention,jdbcType=CHAR},
+      follow_situation = #{followSituation,jdbcType=INTEGER},
+      tag = #{tag,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      follow_id = #{followId,jdbcType=VARCHAR},
+      effective = #{effective,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
-  </delete>
-
+  </update>
+	
+	  
   <select id="selectCustomerByPrimaryKey" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerBo">
     select 
     a.customer_typ as customerTyp,
-     a.share_typ as shareTyp,
+    a.share_typ as shareTyp,
     a.company_intention as companyIntention,
     a.create_time as createTime,
     a.follow_situation as followSituation,
@@ -504,10 +410,51 @@
     c.company_name as companyName,
     c.location_province as locationProvince,
     c.company_industry as companyIndustry,
-    c.adress -->
+    c.adress --&gt;
     from customer a 
     left join customer_user_info b on  a.id=b.cid
     left join customer_organization_info c on a.id=c.cid
     where id = #{id,jdbcType=VARCHAR}
   </select> 
+  
+  <select id="selectCustomer" parameterType="com.goafanti.customer.bo.CustomerIn" resultType="com.goafanti.customer.bo.CustomerOut">
+    select a.id,a.customer_typ as customerTyp,a.share_typ as shareTyp,a.tag,a.follow_situation as followSituation,
+    c.name,c.mobile,c.tel_num as telNum,
+    d.location_province as locationProvince,
+    e.name as adminName
+    from customer a
+    left join follow_up_record b on a.follow_id = b.id 
+    left join customer_user_info c on b.cuid = c.id 
+    left join customer_organization_info d on a.id = d.cid
+    left join admin e on a.aid = e.id 
+    where a.effective = 0
+    <if test="shareTyp != null">
+        and a.share_typ = #{shareTyp,jdbcType=INTEGER}
+    </if>
+    <if test="customerType != null">
+        and a.customer_typ = #{customerTyp,jdbcType=INTEGER}
+    </if>
+    <if test="customerStauts != null">
+    	and a.customer_status = #{customerStauts,jdbcType=INTEGER}
+    </if>
+    <if test="companyIntention != null">
+    	and a.company_intention = #{companyIntention,jdbcType=INTEGER}
+    </if>
+    <if test="followSituation != null">
+    	and a.follow_situation = #{followSituation,jdbcType=INTEGER}
+    </if>
+    <if test="contactName != null">
+    	and c.name = #{contactName,jdbcType=VARCHAR}
+    </if>
+    <if test="contactTel != null">
+    	 and c.tel_num = #{contactTel,jdbcType=VARCHAR}
+    </if>
+   	<if test="adminName != null">
+   	 	and e.name = #{adminName,jdbcType=VARCHAR}
+   	</if>
+   	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
 </mapper>

+ 37 - 20
src/main/java/com/goafanti/common/mapper/FollowUpRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="cid" jdbcType="VARCHAR" property="cid" />
@@ -15,12 +15,13 @@
     <result column="follow_result" jdbcType="VARCHAR" property="followResult" />
     <result column="follow_status" jdbcType="INTEGER" property="followStatus" />
     <result column="attachment" jdbcType="INTEGER" property="attachment" />
+    <result column="cuid" jdbcType="VARCHAR" property="cuid" />
   </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 Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -54,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -88,15 +89,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
-    id, cid, aid, follow_date, tm_stamp, follow_result, follow_status, attachment
+    id, cid, aid, follow_date, tm_stamp, follow_result, follow_status, attachment, cuid
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.FollowUpRecordExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     select
     <if test="distinct">
@@ -115,7 +116,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -126,7 +127,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     delete from follow_up_record
     where id = #{id,jdbcType=VARCHAR}
@@ -135,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     delete from follow_up_record
     <if test="_parameter != null">
@@ -146,20 +147,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     insert into follow_up_record (id, cid, aid, 
       follow_date, tm_stamp, follow_result, 
-      follow_status, attachment)
+      follow_status, attachment, cuid
+      )
     values (#{id,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
       #{followDate,jdbcType=TIMESTAMP}, #{tmStamp,jdbcType=TIMESTAMP}, #{followResult,jdbcType=VARCHAR}, 
-      #{followStatus,jdbcType=INTEGER}, #{attachment,jdbcType=INTEGER})
+      #{followStatus,jdbcType=INTEGER}, #{attachment,jdbcType=INTEGER}, #{cuid,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.FollowUpRecord">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     insert into follow_up_record
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -187,6 +190,9 @@
       <if test="attachment != null">
         attachment,
       </if>
+      <if test="cuid != null">
+        cuid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -213,13 +219,16 @@
       <if test="attachment != null">
         #{attachment,jdbcType=INTEGER},
       </if>
+      <if test="cuid != null">
+        #{cuid,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.FollowUpRecordExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     select count(*) from follow_up_record
     <if test="_parameter != null">
@@ -230,7 +239,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     update follow_up_record
     <set>
@@ -258,6 +267,9 @@
       <if test="record.attachment != null">
         attachment = #{record.attachment,jdbcType=INTEGER},
       </if>
+      <if test="record.cuid != null">
+        cuid = #{record.cuid,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -267,7 +279,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     update follow_up_record
     set id = #{record.id,jdbcType=VARCHAR},
@@ -277,7 +289,8 @@
       tm_stamp = #{record.tmStamp,jdbcType=TIMESTAMP},
       follow_result = #{record.followResult,jdbcType=VARCHAR},
       follow_status = #{record.followStatus,jdbcType=INTEGER},
-      attachment = #{record.attachment,jdbcType=INTEGER}
+      attachment = #{record.attachment,jdbcType=INTEGER},
+      cuid = #{record.cuid,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -286,7 +299,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     update follow_up_record
     <set>
@@ -311,6 +324,9 @@
       <if test="attachment != null">
         attachment = #{attachment,jdbcType=INTEGER},
       </if>
+      <if test="cuid != null">
+        cuid = #{cuid,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -318,7 +334,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:36 CST 2017.
+      This element was generated on Fri Oct 13 09:37:04 CST 2017.
     -->
     update follow_up_record
     set cid = #{cid,jdbcType=VARCHAR},
@@ -327,7 +343,8 @@
       tm_stamp = #{tmStamp,jdbcType=TIMESTAMP},
       follow_result = #{followResult,jdbcType=VARCHAR},
       follow_status = #{followStatus,jdbcType=INTEGER},
-      attachment = #{attachment,jdbcType=INTEGER}
+      attachment = #{attachment,jdbcType=INTEGER},
+      cuid = #{cuid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 276 - 361
src/main/java/com/goafanti/common/model/Customer.java

@@ -3,366 +3,281 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class Customer {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.id
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.aid
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String aid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.customer_typ
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String customerTyp;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.share_typ
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private Integer shareTyp;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.agent_id
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String agentId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.company_intention
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String companyIntention;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.create_time
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private Date createTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.follow_situation
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String followSituation;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.customer_statue
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String customerStatue;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.paid
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String paid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column customer.tag
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    private String tag;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.id
-     *
-     * @return the value of customer.id
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.id
-     *
-     * @param id the value for customer.id
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.aid
-     *
-     * @return the value of customer.aid
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getAid() {
-        return aid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.aid
-     *
-     * @param aid the value for customer.aid
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setAid(String aid) {
-        this.aid = aid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.customer_typ
-     *
-     * @return the value of customer.customer_typ
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getCustomerTyp() {
-        return customerTyp;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.customer_typ
-     *
-     * @param customerTyp the value for customer.customer_typ
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setCustomerTyp(String customerTyp) {
-        this.customerTyp = customerTyp;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.share_typ
-     *
-     * @return the value of customer.share_typ
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public Integer getShareTyp() {
-        return shareTyp;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.share_typ
-     *
-     * @param shareTyp the value for customer.share_typ
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setShareTyp(Integer shareTyp) {
-        this.shareTyp = shareTyp;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.agent_id
-     *
-     * @return the value of customer.agent_id
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getAgentId() {
-        return agentId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.agent_id
-     *
-     * @param agentId the value for customer.agent_id
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setAgentId(String agentId) {
-        this.agentId = agentId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.company_intention
-     *
-     * @return the value of customer.company_intention
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getCompanyIntention() {
-        return companyIntention;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.company_intention
-     *
-     * @param companyIntention the value for customer.company_intention
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setCompanyIntention(String companyIntention) {
-        this.companyIntention = companyIntention;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.create_time
-     *
-     * @return the value of customer.create_time
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.create_time
-     *
-     * @param createTime the value for customer.create_time
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 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 customer.follow_situation
-     *
-     * @return the value of customer.follow_situation
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getFollowSituation() {
-        return followSituation;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.follow_situation
-     *
-     * @param followSituation the value for customer.follow_situation
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setFollowSituation(String followSituation) {
-        this.followSituation = followSituation;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.customer_statue
-     *
-     * @return the value of customer.customer_statue
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getCustomerStatue() {
-        return customerStatue;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.customer_statue
-     *
-     * @param customerStatue the value for customer.customer_statue
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setCustomerStatue(String customerStatue) {
-        this.customerStatue = customerStatue;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.paid
-     *
-     * @return the value of customer.paid
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getPaid() {
-        return paid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.paid
-     *
-     * @param paid the value for customer.paid
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setPaid(String paid) {
-        this.paid = paid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column customer.tag
-     *
-     * @return the value of customer.tag
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public String getTag() {
-        return tag;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column customer.tag
-     *
-     * @param tag the value for customer.tag
-     *
-     * @mbg.generated Thu Oct 12 20:42:55 CST 2017
-     */
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.id
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.aid
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.paid
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private String paid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.share_type
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private Integer shareType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.customer_type
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private Integer customerType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.customer_status
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private Integer customerStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.company_intention
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private String companyIntention;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.follow_situation
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private Integer followSituation;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.tag
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private String tag;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.create_time
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.follow_id
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private String followId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.effective
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	private Integer effective;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.id
+	 * @return  the value of customer.id
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.id
+	 * @param id  the value for customer.id
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.aid
+	 * @return  the value of customer.aid
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.aid
+	 * @param aid  the value for customer.aid
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.paid
+	 * @return  the value of customer.paid
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public String getPaid() {
+		return paid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.paid
+	 * @param paid  the value for customer.paid
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setPaid(String paid) {
+		this.paid = paid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.share_type
+	 * @return  the value of customer.share_type
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public Integer getShareType() {
+		return shareType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.share_type
+	 * @param shareType  the value for customer.share_type
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setShareType(Integer shareType) {
+		this.shareType = shareType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.customer_type
+	 * @return  the value of customer.customer_type
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public Integer getCustomerType() {
+		return customerType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.customer_type
+	 * @param customerType  the value for customer.customer_type
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setCustomerType(Integer customerType) {
+		this.customerType = customerType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.customer_status
+	 * @return  the value of customer.customer_status
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public Integer getCustomerStatus() {
+		return customerStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.customer_status
+	 * @param customerStatus  the value for customer.customer_status
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setCustomerStatus(Integer customerStatus) {
+		this.customerStatus = customerStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.company_intention
+	 * @return  the value of customer.company_intention
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public String getCompanyIntention() {
+		return companyIntention;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.company_intention
+	 * @param companyIntention  the value for customer.company_intention
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setCompanyIntention(String companyIntention) {
+		this.companyIntention = companyIntention;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.follow_situation
+	 * @return  the value of customer.follow_situation
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public Integer getFollowSituation() {
+		return followSituation;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.follow_situation
+	 * @param followSituation  the value for customer.follow_situation
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setFollowSituation(Integer followSituation) {
+		this.followSituation = followSituation;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.tag
+	 * @return  the value of customer.tag
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public String getTag() {
+		return tag;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.tag
+	 * @param tag  the value for customer.tag
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setTag(String tag) {
+		this.tag = tag;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.create_time
+	 * @return  the value of customer.create_time
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.create_time
+	 * @param createTime  the value for customer.create_time
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.follow_id
+	 * @return  the value of customer.follow_id
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public String getFollowId() {
+		return followId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.follow_id
+	 * @param followId  the value for customer.follow_id
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setFollowId(String followId) {
+		this.followId = followId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer.effective
+	 * @return  the value of customer.effective
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public Integer getEffective() {
+		return effective;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer.effective
+	 * @param effective  the value for customer.effective
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
+	 */
+	public void setEffective(Integer effective) {
+		this.effective = effective;
+	}
 }

+ 274 - 244
src/main/java/com/goafanti/common/model/CustomerExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class CustomerExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public CustomerExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class CustomerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class CustomerExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -303,203 +303,253 @@ public class CustomerExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypIsNull() {
-			addCriterion("customer_typ is null");
+		public Criteria andPaidIsNull() {
+			addCriterion("paid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidIsNotNull() {
+			addCriterion("paid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidEqualTo(String value) {
+			addCriterion("paid =", value, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidNotEqualTo(String value) {
+			addCriterion("paid <>", value, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidGreaterThan(String value) {
+			addCriterion("paid >", value, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidGreaterThanOrEqualTo(String value) {
+			addCriterion("paid >=", value, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidLessThan(String value) {
+			addCriterion("paid <", value, "paid");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypIsNotNull() {
-			addCriterion("customer_typ is not null");
+		public Criteria andPaidLessThanOrEqualTo(String value) {
+			addCriterion("paid <=", value, "paid");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypEqualTo(String value) {
-			addCriterion("customer_typ =", value, "customerTyp");
+		public Criteria andPaidLike(String value) {
+			addCriterion("paid like", value, "paid");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypNotEqualTo(String value) {
-			addCriterion("customer_typ <>", value, "customerTyp");
+		public Criteria andPaidNotLike(String value) {
+			addCriterion("paid not like", value, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidIn(List<String> values) {
+			addCriterion("paid in", values, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidNotIn(List<String> values) {
+			addCriterion("paid not in", values, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidBetween(String value1, String value2) {
+			addCriterion("paid between", value1, value2, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidNotBetween(String value1, String value2) {
+			addCriterion("paid not between", value1, value2, "paid");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypGreaterThan(String value) {
-			addCriterion("customer_typ >", value, "customerTyp");
+		public Criteria andShareTypeIsNull() {
+			addCriterion("share_type is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypGreaterThanOrEqualTo(String value) {
-			addCriterion("customer_typ >=", value, "customerTyp");
+		public Criteria andShareTypeIsNotNull() {
+			addCriterion("share_type is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypLessThan(String value) {
-			addCriterion("customer_typ <", value, "customerTyp");
+		public Criteria andShareTypeEqualTo(Integer value) {
+			addCriterion("share_type =", value, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypLessThanOrEqualTo(String value) {
-			addCriterion("customer_typ <=", value, "customerTyp");
+		public Criteria andShareTypeNotEqualTo(Integer value) {
+			addCriterion("share_type <>", value, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypLike(String value) {
-			addCriterion("customer_typ like", value, "customerTyp");
+		public Criteria andShareTypeGreaterThan(Integer value) {
+			addCriterion("share_type >", value, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypNotLike(String value) {
-			addCriterion("customer_typ not like", value, "customerTyp");
+		public Criteria andShareTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("share_type >=", value, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypIn(List<String> values) {
-			addCriterion("customer_typ in", values, "customerTyp");
+		public Criteria andShareTypeLessThan(Integer value) {
+			addCriterion("share_type <", value, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypNotIn(List<String> values) {
-			addCriterion("customer_typ not in", values, "customerTyp");
+		public Criteria andShareTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("share_type <=", value, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypBetween(String value1, String value2) {
-			addCriterion("customer_typ between", value1, value2, "customerTyp");
+		public Criteria andShareTypeIn(List<Integer> values) {
+			addCriterion("share_type in", values, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerTypNotBetween(String value1, String value2) {
-			addCriterion("customer_typ not between", value1, value2, "customerTyp");
+		public Criteria andShareTypeNotIn(List<Integer> values) {
+			addCriterion("share_type not in", values, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypIsNull() {
-			addCriterion("share_typ is null");
+		public Criteria andShareTypeBetween(Integer value1, Integer value2) {
+			addCriterion("share_type between", value1, value2, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypIsNotNull() {
-			addCriterion("share_typ is not null");
+		public Criteria andShareTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("share_type not between", value1, value2, "shareType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypEqualTo(Integer value) {
-			addCriterion("share_typ =", value, "shareTyp");
+		public Criteria andCustomerTypeIsNull() {
+			addCriterion("customer_type is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypNotEqualTo(Integer value) {
-			addCriterion("share_typ <>", value, "shareTyp");
+		public Criteria andCustomerTypeIsNotNull() {
+			addCriterion("customer_type is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypGreaterThan(Integer value) {
-			addCriterion("share_typ >", value, "shareTyp");
+		public Criteria andCustomerTypeEqualTo(Integer value) {
+			addCriterion("customer_type =", value, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypGreaterThanOrEqualTo(Integer value) {
-			addCriterion("share_typ >=", value, "shareTyp");
+		public Criteria andCustomerTypeNotEqualTo(Integer value) {
+			addCriterion("customer_type <>", value, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypLessThan(Integer value) {
-			addCriterion("share_typ <", value, "shareTyp");
+		public Criteria andCustomerTypeGreaterThan(Integer value) {
+			addCriterion("customer_type >", value, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypLessThanOrEqualTo(Integer value) {
-			addCriterion("share_typ <=", value, "shareTyp");
+		public Criteria andCustomerTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("customer_type >=", value, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypIn(List<Integer> values) {
-			addCriterion("share_typ in", values, "shareTyp");
+		public Criteria andCustomerTypeLessThan(Integer value) {
+			addCriterion("customer_type <", value, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypNotIn(List<Integer> values) {
-			addCriterion("share_typ not in", values, "shareTyp");
+		public Criteria andCustomerTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("customer_type <=", value, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypBetween(Integer value1, Integer value2) {
-			addCriterion("share_typ between", value1, value2, "shareTyp");
+		public Criteria andCustomerTypeIn(List<Integer> values) {
+			addCriterion("customer_type in", values, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypNotBetween(Integer value1, Integer value2) {
-			addCriterion("share_typ not between", value1, value2, "shareTyp");
+		public Criteria andCustomerTypeNotIn(List<Integer> values) {
+			addCriterion("customer_type not in", values, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdIsNull() {
-			addCriterion("agent_id is null");
+		public Criteria andCustomerTypeBetween(Integer value1, Integer value2) {
+			addCriterion("customer_type between", value1, value2, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdIsNotNull() {
-			addCriterion("agent_id is not null");
+		public Criteria andCustomerTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("customer_type not between", value1, value2, "customerType");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdEqualTo(String value) {
-			addCriterion("agent_id =", value, "agentId");
+		public Criteria andCustomerStatusIsNull() {
+			addCriterion("customer_status is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdNotEqualTo(String value) {
-			addCriterion("agent_id <>", value, "agentId");
+		public Criteria andCustomerStatusIsNotNull() {
+			addCriterion("customer_status is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdGreaterThan(String value) {
-			addCriterion("agent_id >", value, "agentId");
+		public Criteria andCustomerStatusEqualTo(Integer value) {
+			addCriterion("customer_status =", value, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdGreaterThanOrEqualTo(String value) {
-			addCriterion("agent_id >=", value, "agentId");
+		public Criteria andCustomerStatusNotEqualTo(Integer value) {
+			addCriterion("customer_status <>", value, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdLessThan(String value) {
-			addCriterion("agent_id <", value, "agentId");
+		public Criteria andCustomerStatusGreaterThan(Integer value) {
+			addCriterion("customer_status >", value, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdLessThanOrEqualTo(String value) {
-			addCriterion("agent_id <=", value, "agentId");
+		public Criteria andCustomerStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("customer_status >=", value, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdLike(String value) {
-			addCriterion("agent_id like", value, "agentId");
+		public Criteria andCustomerStatusLessThan(Integer value) {
+			addCriterion("customer_status <", value, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdNotLike(String value) {
-			addCriterion("agent_id not like", value, "agentId");
+		public Criteria andCustomerStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("customer_status <=", value, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdIn(List<String> values) {
-			addCriterion("agent_id in", values, "agentId");
+		public Criteria andCustomerStatusIn(List<Integer> values) {
+			addCriterion("customer_status in", values, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdNotIn(List<String> values) {
-			addCriterion("agent_id not in", values, "agentId");
+		public Criteria andCustomerStatusNotIn(List<Integer> values) {
+			addCriterion("customer_status not in", values, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdBetween(String value1, String value2) {
-			addCriterion("agent_id between", value1, value2, "agentId");
+		public Criteria andCustomerStatusBetween(Integer value1, Integer value2) {
+			addCriterion("customer_status between", value1, value2, "customerStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andAgentIdNotBetween(String value1, String value2) {
-			addCriterion("agent_id not between", value1, value2, "agentId");
+		public Criteria andCustomerStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("customer_status not between", value1, value2, "customerStatus");
 			return (Criteria) this;
 		}
 
@@ -573,350 +623,330 @@ public class CustomerExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeIsNull() {
-			addCriterion("create_time is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreateTimeIsNotNull() {
-			addCriterion("create_time is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreateTimeEqualTo(Date value) {
-			addCriterion("create_time =", value, "createTime");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreateTimeNotEqualTo(Date value) {
-			addCriterion("create_time <>", value, "createTime");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreateTimeGreaterThan(Date value) {
-			addCriterion("create_time >", value, "createTime");
+		public Criteria andFollowSituationIsNull() {
+			addCriterion("follow_situation is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-			addCriterion("create_time >=", value, "createTime");
+		public Criteria andFollowSituationIsNotNull() {
+			addCriterion("follow_situation is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeLessThan(Date value) {
-			addCriterion("create_time <", value, "createTime");
+		public Criteria andFollowSituationEqualTo(Integer value) {
+			addCriterion("follow_situation =", value, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-			addCriterion("create_time <=", value, "createTime");
+		public Criteria andFollowSituationNotEqualTo(Integer value) {
+			addCriterion("follow_situation <>", value, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeIn(List<Date> values) {
-			addCriterion("create_time in", values, "createTime");
+		public Criteria andFollowSituationGreaterThan(Integer value) {
+			addCriterion("follow_situation >", value, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeNotIn(List<Date> values) {
-			addCriterion("create_time not in", values, "createTime");
+		public Criteria andFollowSituationGreaterThanOrEqualTo(Integer value) {
+			addCriterion("follow_situation >=", value, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeBetween(Date value1, Date value2) {
-			addCriterion("create_time between", value1, value2, "createTime");
+		public Criteria andFollowSituationLessThan(Integer value) {
+			addCriterion("follow_situation <", value, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-			addCriterion("create_time not between", value1, value2, "createTime");
+		public Criteria andFollowSituationLessThanOrEqualTo(Integer value) {
+			addCriterion("follow_situation <=", value, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationIsNull() {
-			addCriterion("follow_situation is null");
+		public Criteria andFollowSituationIn(List<Integer> values) {
+			addCriterion("follow_situation in", values, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationIsNotNull() {
-			addCriterion("follow_situation is not null");
+		public Criteria andFollowSituationNotIn(List<Integer> values) {
+			addCriterion("follow_situation not in", values, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationEqualTo(String value) {
-			addCriterion("follow_situation =", value, "followSituation");
+		public Criteria andFollowSituationBetween(Integer value1, Integer value2) {
+			addCriterion("follow_situation between", value1, value2, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationNotEqualTo(String value) {
-			addCriterion("follow_situation <>", value, "followSituation");
+		public Criteria andFollowSituationNotBetween(Integer value1, Integer value2) {
+			addCriterion("follow_situation not between", value1, value2, "followSituation");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationGreaterThan(String value) {
-			addCriterion("follow_situation >", value, "followSituation");
+		public Criteria andTagIsNull() {
+			addCriterion("tag is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationGreaterThanOrEqualTo(String value) {
-			addCriterion("follow_situation >=", value, "followSituation");
+		public Criteria andTagIsNotNull() {
+			addCriterion("tag is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationLessThan(String value) {
-			addCriterion("follow_situation <", value, "followSituation");
+		public Criteria andTagEqualTo(String value) {
+			addCriterion("tag =", value, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationLessThanOrEqualTo(String value) {
-			addCriterion("follow_situation <=", value, "followSituation");
+		public Criteria andTagNotEqualTo(String value) {
+			addCriterion("tag <>", value, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationLike(String value) {
-			addCriterion("follow_situation like", value, "followSituation");
+		public Criteria andTagGreaterThan(String value) {
+			addCriterion("tag >", value, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationNotLike(String value) {
-			addCriterion("follow_situation not like", value, "followSituation");
+		public Criteria andTagGreaterThanOrEqualTo(String value) {
+			addCriterion("tag >=", value, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationIn(List<String> values) {
-			addCriterion("follow_situation in", values, "followSituation");
+		public Criteria andTagLessThan(String value) {
+			addCriterion("tag <", value, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationNotIn(List<String> values) {
-			addCriterion("follow_situation not in", values, "followSituation");
+		public Criteria andTagLessThanOrEqualTo(String value) {
+			addCriterion("tag <=", value, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationBetween(String value1, String value2) {
-			addCriterion("follow_situation between", value1, value2, "followSituation");
+		public Criteria andTagLike(String value) {
+			addCriterion("tag like", value, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andFollowSituationNotBetween(String value1, String value2) {
-			addCriterion("follow_situation not between", value1, value2, "followSituation");
+		public Criteria andTagNotLike(String value) {
+			addCriterion("tag not like", value, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueIsNull() {
-			addCriterion("customer_statue is null");
+		public Criteria andTagIn(List<String> values) {
+			addCriterion("tag in", values, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueIsNotNull() {
-			addCriterion("customer_statue is not null");
+		public Criteria andTagNotIn(List<String> values) {
+			addCriterion("tag not in", values, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueEqualTo(String value) {
-			addCriterion("customer_statue =", value, "customerStatue");
+		public Criteria andTagBetween(String value1, String value2) {
+			addCriterion("tag between", value1, value2, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueNotEqualTo(String value) {
-			addCriterion("customer_statue <>", value, "customerStatue");
+		public Criteria andTagNotBetween(String value1, String value2) {
+			addCriterion("tag not between", value1, value2, "tag");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueGreaterThan(String value) {
-			addCriterion("customer_statue >", value, "customerStatue");
+		public Criteria andCreateTimeIsNull() {
+			addCriterion("create_time is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueGreaterThanOrEqualTo(String value) {
-			addCriterion("customer_statue >=", value, "customerStatue");
+		public Criteria andCreateTimeIsNotNull() {
+			addCriterion("create_time is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueLessThan(String value) {
-			addCriterion("customer_statue <", value, "customerStatue");
+		public Criteria andCreateTimeEqualTo(Date value) {
+			addCriterion("create_time =", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueLessThanOrEqualTo(String value) {
-			addCriterion("customer_statue <=", value, "customerStatue");
+		public Criteria andCreateTimeNotEqualTo(Date value) {
+			addCriterion("create_time <>", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueLike(String value) {
-			addCriterion("customer_statue like", value, "customerStatue");
+		public Criteria andCreateTimeGreaterThan(Date value) {
+			addCriterion("create_time >", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueNotLike(String value) {
-			addCriterion("customer_statue not like", value, "customerStatue");
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("create_time >=", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueIn(List<String> values) {
-			addCriterion("customer_statue in", values, "customerStatue");
+		public Criteria andCreateTimeLessThan(Date value) {
+			addCriterion("create_time <", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueNotIn(List<String> values) {
-			addCriterion("customer_statue not in", values, "customerStatue");
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+			addCriterion("create_time <=", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueBetween(String value1, String value2) {
-			addCriterion("customer_statue between", value1, value2, "customerStatue");
+		public Criteria andCreateTimeIn(List<Date> values) {
+			addCriterion("create_time in", values, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCustomerStatueNotBetween(String value1, String value2) {
-			addCriterion("customer_statue not between", value1, value2, "customerStatue");
+		public Criteria andCreateTimeNotIn(List<Date> values) {
+			addCriterion("create_time not in", values, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidIsNull() {
-			addCriterion("paid is null");
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
+			addCriterion("create_time between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidIsNotNull() {
-			addCriterion("paid is not null");
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidEqualTo(String value) {
-			addCriterion("paid =", value, "paid");
+		public Criteria andFollowIdIsNull() {
+			addCriterion("follow_id is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidNotEqualTo(String value) {
-			addCriterion("paid <>", value, "paid");
+		public Criteria andFollowIdIsNotNull() {
+			addCriterion("follow_id is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidGreaterThan(String value) {
-			addCriterion("paid >", value, "paid");
+		public Criteria andFollowIdEqualTo(String value) {
+			addCriterion("follow_id =", value, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidGreaterThanOrEqualTo(String value) {
-			addCriterion("paid >=", value, "paid");
+		public Criteria andFollowIdNotEqualTo(String value) {
+			addCriterion("follow_id <>", value, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidLessThan(String value) {
-			addCriterion("paid <", value, "paid");
+		public Criteria andFollowIdGreaterThan(String value) {
+			addCriterion("follow_id >", value, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidLessThanOrEqualTo(String value) {
-			addCriterion("paid <=", value, "paid");
+		public Criteria andFollowIdGreaterThanOrEqualTo(String value) {
+			addCriterion("follow_id >=", value, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidLike(String value) {
-			addCriterion("paid like", value, "paid");
+		public Criteria andFollowIdLessThan(String value) {
+			addCriterion("follow_id <", value, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidNotLike(String value) {
-			addCriterion("paid not like", value, "paid");
+		public Criteria andFollowIdLessThanOrEqualTo(String value) {
+			addCriterion("follow_id <=", value, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidIn(List<String> values) {
-			addCriterion("paid in", values, "paid");
+		public Criteria andFollowIdLike(String value) {
+			addCriterion("follow_id like", value, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidNotIn(List<String> values) {
-			addCriterion("paid not in", values, "paid");
+		public Criteria andFollowIdNotLike(String value) {
+			addCriterion("follow_id not like", value, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidBetween(String value1, String value2) {
-			addCriterion("paid between", value1, value2, "paid");
+		public Criteria andFollowIdIn(List<String> values) {
+			addCriterion("follow_id in", values, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andPaidNotBetween(String value1, String value2) {
-			addCriterion("paid not between", value1, value2, "paid");
+		public Criteria andFollowIdNotIn(List<String> values) {
+			addCriterion("follow_id not in", values, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagIsNull() {
-			addCriterion("tag is null");
+		public Criteria andFollowIdBetween(String value1, String value2) {
+			addCriterion("follow_id between", value1, value2, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagIsNotNull() {
-			addCriterion("tag is not null");
+		public Criteria andFollowIdNotBetween(String value1, String value2) {
+			addCriterion("follow_id not between", value1, value2, "followId");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagEqualTo(String value) {
-			addCriterion("tag =", value, "tag");
+		public Criteria andEffectiveIsNull() {
+			addCriterion("effective is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagNotEqualTo(String value) {
-			addCriterion("tag <>", value, "tag");
+		public Criteria andEffectiveIsNotNull() {
+			addCriterion("effective is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagGreaterThan(String value) {
-			addCriterion("tag >", value, "tag");
+		public Criteria andEffectiveEqualTo(Integer value) {
+			addCriterion("effective =", value, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagGreaterThanOrEqualTo(String value) {
-			addCriterion("tag >=", value, "tag");
+		public Criteria andEffectiveNotEqualTo(Integer value) {
+			addCriterion("effective <>", value, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagLessThan(String value) {
-			addCriterion("tag <", value, "tag");
+		public Criteria andEffectiveGreaterThan(Integer value) {
+			addCriterion("effective >", value, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagLessThanOrEqualTo(String value) {
-			addCriterion("tag <=", value, "tag");
+		public Criteria andEffectiveGreaterThanOrEqualTo(Integer value) {
+			addCriterion("effective >=", value, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagLike(String value) {
-			addCriterion("tag like", value, "tag");
+		public Criteria andEffectiveLessThan(Integer value) {
+			addCriterion("effective <", value, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagNotLike(String value) {
-			addCriterion("tag not like", value, "tag");
+		public Criteria andEffectiveLessThanOrEqualTo(Integer value) {
+			addCriterion("effective <=", value, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagIn(List<String> values) {
-			addCriterion("tag in", values, "tag");
+		public Criteria andEffectiveIn(List<Integer> values) {
+			addCriterion("effective in", values, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagNotIn(List<String> values) {
-			addCriterion("tag not in", values, "tag");
+		public Criteria andEffectiveNotIn(List<Integer> values) {
+			addCriterion("effective not in", values, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagBetween(String value1, String value2) {
-			addCriterion("tag between", value1, value2, "tag");
+		public Criteria andEffectiveBetween(Integer value1, Integer value2) {
+			addCriterion("effective between", value1, value2, "effective");
 			return (Criteria) this;
 		}
 
-		public Criteria andTagNotBetween(String value1, String value2) {
-			addCriterion("tag not between", value1, value2, "tag");
+		public Criteria andEffectiveNotBetween(Integer value1, Integer value2) {
+			addCriterion("effective not between", value1, value2, "effective");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer
-	 * @mbg.generated  Thu Oct 12 20:42:55 CST 2017
+	 * @mbg.generated  Fri Oct 13 15:28:17 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 47 - 24
src/main/java/com/goafanti/common/model/FollowUpRecord.java

@@ -6,49 +6,54 @@ public class FollowUpRecord {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.id
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.cid
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.aid
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.follow_date
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	private Date followDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.tm_stamp
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	private Date tmStamp;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.follow_result
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	private String followResult;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.follow_status
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	private Integer followStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.attachment
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	private Integer attachment;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column follow_up_record.cuid
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
+	 */
+	private String cuid;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.id
 	 * @return  the value of follow_up_record.id
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -57,7 +62,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.id
 	 * @param id  the value for follow_up_record.id
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -66,7 +71,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.cid
 	 * @return  the value of follow_up_record.cid
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public String getCid() {
 		return cid;
@@ -75,7 +80,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.cid
 	 * @param cid  the value for follow_up_record.cid
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -84,7 +89,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.aid
 	 * @return  the value of follow_up_record.aid
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public String getAid() {
 		return aid;
@@ -93,7 +98,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.aid
 	 * @param aid  the value for follow_up_record.aid
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -102,7 +107,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.follow_date
 	 * @return  the value of follow_up_record.follow_date
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public Date getFollowDate() {
 		return followDate;
@@ -111,7 +116,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.follow_date
 	 * @param followDate  the value for follow_up_record.follow_date
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setFollowDate(Date followDate) {
 		this.followDate = followDate;
@@ -120,7 +125,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.tm_stamp
 	 * @return  the value of follow_up_record.tm_stamp
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public Date getTmStamp() {
 		return tmStamp;
@@ -129,7 +134,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.tm_stamp
 	 * @param tmStamp  the value for follow_up_record.tm_stamp
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setTmStamp(Date tmStamp) {
 		this.tmStamp = tmStamp;
@@ -138,7 +143,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.follow_result
 	 * @return  the value of follow_up_record.follow_result
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public String getFollowResult() {
 		return followResult;
@@ -147,7 +152,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.follow_result
 	 * @param followResult  the value for follow_up_record.follow_result
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setFollowResult(String followResult) {
 		this.followResult = followResult;
@@ -156,7 +161,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.follow_status
 	 * @return  the value of follow_up_record.follow_status
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public Integer getFollowStatus() {
 		return followStatus;
@@ -165,7 +170,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.follow_status
 	 * @param followStatus  the value for follow_up_record.follow_status
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setFollowStatus(Integer followStatus) {
 		this.followStatus = followStatus;
@@ -174,7 +179,7 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.attachment
 	 * @return  the value of follow_up_record.attachment
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public Integer getAttachment() {
 		return attachment;
@@ -183,9 +188,27 @@ public class FollowUpRecord {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.attachment
 	 * @param attachment  the value for follow_up_record.attachment
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setAttachment(Integer attachment) {
 		this.attachment = attachment;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column follow_up_record.cuid
+	 * @return  the value of follow_up_record.cuid
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
+	 */
+	public String getCuid() {
+		return cuid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column follow_up_record.cuid
+	 * @param cuid  the value for follow_up_record.cuid
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
+	 */
+	public void setCuid(String cuid) {
+		this.cuid = cuid;
+	}
 }

+ 86 - 16
src/main/java/com/goafanti/common/model/FollowUpRecordExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class FollowUpRecordExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public FollowUpRecordExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class FollowUpRecordExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -682,11 +682,81 @@ public class FollowUpRecordExample {
 			addCriterion("attachment not between", value1, value2, "attachment");
 			return (Criteria) this;
 		}
+
+		public Criteria andCuidIsNull() {
+			addCriterion("cuid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidIsNotNull() {
+			addCriterion("cuid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidEqualTo(String value) {
+			addCriterion("cuid =", value, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidNotEqualTo(String value) {
+			addCriterion("cuid <>", value, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidGreaterThan(String value) {
+			addCriterion("cuid >", value, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidGreaterThanOrEqualTo(String value) {
+			addCriterion("cuid >=", value, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidLessThan(String value) {
+			addCriterion("cuid <", value, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidLessThanOrEqualTo(String value) {
+			addCriterion("cuid <=", value, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidLike(String value) {
+			addCriterion("cuid like", value, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidNotLike(String value) {
+			addCriterion("cuid not like", value, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidIn(List<String> values) {
+			addCriterion("cuid in", values, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidNotIn(List<String> values) {
+			addCriterion("cuid not in", values, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidBetween(String value1, String value2) {
+			addCriterion("cuid between", value1, value2, "cuid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCuidNotBetween(String value1, String value2) {
+			addCriterion("cuid not between", value1, value2, "cuid");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table follow_up_record
-	 * @mbg.generated  Mon Oct 09 17:40:36 CST 2017
+	 * @mbg.generated  Fri Oct 13 09:37:04 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 11 - 0
src/main/java/com/goafanti/customer/bo/CustomerIn.java

@@ -4,6 +4,9 @@ public class CustomerIn {
 	/** 客户名 **/
 	private String customerName;
 	
+	/** 客户类型 **/
+	private String customerTyp;
+	
 	/** 共享类型  **/
 	private String shareTyp; 
 	
@@ -33,6 +36,14 @@ public class CustomerIn {
 		this.customerName = customerName;
 	}
 
+	public String getCustomerTyp() {
+		return customerTyp;
+	}
+
+	public void setCustomerTyp(String customerTyp) {
+		this.customerTyp = customerTyp;
+	}
+
 	public String getShareTyp() {
 		return shareTyp;
 	}

+ 157 - 52
src/main/java/com/goafanti/customer/bo/CustomerBo.java

@@ -1,12 +1,12 @@
 package com.goafanti.customer.bo;
 
-import java.util.Date;
-
-public class CustomerBo {
+public class CustomerOut {
 	/**
 	 * 客户类型(1-个人用户,2-公司用户)
 	 */
-	private String customerTyp;
+	private Integer customerType;
+	
+	private String _customerType;
 	/**
 	 * id
 	 */
@@ -18,26 +18,32 @@ public class CustomerBo {
 	/**
 	 * 分享类型(1-个人用户,2-公共用户)
 	 */
-	private Integer shareTyp;
+	private Integer shareType;
+	
+	private String _shareType;
 	/**
-	 * 公司意向
+	 * 公司意向(0-发明专利、1-实用型新型专利、2-外观专利、3-软件著作权、4-知识产权贯标、5-高企认定、6-技术成果、7-技术需求、8-专家咨询)
 	 */
 	private String companyIntention;
-
+	
+	private String _companyIntention;
 	/**
 	 * 创建时间
 	 */
-	private Date createTime;
+	private String createTime;
 	/**
 	 * 跟进进度(0-已发项目介绍资料,1-已约面谈,2-已发合同计划书,3-已报价,4-已发合同,5-已签合同,6-面谈中,7-已面签)
 	 */
-	private String followSituation;
-
+	private Integer followSituation;
+	
+	private String _followSituation;
 
 	/**
 	 * 客户状态(0-新客户,1-意向客户,2-重点客户,3-面谈客户,4-签单客户,5-被拒绝客户)
 	 */
-	private String customerStatue;
+	private Integer customerStatus;
+	
+	private String _customerStatus;
 	/**
 	 * 个人客户姓名
 	 */
@@ -45,7 +51,7 @@ public class CustomerBo {
 	/**
 	 * 性别(0-男,1-女)
 	 */
-	private char sex;
+	private String sex;
 	/**
 	 * 座机号码
 	 */
@@ -103,163 +109,262 @@ public class CustomerBo {
 	 */
 	private String adress;
 	
+	/**
+	 * 跟单人
+	 */
+	private String adminName;
 	
-	public String getCustomerTyp() {
-		return customerTyp;
+	/**
+	 * 跟单时间
+	 */
+	private String followDate;
+
+	public Integer getCustomerType() {
+		return customerType;
+	}
+
+	public void setCustomerType(Integer customerType) {
+		this.customerType = customerType;
+	}
+
+	public String get_customerType() {
+		return _customerType;
 	}
-	public void setCustomerTyp(String customerTyp) {
-		this.customerTyp = customerTyp;
+
+	public void set_customerType(String _customerType) {
+		this._customerType = _customerType;
+	}
+
+	public String getId() {
+		return id;
 	}
-	public Integer getShareTyp() {
-		return shareTyp;
+
+	public void setId(String id) {
+		this.id = id;
 	}
-	public void setShareTyp(Integer shareTyp) {
-		this.shareTyp = shareTyp;
+
+	public String getCid() {
+		return cid;
 	}
+
+	public void setCid(String cid) {
+		this.cid = cid;
+	}
+
+	public Integer getShareType() {
+		return shareType;
+	}
+
+	public void setShareType(Integer shareType) {
+		this.shareType = shareType;
+	}
+
+	public String get_shareType() {
+		return _shareType;
+	}
+
+	public void set_shareType(String _shareType) {
+		this._shareType = _shareType;
+	}
+
 	public String getCompanyIntention() {
 		return companyIntention;
 	}
+
 	public void setCompanyIntention(String companyIntention) {
 		this.companyIntention = companyIntention;
 	}
-	public Date getCreateTime() {
+
+	public String get_companyIntention() {
+		return _companyIntention;
+	}
+
+	public void set_companyIntention(String _companyIntention) {
+		this._companyIntention = _companyIntention;
+	}
+
+	public String getCreateTime() {
 		return createTime;
 	}
-	public void setCreateTime(Date createTime) {
+
+	public void setCreateTime(String createTime) {
 		this.createTime = createTime;
 	}
-	public String getFollowSituation() {
+
+	public Integer getFollowSituation() {
 		return followSituation;
 	}
-	public void setFollowSituation(String followSituation) {
+
+	public void setFollowSituation(Integer followSituation) {
 		this.followSituation = followSituation;
 	}
-	public String getCustomerStatue() {
-		return customerStatue;
+
+	public String get_followSituation() {
+		return _followSituation;
+	}
+
+	public void set_followSituation(String _followSituation) {
+		this._followSituation = _followSituation;
+	}
+
+	public Integer getCustomerStatus() {
+		return customerStatus;
+	}
+
+	public void setCustomerStatus(Integer customerStatus) {
+		this.customerStatus = customerStatus;
 	}
-	public void setCustomerStatue(String customerStatue) {
-		this.customerStatue = customerStatue;
+
+	public String get_customerStatus() {
+		return _customerStatus;
 	}
+
+	public void set_customerStatus(String _customerStatus) {
+		this._customerStatus = _customerStatus;
+	}
+
 	public String getName() {
 		return name;
 	}
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	public char getSex() {
+
+	public String getSex() {
 		return sex;
 	}
-	public void setSex(char sex) {
+
+	public void setSex(String sex) {
 		this.sex = sex;
 	}
+
 	public String getMobile() {
 		return mobile;
 	}
+
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
 	}
+
 	public String getTelNum() {
 		return telNum;
 	}
+
 	public void setTelNum(String telNum) {
 		this.telNum = telNum;
 	}
+
 	public String getEmail() {
 		return email;
 	}
+
 	public void setEmail(String email) {
 		this.email = email;
 	}
+
 	public String getQq() {
 		return qq;
 	}
+
 	public void setQq(String qq) {
 		this.qq = qq;
 	}
+
 	public String getWechat() {
 		return wechat;
 	}
+
 	public void setWechat(String wechat) {
 		this.wechat = wechat;
 	}
+
 	public String getDepatrment() {
 		return depatrment;
 	}
+
 	public void setDepatrment(String depatrment) {
 		this.depatrment = depatrment;
 	}
+
 	public String getCustomerPosition() {
 		return customerPosition;
 	}
+
 	public void setCustomerPosition(String customerPosition) {
 		this.customerPosition = customerPosition;
 	}
+
 	public String getRemarks() {
 		return remarks;
 	}
+
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
 	}
+
 	public String getCompanyName() {
 		return companyName;
 	}
+
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 	}
+
 	public String getLocationProvince() {
 		return locationProvince;
 	}
+
 	public void setLocationProvince(String locationProvince) {
 		this.locationProvince = locationProvince;
 	}
+
 	public String getCompanyIndustry() {
 		return companyIndustry;
 	}
+
 	public void setCompanyIndustry(String companyIndustry) {
 		this.companyIndustry = companyIndustry;
 	}
+
 	public String getLocationCity() {
 		return locationCity;
 	}
+
 	public void setLocationCity(String locationCity) {
 		this.locationCity = locationCity;
 	}
+
 	public String getLocationArea() {
 		return locationArea;
 	}
+
 	public void setLocationArea(String locationArea) {
 		this.locationArea = locationArea;
 	}
+
 	public String getAdress() {
 		return adress;
 	}
+
 	public void setAdress(String adress) {
 		this.adress = adress;
 	}
-	
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
+
+	public String getAdminName() {
+		return adminName;
 	}
-	
-	public String getCid() {
-		return cid;
+
+	public void setAdminName(String adminName) {
+		this.adminName = adminName;
 	}
-	public void setCid(String cid) {
-		this.cid = cid;
+
+	public String getFollowDate() {
+		return followDate;
 	}
-	@Override
-	public String toString() {
-		return "CustomerBo [customerTyp=" + customerTyp + ", shareTyp=" + shareTyp + ", companyIntention="
-				+ companyIntention + ", createTime=" + createTime + ", followSituation=" + followSituation
-				+ ", customerStatue=" + customerStatue + ", name=" + name + ", sex=" + sex + ", mobile=" + mobile
-				+ ", telNum=" + telNum + ", email=" + email + ", qq=" + qq + ", wechat=" + wechat + ", depatrment="
-				+ depatrment + ", customerPosition=" + customerPosition + ", remarks=" + remarks + ", companyName="
-				+ companyName + ", locationProvince=" + locationProvince + ", companyIndustry=" + companyIndustry
-				+ ", locationCity=" + locationCity + ", locationArea=" + locationArea + ", adress=" + adress + "]";
+
+	public void setFollowDate(String followDate) {
+		this.followDate = followDate;
 	}
-	
-	
+
 }

+ 5 - 17
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.goafanti.customer.bo.CustomerBo;
 import com.goafanti.customer.bo.CustomerIn;
+import com.goafanti.customer.bo.CustomerOut;
 import com.goafanti.customer.service.CustomerOrganizationService;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.customer.service.CustomerUserService;
@@ -93,23 +93,10 @@ public class AdminCustomerApiController extends CertifyApiController {
 	@RequestMapping(value = "/detail", method = RequestMethod.POST)
 	public Result selectCustomerDetail(String id) throws ParseException {
 		Result res=new Result();
-		res.setData(customerService.selectCustomerByPrimaryKey(id));
+
 		return res;
 	}
-	
-	/**
-	 * 修改客户信息
-	 * 
-	 * @return
-	 * @throws ParseException
-	 */
-	@RequestMapping(value = "/updCustomer", method = RequestMethod.POST)
-	public void updCustomerDetail(String id) throws ParseException {
-		customerService.updCustomerByByPrimaryKey(id);
-		customerUserService.updCustomerUserByByPrimaryKey(id);
-		customerOrganizationService.updCustomerOrganizationByByPrimaryKey(id);
-	}
-	
+		
 	/**
 	 * 查询操作员信息
 	 * 
@@ -133,7 +120,8 @@ public class AdminCustomerApiController extends CertifyApiController {
 	public Result listPrivateCustomer(HttpServletRequest request,CustomerIn cin,Integer pageSize, Integer pageNumber){
 		Result  res = new Result();
 		String currentUserId = TokenManager.getUserId();
-		Pagination<CustomerBo> boList = customerService.getPrivateCustomer(cin, pageSize, pageNumber);
+		//权限
+		Pagination<CustomerOut> boList = customerService.getPrivateCustomer(cin, pageSize, pageNumber);
 		res.setData(boList);
 		return res;
 	}

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

@@ -3,21 +3,23 @@ package com.goafanti.customer.service;
 import com.goafanti.common.model.Customer;
 
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.customer.bo.CustomerBo;
-import com.goafanti.customer.bo.CustomerIn;
+import com.goafanti.customer.bo.CustomerIn;
+import com.goafanti.customer.bo.CustomerOut;
 
 public interface CustomerService {
-
-	int addCustomer(Customer cus);
 	
-	void deleteCustomer(String id);
-		
 	/**
-	 * 查询用户的管理层ID
-	 * @param userId
+	 *  添加客户信息
+	 * @param cus
 	 * @return
-	 */
-	CustomerBo selectCustomerByPrimaryKey (String id);
+	 */
+	int addCustomer(Customer cus);
+	
+	/**
+	 * 删除客户信息
+	 * @param id
+	 */
+	void deleteCustomer(String id);
 
 	/**
 	 *  查询上级ID集合
@@ -36,13 +38,12 @@ public interface CustomerService {
 	 *  获取私有客户
 	 * @return
 	 */
-	Pagination<CustomerBo> getPrivateCustomer(CustomerIn cin,Integer pageSize, Integer pageNumber);
+	Pagination<CustomerOut> getPrivateCustomer(CustomerIn cin,Integer pageSize, Integer pageNumber);
 	
 	/**
 	 *  获取公共客户
 	 * @return
 	 */
-	Pagination<CustomerBo> getPublicCustomer(CustomerIn cin,Integer pageSize, Integer pageNumber);
-	
-	void updCustomerByByPrimaryKey(String id);
+	Pagination<CustomerOut> getPublicCustomer(CustomerIn cin,Integer pageSize, Integer pageNumber);
+	
 }

+ 56 - 20
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.customer.bo.CustomerBo;
 import com.goafanti.customer.bo.CustomerIn;
+import com.goafanti.customer.bo.CustomerOut;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.CustomerMapper;
@@ -31,19 +31,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 
 	@Override
 	public void deleteCustomer(String id) {
-		customerMapper.deleteCustomerByPrimaryKey(id);
+		customerMapper.deleteByPrimaryKey(id);
 	}
-	@Override
-	public CustomerBo selectCustomerByPrimaryKey(String id) {
-		customerMapper.selectCustomerByPrimaryKey(id);
-		return null;
-	}
-	
-	@Override
-	public void updCustomerByByPrimaryKey(String id) {
-		customerMapper.updateCustomerByPrimaryKey(id);
-	}
-	
+
 	@Override
 	public String findLadderIds(String adminId) {
 		String result = "";
@@ -70,16 +60,18 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	}
 
 	@Override
-	public Pagination<CustomerBo> getPrivateCustomer(CustomerIn cin, Integer pageSize, Integer pageNumber) {
+	public Pagination<CustomerOut> getPrivateCustomer(CustomerIn cin, Integer pageSize, Integer pageNumber) {
+		cin.setShareTyp("0");
 		Map<String,Object> params = disposeParams(cin);
 		if(pageSize == null || pageSize < 0) pageSize = 10;
 		if(pageNumber == null || pageNumber <0 ) pageNumber = 1;
-		Pagination<CustomerBo> list = (Pagination<CustomerBo>)findPage("selectCustomer","selectCustomerCount",params, pageNumber, pageSize);
+		Pagination<CustomerOut> list = (Pagination<CustomerOut>)findPage("selectCustomer","selectCustomerCount",params, pageNumber, pageSize);
+		list.setList(setResult((List<CustomerOut>)list.getList()));
 		return list;
 	}
 
 	@Override
-	public Pagination<CustomerBo> getPublicCustomer(CustomerIn cin, Integer pageSize, Integer pageNumber) {
+	public Pagination<CustomerOut> getPublicCustomer(CustomerIn cin, Integer pageSize, Integer pageNumber) {
 		// TODO Auto-generated method stub
 		return null;
 	}
@@ -87,11 +79,55 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	private Map<String,Object> disposeParams(CustomerIn cin){
 		Map<String,Object> params = new HashMap<String,Object>();
 		if(StringUtils.isNotBlank(cin.getAdminName())) params.put("adminName", cin.getAdminName());
-		if(StringUtils.isNotBlank(cin.getCompanyIntention())) params.put("companyIntention", cin.getCompanyIntention());
+		if(StringUtils.isNotBlank(cin.getCompanyIntention())) params.put("companyIntention", Integer.parseInt(cin.getCompanyIntention()));
 		if(StringUtils.isNotBlank(cin.getContactName())) params.put("contactName", cin.getContactName());
-		if(StringUtils.isNotBlank(cin.getCustomerStatus())) params.put("customerStauts", cin.getCustomerStatus());
-		if(StringUtils.isNotBlank(cin.getFollowSituation())) params.put("followSituation", cin.getFollowSituation());
-		if(StringUtils.isNotBlank(cin.getShareTyp())) params.put("shareTyp", cin.getShareTyp());
+		if(StringUtils.isNotBlank(cin.getCustomerStatus())) params.put("customerStauts", Integer.parseInt(cin.getCustomerStatus()));
+		if(StringUtils.isNotBlank(cin.getFollowSituation())) params.put("followSituation", Integer.parseInt(cin.getFollowSituation()));
+		if(StringUtils.isNotBlank(cin.getShareTyp())) params.put("shareTyp", Integer.parseInt(cin.getShareTyp()));
+		if(StringUtils.isNotBlank(cin.getCustomerTyp())) params.put("customerTyp", Integer.parseInt(cin.getCustomerTyp()));
+		if(StringUtils.isNotBlank(cin.getContactTel())) params.put("contactTel", cin.getContactTel());
 		return params;
 	}
+	private List<CustomerOut> setResult(List<CustomerOut> list){
+		for(CustomerOut co :list){
+			switch(co.getShareType()){
+				case 0 : co.set_shareType("个人客户");
+				case 1 : co.set_shareType("公共客户");
+			}
+			switch(co.getCustomerStatus()){
+				case 0 : co.set_customerStatus("新客户");
+				case 1 : co.set_customerStatus("意向客户");
+				case 2 : co.set_customerStatus("重点客户");
+				case 3 : co.set_customerStatus("面谈客户");
+				case 4 : co.set_customerStatus("签单客户");
+				case 5 : co.set_customerStatus("被拒绝客户");
+			}
+			switch(co.getFollowSituation()){
+				case 0 : co.set_followSituation("已发项目介绍资料");
+				case 1 : co.set_followSituation("已约面谈");
+				case 2 : co.set_followSituation("已发合同计划书");
+				case 3 : co.set_followSituation("已报价");
+				case 4 : co.set_followSituation("已发合同");
+				case 5 : co.set_followSituation("已签合同");
+				case 6 : co.set_followSituation("面谈中");
+				case 7 : co.set_followSituation("已面签");
+			}
+			String[] temp = co.getCompanyIntention().split(",");
+			String _companyIntention = "";
+			if(temp.length>0){
+				for(String s:temp){
+					if(s.equals("0")) _companyIntention += "发明专利&nbsp;";
+					if(s.equals("1")) _companyIntention += "实用型新型专利&nbsp;";
+					if(s.equals("2")) _companyIntention += "外观专利&nbsp;";
+					if(s.equals("3")) _companyIntention += "软件著作权&nbsp;";
+					if(s.equals("4")) _companyIntention += "知识产权贯标&nbsp;";
+					if(s.equals("5")) _companyIntention += "高企认定&nbsp;";
+					if(s.equals("0")) _companyIntention += "技术成果&nbsp;";
+				}
+				_companyIntention = _companyIntention.substring(0, _companyIntention.length()-6);
+			}
+			co.set_companyIntention(_companyIntention);
+		}
+		return list;
+	}
 }