zou_ht лет назад: 8
Родитель
Сommit
27a49fa572
21 измененных файлов с 720 добавлено и 311 удалено
  1. 0 0
      generatorConfig.out.xml
  2. 1 1
      generatorConfig.xml
  3. 69 0
      src/main/java/com/goafanti/common/dao/CustomerMapper.java
  4. 71 0
      src/main/java/com/goafanti/common/dao/CustomerOrganizationInfoMapper.java
  5. 70 0
      src/main/java/com/goafanti/common/dao/CustomerUserInfoMapper.java
  6. 51 36
      src/main/java/com/goafanti/common/mapper/CustomerMapper.xml
  7. 0 5
      src/main/java/com/goafanti/common/mapper/CustomerOrganizationInfoMapper.xml
  8. 2 5
      src/main/java/com/goafanti/common/mapper/CustomerUserInfoMapper.xml
  9. 247 116
      src/main/java/com/goafanti/common/model/Customer.java
  10. 106 46
      src/main/java/com/goafanti/common/model/CustomerExample.java
  11. 21 21
      src/main/java/com/goafanti/common/model/CustomerOrganizationInfo.java
  12. 16 16
      src/main/java/com/goafanti/common/model/CustomerOrganizationInfoExample.java
  13. 33 33
      src/main/java/com/goafanti/common/model/CustomerUserInfo.java
  14. 16 16
      src/main/java/com/goafanti/common/model/CustomerUserInfoExample.java
  15. 4 5
      src/main/java/com/goafanti/admin/controller/AdminCustomerApiController.java
  16. 1 1
      src/main/java/com/goafanti/admin/service/CustomerOrganizationService.java
  17. 1 1
      src/main/java/com/goafanti/admin/service/CustomerService.java
  18. 1 1
      src/main/java/com/goafanti/admin/service/CustomerUserService.java
  19. 4 3
      src/main/java/com/goafanti/admin/service/impl/CustomerOrganizationServiceImp.java
  20. 2 2
      src/main/java/com/goafanti/admin/service/impl/CustomerServiceImpl.java
  21. 4 3
      src/main/java/com/goafanti/admin/service/impl/CustomerUserServiceImp.java

+ 0 - 0
generatorConfig.out.xml


+ 1 - 1
generatorConfig.xml

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

+ 69 - 0
src/main/java/com/goafanti/common/dao/CustomerMapper.java

@@ -2,10 +2,79 @@ package com.goafanti.common.dao;
 
 
 import com.goafanti.common.model.Customer;
+import com.goafanti.common.model.CustomerExample;
+import java.util.List;
+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  Wed Oct 11 15:40:31 CST 2017
+	 */
+	long countByExample(CustomerExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	int deleteByExample(CustomerExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	int insert(Customer record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	int insertSelective(Customer record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	List<Customer> selectByExample(CustomerExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	Customer selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 CST 2017
+	 */
+	int updateByPrimaryKeySelective(Customer record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	int updateByPrimaryKey(Customer record);
+
+	/**
 	 * 新增
 	 */
 	int insertCustomer(Customer cus);

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

@@ -1,9 +1,80 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.CustomerOrganizationInfo;
+import com.goafanti.common.model.CustomerOrganizationInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerOrganizationInfoMapper {
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	long countByExample(CustomerOrganizationInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	int deleteByExample(CustomerOrganizationInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	int insert(CustomerOrganizationInfo record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	int insertSelective(CustomerOrganizationInfo record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	List<CustomerOrganizationInfo> selectByExample(CustomerOrganizationInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	CustomerOrganizationInfo selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") CustomerOrganizationInfo record,
+			@Param("example") CustomerOrganizationInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	int updateByExample(@Param("record") CustomerOrganizationInfo record,
+			@Param("example") CustomerOrganizationInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	int updateByPrimaryKeySelective(CustomerOrganizationInfo record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
+	 */
+	int updateByPrimaryKey(CustomerOrganizationInfo record);
+
 	int insertCustomerOrganization(CustomerOrganizationInfo cui);
 
 }

+ 70 - 0
src/main/java/com/goafanti/common/dao/CustomerUserInfoMapper.java

@@ -1,9 +1,79 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.CustomerUserInfo;
+import com.goafanti.common.model.CustomerUserInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerUserInfoMapper {
 
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	long countByExample(CustomerUserInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	int deleteByExample(CustomerUserInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	int insert(CustomerUserInfo record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	int insertSelective(CustomerUserInfo record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	List<CustomerUserInfo> selectByExample(CustomerUserInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	CustomerUserInfo selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") CustomerUserInfo record,
+			@Param("example") CustomerUserInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	int updateByExample(@Param("record") CustomerUserInfo record, @Param("example") CustomerUserInfoExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	int updateByPrimaryKeySelective(CustomerUserInfo record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
+	 */
+	int updateByPrimaryKey(CustomerUserInfo record);
+
 	int insertCustomerUser(CustomerUserInfo record);
 
 }

+ 51 - 36
src/main/java/com/goafanti/common/mapper/CustomerMapper.xml

@@ -5,23 +5,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 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="TIMESTAMP" property="shareTyp" />
+    <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="VARCHAR" property="createTime" />
+    <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" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -55,7 +56,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -89,16 +90,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     id, aid, customer_typ, share_typ, agent_id, company_intention, create_time, follow_situation, 
-    customer_statue
+    customer_statue, paid
   </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 Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     select
     <if test="distinct">
@@ -117,7 +118,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -128,7 +129,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     delete from customer
     where id = #{id,jdbcType=VARCHAR}
@@ -137,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     delete from customer
     <if test="_parameter != null">
@@ -148,22 +149,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     insert into customer (id, aid, customer_typ, 
       share_typ, agent_id, company_intention, 
-      create_time, follow_situation, customer_statue
-      )
+      create_time, follow_situation, customer_statue, 
+      paid)
     values (#{id,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{customerTyp,jdbcType=VARCHAR}, 
-      #{shareTyp,jdbcType=TIMESTAMP}, #{agentId,jdbcType=VARCHAR}, #{companyIntention,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=VARCHAR}, #{followSituation,jdbcType=VARCHAR}, #{customerStatue,jdbcType=VARCHAR}
-      )
+      #{shareTyp,jdbcType=INTEGER}, #{agentId,jdbcType=VARCHAR}, #{companyIntention,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{followSituation,jdbcType=VARCHAR}, #{customerStatue,jdbcType=VARCHAR}, 
+      #{paid,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertCustomer" parameterType="com.goafanti.common.model.Customer">
+  <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 Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     insert into customer
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -194,6 +195,9 @@
       <if test="customerStatue != null">
         customer_statue,
       </if>
+      <if test="paid != null">
+        paid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -206,7 +210,7 @@
         #{customerTyp,jdbcType=VARCHAR},
       </if>
       <if test="shareTyp != null">
-        #{shareTyp,jdbcType=TIMESTAMP},
+        #{shareTyp,jdbcType=INTEGER},
       </if>
       <if test="agentId != null">
         #{agentId,jdbcType=VARCHAR},
@@ -215,7 +219,7 @@
         #{companyIntention,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null">
-        #{createTime,jdbcType=VARCHAR},
+        #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="followSituation != null">
         #{followSituation,jdbcType=VARCHAR},
@@ -223,13 +227,16 @@
       <if test="customerStatue != null">
         #{customerStatue,jdbcType=VARCHAR},
       </if>
+      <if test="paid != null">
+        #{paid,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.CustomerExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     select count(*) from customer
     <if test="_parameter != null">
@@ -240,7 +247,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     update customer
     <set>
@@ -254,7 +261,7 @@
         customer_typ = #{record.customerTyp,jdbcType=VARCHAR},
       </if>
       <if test="record.shareTyp != null">
-        share_typ = #{record.shareTyp,jdbcType=TIMESTAMP},
+        share_typ = #{record.shareTyp,jdbcType=INTEGER},
       </if>
       <if test="record.agentId != null">
         agent_id = #{record.agentId,jdbcType=VARCHAR},
@@ -263,7 +270,7 @@
         company_intention = #{record.companyIntention,jdbcType=VARCHAR},
       </if>
       <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=VARCHAR},
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.followSituation != null">
         follow_situation = #{record.followSituation,jdbcType=VARCHAR},
@@ -271,6 +278,9 @@
       <if test="record.customerStatue != null">
         customer_statue = #{record.customerStatue,jdbcType=VARCHAR},
       </if>
+      <if test="record.paid != null">
+        paid = #{record.paid,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -280,18 +290,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 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=TIMESTAMP},
+      share_typ = #{record.shareTyp,jdbcType=INTEGER},
       agent_id = #{record.agentId,jdbcType=VARCHAR},
       company_intention = #{record.companyIntention,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
       follow_situation = #{record.followSituation,jdbcType=VARCHAR},
-      customer_statue = #{record.customerStatue,jdbcType=VARCHAR}
+      customer_statue = #{record.customerStatue,jdbcType=VARCHAR},
+      paid = #{record.paid,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -300,7 +311,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     update customer
     <set>
@@ -311,7 +322,7 @@
         customer_typ = #{customerTyp,jdbcType=VARCHAR},
       </if>
       <if test="shareTyp != null">
-        share_typ = #{shareTyp,jdbcType=TIMESTAMP},
+        share_typ = #{shareTyp,jdbcType=INTEGER},
       </if>
       <if test="agentId != null">
         agent_id = #{agentId,jdbcType=VARCHAR},
@@ -320,7 +331,7 @@
         company_intention = #{companyIntention,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null">
-        create_time = #{createTime,jdbcType=VARCHAR},
+        create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="followSituation != null">
         follow_situation = #{followSituation,jdbcType=VARCHAR},
@@ -328,6 +339,9 @@
       <if test="customerStatue != null">
         customer_statue = #{customerStatue,jdbcType=VARCHAR},
       </if>
+      <if test="paid != null">
+        paid = #{paid,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -335,17 +349,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Oct 11 11:00:02 CST 2017.
+      This element was generated on Wed Oct 11 15:40:31 CST 2017.
     -->
     update customer
     set aid = #{aid,jdbcType=VARCHAR},
       customer_typ = #{customerTyp,jdbcType=VARCHAR},
-      share_typ = #{shareTyp,jdbcType=TIMESTAMP},
+      share_typ = #{shareTyp,jdbcType=INTEGER},
       agent_id = #{agentId,jdbcType=VARCHAR},
       company_intention = #{companyIntention,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
       follow_situation = #{followSituation,jdbcType=VARCHAR},
-      customer_statue = #{customerStatue,jdbcType=VARCHAR}
+      customer_statue = #{customerStatue,jdbcType=VARCHAR},
+      paid = #{paid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.CustomerOrganizationInfoMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.CustomerOrganizationInfo">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:41:04 CST 2017.
-    -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="cid" jdbcType="VARCHAR" property="cid" />
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />

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

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.CustomerUserInfoMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.CustomerUserInfo">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 09 17:40:56 CST 2017.
-    -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="cid" jdbcType="VARCHAR" property="cid" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -19,6 +14,8 @@
     <result column="customer_position" jdbcType="VARCHAR" property="customerPosition" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
+  
+  
   <!-- 新增 -->
   <insert id="insertCustomerUser" parameterType="com.goafanti.common.model.CustomerUserInfo">
     insert into customer_user_info

+ 247 - 116
src/main/java/com/goafanti/common/model/Customer.java

@@ -5,121 +5,252 @@ import java.util.Date;
 public class Customer {
    
 	/**
-     *id
-     */
-    private String id;
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.id
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private String id;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.aid
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private String aid;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.customer_typ
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private String customerTyp;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.share_typ
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private Integer shareTyp;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.agent_id
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private String agentId;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.company_intention
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private String companyIntention;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.create_time
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private Date createTime;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.follow_situation
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private String followSituation;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.customer_statue
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private String customerStatue;
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer.paid
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
+	 */
+	private String paid;
+
+	/**
+	 * 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 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  Wed Oct 11 15:40:31 CST 2017
+	 */
+	public void setPaid(String paid) {
+		this.paid = paid;
+	}
 
-   
-    private String aid;
-
-    /**
-     *客户类型
-     */
-    private String customerTyp;
-
-    /**
-     *分享类型
-     */
-    private Date shareTyp;
-
-    /**
-     *代办人ID
-     */
-    private String agentId;
-
-    /**
-     *客户意向
-     */
-    private String companyIntention;
-
-    /**
-     *创建时间
-     */
-    private String createTime;
-
-    /**
-     *
-     * 跟进情况
-     */
-    private String followSituation;
-
-    /**
-     *
-     * 客户状态
-     */
-    private String customerStatue;
-
-    /**
-     */
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAid() {
-        return aid;
-    }
-
-    public void setAid(String aid) {
-        this.aid = aid;
-    }
-
-    public String getCustomerTyp() {
-        return customerTyp;
-    }
-
-    public void setCustomerTyp(String customerTyp) {
-        this.customerTyp = customerTyp;
-    }
-
-    public Date getShareTyp() {
-        return shareTyp;
-    }
-
-    public void setShareTyp(Date shareTyp) {
-        this.shareTyp = shareTyp;
-    }
-
-    public String getAgentId() {
-        return agentId;
-    }
-
-    public void setAgentId(String agentId) {
-        this.agentId = agentId;
-    }
-
-    public String getCompanyIntention() {
-        return companyIntention;
-    }
-
-    public void setCompanyIntention(String companyIntention) {
-        this.companyIntention = companyIntention;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getFollowSituation() {
-        return followSituation;
-    }
-
-    public void setFollowSituation(String followSituation) {
-        this.followSituation = followSituation;
-    }
-
-    public String getCustomerStatue() {
-        return customerStatue;
-    }
-
-    public void setCustomerStatue(String customerStatue) {
-        this.customerStatue = customerStatue;
-    }
 }

+ 106 - 46
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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer
-	 * @mbg.generated  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer
-	 * @mbg.generated  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer
-	 * @mbg.generated  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 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  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -383,52 +383,52 @@ public class CustomerExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypEqualTo(Date value) {
+		public Criteria andShareTypEqualTo(Integer value) {
 			addCriterion("share_typ =", value, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypNotEqualTo(Date value) {
+		public Criteria andShareTypNotEqualTo(Integer value) {
 			addCriterion("share_typ <>", value, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypGreaterThan(Date value) {
+		public Criteria andShareTypGreaterThan(Integer value) {
 			addCriterion("share_typ >", value, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypGreaterThanOrEqualTo(Date value) {
+		public Criteria andShareTypGreaterThanOrEqualTo(Integer value) {
 			addCriterion("share_typ >=", value, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypLessThan(Date value) {
+		public Criteria andShareTypLessThan(Integer value) {
 			addCriterion("share_typ <", value, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypLessThanOrEqualTo(Date value) {
+		public Criteria andShareTypLessThanOrEqualTo(Integer value) {
 			addCriterion("share_typ <=", value, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypIn(List<Date> values) {
+		public Criteria andShareTypIn(List<Integer> values) {
 			addCriterion("share_typ in", values, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypNotIn(List<Date> values) {
+		public Criteria andShareTypNotIn(List<Integer> values) {
 			addCriterion("share_typ not in", values, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypBetween(Date value1, Date value2) {
+		public Criteria andShareTypBetween(Integer value1, Integer value2) {
 			addCriterion("share_typ between", value1, value2, "shareTyp");
 			return (Criteria) this;
 		}
 
-		public Criteria andShareTypNotBetween(Date value1, Date value2) {
+		public Criteria andShareTypNotBetween(Integer value1, Integer value2) {
 			addCriterion("share_typ not between", value1, value2, "shareTyp");
 			return (Criteria) this;
 		}
@@ -583,62 +583,52 @@ public class CustomerExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeEqualTo(String value) {
+		public Criteria andCreateTimeEqualTo(Date value) {
 			addCriterion("create_time =", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeNotEqualTo(String value) {
+		public Criteria andCreateTimeNotEqualTo(Date value) {
 			addCriterion("create_time <>", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeGreaterThan(String value) {
+		public Criteria andCreateTimeGreaterThan(Date value) {
 			addCriterion("create_time >", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
 			addCriterion("create_time >=", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeLessThan(String value) {
+		public Criteria andCreateTimeLessThan(Date value) {
 			addCriterion("create_time <", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
 			addCriterion("create_time <=", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeLike(String value) {
-			addCriterion("create_time like", value, "createTime");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreateTimeNotLike(String value) {
-			addCriterion("create_time not like", value, "createTime");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreateTimeIn(List<String> values) {
+		public Criteria andCreateTimeIn(List<Date> values) {
 			addCriterion("create_time in", values, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeNotIn(List<String> values) {
+		public Criteria andCreateTimeNotIn(List<Date> values) {
 			addCriterion("create_time not in", values, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeBetween(String value1, String value2) {
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
 			addCriterion("create_time between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeNotBetween(String value1, String value2) {
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
@@ -782,11 +772,81 @@ public class CustomerExample {
 			addCriterion("customer_statue not between", value1, value2, "customerStatue");
 			return (Criteria) this;
 		}
+
+		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 andPaidLessThanOrEqualTo(String value) {
+			addCriterion("paid <=", value, "paid");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaidLike(String value) {
+			addCriterion("paid like", value, "paid");
+			return (Criteria) this;
+		}
+
+		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;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer
-	 * @mbg.generated  Wed Oct 11 11:00:02 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:40:31 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -4,44 +4,44 @@ public class CustomerOrganizationInfo {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.id
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.cid
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.company_name
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_province
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	private String locationProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_city
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	private String locationCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_area
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	private String locationArea;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.adress
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	private String adress;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.id
 	 * @return  the value of customer_organization_info.id
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -50,7 +50,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.id
 	 * @param id  the value for customer_organization_info.id
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -59,7 +59,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.cid
 	 * @return  the value of customer_organization_info.cid
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public String getCid() {
 		return cid;
@@ -68,7 +68,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.cid
 	 * @param cid  the value for customer_organization_info.cid
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -77,7 +77,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.company_name
 	 * @return  the value of customer_organization_info.company_name
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -86,7 +86,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.company_name
 	 * @param companyName  the value for customer_organization_info.company_name
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -95,7 +95,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_province
 	 * @return  the value of customer_organization_info.location_province
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public String getLocationProvince() {
 		return locationProvince;
@@ -104,7 +104,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_province
 	 * @param locationProvince  the value for customer_organization_info.location_province
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setLocationProvince(String locationProvince) {
 		this.locationProvince = locationProvince;
@@ -113,7 +113,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_city
 	 * @return  the value of customer_organization_info.location_city
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public String getLocationCity() {
 		return locationCity;
@@ -122,7 +122,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_city
 	 * @param locationCity  the value for customer_organization_info.location_city
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setLocationCity(String locationCity) {
 		this.locationCity = locationCity;
@@ -131,7 +131,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_area
 	 * @return  the value of customer_organization_info.location_area
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public String getLocationArea() {
 		return locationArea;
@@ -140,7 +140,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_area
 	 * @param locationArea  the value for customer_organization_info.location_area
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setLocationArea(String locationArea) {
 		this.locationArea = locationArea;
@@ -149,7 +149,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.adress
 	 * @return  the value of customer_organization_info.adress
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public String getAdress() {
 		return adress;
@@ -158,7 +158,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.adress
 	 * @param adress  the value for customer_organization_info.adress
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setAdress(String adress) {
 		this.adress = adress;

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

@@ -6,23 +6,23 @@ import java.util.List;
 public class CustomerOrganizationInfoExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public CustomerOrganizationInfoExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -30,7 +30,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -38,7 +38,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -46,7 +46,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -54,7 +54,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -62,7 +62,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -70,7 +70,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -78,7 +78,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -88,7 +88,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -100,7 +100,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -109,7 +109,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -119,7 +119,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -655,7 +655,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_organization_info
-	 * @mbg.generated  Mon Oct 09 17:41:04 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:57 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 33 - 33
src/main/java/com/goafanti/common/model/CustomerUserInfo.java

@@ -4,64 +4,64 @@ public class CustomerUserInfo {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.id
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.cid
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.name
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.sex
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.mobile
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.email
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.qq
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String qq;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.wechat
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String wechat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.depatrment
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String depatrment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.customer_position
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String customerPosition;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.remarks
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	private String remarks;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.id
 	 * @return  the value of customer_user_info.id
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -70,7 +70,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.id
 	 * @param id  the value for customer_user_info.id
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -79,7 +79,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.cid
 	 * @return  the value of customer_user_info.cid
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getCid() {
 		return cid;
@@ -88,7 +88,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.cid
 	 * @param cid  the value for customer_user_info.cid
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -97,7 +97,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.name
 	 * @return  the value of customer_user_info.name
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getName() {
 		return name;
@@ -106,7 +106,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.name
 	 * @param name  the value for customer_user_info.name
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -115,7 +115,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.sex
 	 * @return  the value of customer_user_info.sex
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getSex() {
 		return sex;
@@ -124,7 +124,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.sex
 	 * @param sex  the value for customer_user_info.sex
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -133,7 +133,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.mobile
 	 * @return  the value of customer_user_info.mobile
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getMobile() {
 		return mobile;
@@ -142,7 +142,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.mobile
 	 * @param mobile  the value for customer_user_info.mobile
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -151,7 +151,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.email
 	 * @return  the value of customer_user_info.email
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -160,7 +160,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.email
 	 * @param email  the value for customer_user_info.email
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -169,7 +169,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.qq
 	 * @return  the value of customer_user_info.qq
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getQq() {
 		return qq;
@@ -178,7 +178,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.qq
 	 * @param qq  the value for customer_user_info.qq
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -187,7 +187,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.wechat
 	 * @return  the value of customer_user_info.wechat
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getWechat() {
 		return wechat;
@@ -196,7 +196,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.wechat
 	 * @param wechat  the value for customer_user_info.wechat
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setWechat(String wechat) {
 		this.wechat = wechat;
@@ -205,7 +205,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.depatrment
 	 * @return  the value of customer_user_info.depatrment
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getDepatrment() {
 		return depatrment;
@@ -214,7 +214,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.depatrment
 	 * @param depatrment  the value for customer_user_info.depatrment
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setDepatrment(String depatrment) {
 		this.depatrment = depatrment;
@@ -223,7 +223,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.customer_position
 	 * @return  the value of customer_user_info.customer_position
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getCustomerPosition() {
 		return customerPosition;
@@ -232,7 +232,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.customer_position
 	 * @param customerPosition  the value for customer_user_info.customer_position
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setCustomerPosition(String customerPosition) {
 		this.customerPosition = customerPosition;
@@ -241,7 +241,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.remarks
 	 * @return  the value of customer_user_info.remarks
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -250,7 +250,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.remarks
 	 * @param remarks  the value for customer_user_info.remarks
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;

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

@@ -6,23 +6,23 @@ import java.util.List;
 public class CustomerUserInfoExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public CustomerUserInfoExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -30,7 +30,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -38,7 +38,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -46,7 +46,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -54,7 +54,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -62,7 +62,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -70,7 +70,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -78,7 +78,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -88,7 +88,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -100,7 +100,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -109,7 +109,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -119,7 +119,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -935,7 +935,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_user_info
-	 * @mbg.generated  Mon Oct 09 17:40:56 CST 2017
+	 * @mbg.generated  Wed Oct 11 15:42:45 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 4 - 5
src/main/java/com/goafanti/admin/controller/AdminCustomerApiController.java

@@ -1,4 +1,4 @@
-package com.goafanti.admin.controller;
+package com.goafanti.customer.controller;
 
 import java.text.ParseException;
 import java.util.UUID;
@@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.goafanti.admin.service.CustomerOrganizationService;
-import com.goafanti.admin.service.CustomerService;
-import com.goafanti.admin.service.CustomerUserService;
+import com.goafanti.customer.service.CustomerOrganizationService;
+import com.goafanti.customer.service.CustomerService;
+import com.goafanti.customer.service.CustomerUserService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.Customer;
@@ -54,7 +54,6 @@ public class AdminCustomerApiController extends CertifyApiController {
 			customerOrganizationService.addCustomerOrganization(coi);
 		}
 		return res;
-		
 	}
 
 

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

@@ -1,4 +1,4 @@
-package com.goafanti.admin.service;
+package com.goafanti.customer.service;
 
 import com.goafanti.common.model.CustomerOrganizationInfo;
 

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

@@ -1,4 +1,4 @@
-package com.goafanti.admin.service;
+package com.goafanti.customer.service;
 
 
 import com.goafanti.common.model.Customer;

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

@@ -1,4 +1,4 @@
-package com.goafanti.admin.service;
+package com.goafanti.customer.service;
 
 import com.goafanti.common.model.CustomerUserInfo;
 

+ 4 - 3
src/main/java/com/goafanti/admin/service/impl/CustomerOrganizationServiceImp.java

@@ -1,12 +1,13 @@
-package com.goafanti.admin.service.impl;
+package com.goafanti.customer.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import com.goafanti.admin.service.CustomerOrganizationService;
 import com.goafanti.common.dao.CustomerOrganizationInfoMapper;
 import com.goafanti.common.model.CustomerOrganizationInfo;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-
+import com.goafanti.customer.service.CustomerOrganizationService;
+@Service
 public class CustomerOrganizationServiceImp extends BaseMybatisDao<CustomerOrganizationInfoMapper> implements CustomerOrganizationService{
 	@Autowired
 	private CustomerOrganizationInfoMapper customerOrganizationInfoMapper ;

+ 2 - 2
src/main/java/com/goafanti/admin/service/impl/CustomerServiceImpl.java

@@ -1,10 +1,10 @@
-package com.goafanti.admin.service.impl;
+package com.goafanti.customer.service.impl;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.admin.service.CustomerService;
+import com.goafanti.customer.service.CustomerService;
 import com.goafanti.common.dao.CustomerMapper;
 import com.goafanti.common.model.Customer;
 @Service

+ 4 - 3
src/main/java/com/goafanti/admin/service/impl/CustomerUserServiceImp.java

@@ -1,12 +1,13 @@
-package com.goafanti.admin.service.impl;
+package com.goafanti.customer.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import com.goafanti.admin.service.CustomerUserService;
 import com.goafanti.common.dao.CustomerUserInfoMapper;
 import com.goafanti.common.model.CustomerUserInfo;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-
+import com.goafanti.customer.service.CustomerUserService;
+@Service
 public class CustomerUserServiceImp extends BaseMybatisDao<CustomerUserInfoMapper>  implements CustomerUserService{
 	@Autowired
 	private CustomerUserInfoMapper customerUserInfoMapper ;