Przeglądaj źródła

客户信息备注功能修改

wanghui 8 lat temu
rodzic
commit
5d9ed2410b

+ 2 - 1
generatorConfig.xml

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

+ 2 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -627,6 +627,7 @@ public class WebpageController extends BaseController {
 	 * @param modelview
 	 * @return
 	 */
+	@RequestMapping(value="/portal/aboutUs")
 	public ModelAndView aboutUs(HttpServletRequest request, ModelAndView modelview){
 		modelview.setViewName("/portal/aboutUs");
 		return modelview;
@@ -638,6 +639,7 @@ public class WebpageController extends BaseController {
 	 * @param modelview
 	 * @return
 	 */
+	@RequestMapping(value="/portal/contactUs")
 	public ModelAndView contactUs(HttpServletRequest request, ModelAndView modelview){
 		modelview.setViewName("/portal/contactUs");
 		return modelview;

+ 22 - 20
src/main/java/com/goafanti/common/dao/CustomerOrganizationInfoMapper.java

@@ -10,72 +10,74 @@ public interface CustomerOrganizationInfoMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	long countByExample(CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int deleteByExample(CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int insert(CustomerOrganizationInfo record);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int insertSelective(CustomerOrganizationInfo record);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	List<CustomerOrganizationInfo> selectByExample(CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	CustomerOrganizationInfo selectByPrimaryKey(String id);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") CustomerOrganizationInfo record,
 			@Param("example") CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByExample(@Param("record") CustomerOrganizationInfo record,
 			@Param("example") CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByPrimaryKeySelective(CustomerOrganizationInfo record);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByPrimaryKey(CustomerOrganizationInfo record);
-	/**
-	 * 删除
-	 */
-	int deleteCustomerOrganizationByCid(String cid);
+
 	/**
 	 * 修改
 	 */
 	int updateCustomerOrganizationByCid(CustomerOrganizationInfo coi);
-	/**
-	 * 新增
-	 */
-	int insertCustomerOrganization(CustomerOrganizationInfo cui);
-
 }

+ 12 - 25
src/main/java/com/goafanti/common/dao/CustomerUserInfoMapper.java

@@ -12,86 +12,73 @@ public interface CustomerUserInfoMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByPrimaryKey(CustomerUserInfo record);
 
 	/**
-	 * 删除
-	 */
-	int deleteCustomerUserByCid(String cid);
-
-	/**
-	 * 修改
-	 */
-	int updateCustomerUserByPrimaryKey(String cid);
-	/**
-	 * 新增
-	 */
-	int insertCustomerUser(CustomerUserInfo record);
-	/**
-	 * 查询联系人名称列表
+	 * 查询联系人列表
 	 */
 	List<CustomerUserInfo> selectCustomerUserList(String cid);
 	/**

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

@@ -515,7 +515,7 @@
     c.company_name as companyName,
     c.location_province as locationProvince,
     c.company_industry as companyIndustry,
-    c.adress,
+    c.adress,c.remarks,
     d.name as adminName
     from customer a 
     left join customer_organization_info c on a.id=c.cid

+ 39 - 21
src/main/java/com/goafanti/common/mapper/CustomerOrganizationInfoMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="cid" jdbcType="VARCHAR" property="cid" />
@@ -15,12 +15,13 @@
     <result column="location_area" jdbcType="VARCHAR" property="locationArea" />
     <result column="adress" jdbcType="VARCHAR" property="adress" />
     <result column="company_industry" jdbcType="VARCHAR" property="companyIndustry" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 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 Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -88,15 +89,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
-    id, cid, company_name, location_province, location_city, location_area, adress, company_industry
+    id, cid, company_name, location_province, location_city, location_area, adress, company_industry, 
+    remarks
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.CustomerOrganizationInfoExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select
     <if test="distinct">
@@ -115,7 +117,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -126,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     delete from customer_organization_info
     where id = #{id,jdbcType=VARCHAR}
@@ -135,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     delete from customer_organization_info
     <if test="_parameter != null">
@@ -146,20 +148,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     insert into customer_organization_info (id, cid, company_name, 
       location_province, location_city, location_area, 
-      adress, company_industry)
+      adress, company_industry, remarks
+      )
     values (#{id,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
       #{locationProvince,jdbcType=CHAR}, #{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR}, 
-      #{adress,jdbcType=VARCHAR}, #{companyIndustry,jdbcType=VARCHAR})
+      #{adress,jdbcType=VARCHAR}, #{companyIndustry,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     insert into customer_organization_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -187,6 +191,9 @@
       <if test="companyIndustry != null">
         company_industry,
       </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -213,13 +220,16 @@
       <if test="companyIndustry != null">
         #{companyIndustry,jdbcType=VARCHAR},
       </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.CustomerOrganizationInfoExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select count(*) from customer_organization_info
     <if test="_parameter != null">
@@ -230,7 +240,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_organization_info
     <set>
@@ -258,6 +268,9 @@
       <if test="record.companyIndustry != null">
         company_industry = #{record.companyIndustry,jdbcType=VARCHAR},
       </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -267,7 +280,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_organization_info
     set id = #{record.id,jdbcType=VARCHAR},
@@ -277,7 +290,8 @@
       location_city = #{record.locationCity,jdbcType=VARCHAR},
       location_area = #{record.locationArea,jdbcType=VARCHAR},
       adress = #{record.adress,jdbcType=VARCHAR},
-      company_industry = #{record.companyIndustry,jdbcType=VARCHAR}
+      company_industry = #{record.companyIndustry,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -286,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_organization_info
     <set>
@@ -311,14 +325,17 @@
       <if test="companyIndustry != null">
         company_industry = #{companyIndustry,jdbcType=VARCHAR},
       </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
     </set>
-    where cid = #{cid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_organization_info
     set cid = #{cid,jdbcType=VARCHAR},
@@ -327,7 +344,8 @@
       location_city = #{locationCity,jdbcType=VARCHAR},
       location_area = #{locationArea,jdbcType=VARCHAR},
       adress = #{adress,jdbcType=VARCHAR},
-      company_industry = #{companyIndustry,jdbcType=VARCHAR}
+      company_industry = #{companyIndustry,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateCustomerOrganizationByCid">

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

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="cid" jdbcType="VARCHAR" property="cid" />
@@ -17,7 +17,6 @@
     <result column="wechat" jdbcType="VARCHAR" property="wechat" />
     <result column="depatrment" jdbcType="VARCHAR" property="depatrment" />
     <result column="customer_position" jdbcType="VARCHAR" property="customerPosition" />
-    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="tel_num" jdbcType="VARCHAR" property="telNum" />
     <result column="primary_flg" jdbcType="INTEGER" property="primaryFlg" />
   </resultMap>
@@ -25,7 +24,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +58,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,16 +92,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
-    id, cid, name, sex, mobile, email, qq, wechat, depatrment, customer_position, remarks, 
-    tel_num, primary_flg
+    id, cid, name, sex, mobile, email, qq, wechat, depatrment, customer_position, tel_num, 
+    primary_flg
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.CustomerUserInfoExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select
     <if test="distinct">
@@ -121,7 +120,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -132,7 +131,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     delete from customer_user_info
     where id = #{id,jdbcType=VARCHAR}
@@ -141,7 +140,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     delete from customer_user_info
     <if test="_parameter != null">
@@ -152,24 +151,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     insert into customer_user_info (id, cid, name, 
       sex, mobile, email, qq, 
       wechat, depatrment, customer_position, 
-      remarks, tel_num, primary_flg
-      )
+      tel_num, primary_flg)
     values (#{id,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{sex,jdbcType=CHAR}, #{mobile,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
       #{wechat,jdbcType=VARCHAR}, #{depatrment,jdbcType=VARCHAR}, #{customerPosition,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{telNum,jdbcType=VARCHAR}, #{primaryFlg,jdbcType=VARCHAR}
-      )
+      #{telNum,jdbcType=VARCHAR}, #{primaryFlg,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.CustomerUserInfo">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     insert into customer_user_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -203,9 +200,6 @@
       <if test="customerPosition != null">
         customer_position,
       </if>
-      <if test="remarks != null">
-        remarks,
-      </if>
       <if test="telNum != null">
         tel_num,
       </if>
@@ -244,9 +238,6 @@
       <if test="customerPosition != null">
         #{customerPosition,jdbcType=VARCHAR},
       </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
-      </if>
       <if test="telNum != null">
         #{telNum,jdbcType=VARCHAR},
       </if>
@@ -259,7 +250,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select count(*) from customer_user_info
     <if test="_parameter != null">
@@ -270,7 +261,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_user_info
     <set>
@@ -304,9 +295,6 @@
       <if test="record.customerPosition != null">
         customer_position = #{record.customerPosition,jdbcType=VARCHAR},
       </if>
-      <if test="record.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
       <if test="record.telNum != null">
         tel_num = #{record.telNum,jdbcType=VARCHAR},
       </if>
@@ -322,7 +310,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_user_info
     set id = #{record.id,jdbcType=VARCHAR},
@@ -335,7 +323,6 @@
       wechat = #{record.wechat,jdbcType=VARCHAR},
       depatrment = #{record.depatrment,jdbcType=VARCHAR},
       customer_position = #{record.customerPosition,jdbcType=VARCHAR},
-      remarks = #{record.remarks,jdbcType=VARCHAR},
       tel_num = #{record.telNum,jdbcType=VARCHAR},
       primary_flg = #{record.primaryFlg,jdbcType=INTEGER}
     <if test="_parameter != null">
@@ -346,7 +333,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_user_info
     <set>
@@ -377,9 +364,6 @@
       <if test="customerPosition != null">
         customer_position = #{customerPosition,jdbcType=VARCHAR},
       </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
-      </if>
       <if test="telNum != null">
         tel_num = #{telNum,jdbcType=VARCHAR},
       </if>
@@ -393,7 +377,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_user_info
     set cid = #{cid,jdbcType=VARCHAR},
@@ -405,7 +389,6 @@
       wechat = #{wechat,jdbcType=VARCHAR},
       depatrment = #{depatrment,jdbcType=VARCHAR},
       customer_position = #{customerPosition,jdbcType=VARCHAR},
-      remarks = #{remarks,jdbcType=VARCHAR},
       tel_num = #{telNum,jdbcType=VARCHAR},
       primary_flg = #{primaryFlg,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
@@ -425,7 +408,7 @@
     where 1=1 and cid = #{cid,jdbcType=VARCHAR} and primary_flg=0
   </select>
   
-  <update id="updataPrimaryFlg" parameterType="java.lang.String" >
+  <update id="updataPrimaryFlg" parameterType="java.lang.String">
     update customer_user_info set primary_flg=1 where 1=1 and id = #{id,jdbcType=VARCHAR}
   </update>
   

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

@@ -4,49 +4,54 @@ public class CustomerOrganizationInfo {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.id
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.cid
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.company_name
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_province
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String locationProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_city
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String locationCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_area
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String locationArea;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.adress
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String adress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.company_industry
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String companyIndustry;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.remarks
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
+	 */
+	private String remarks;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.id
 	 * @return  the value of customer_organization_info.id
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -55,7 +60,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -64,7 +69,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCid() {
 		return cid;
@@ -73,7 +78,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -82,7 +87,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -91,7 +96,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -100,7 +105,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getLocationProvince() {
 		return locationProvince;
@@ -109,7 +114,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setLocationProvince(String locationProvince) {
 		this.locationProvince = locationProvince;
@@ -118,7 +123,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getLocationCity() {
 		return locationCity;
@@ -127,7 +132,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setLocationCity(String locationCity) {
 		this.locationCity = locationCity;
@@ -136,7 +141,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getLocationArea() {
 		return locationArea;
@@ -145,7 +150,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setLocationArea(String locationArea) {
 		this.locationArea = locationArea;
@@ -154,7 +159,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getAdress() {
 		return adress;
@@ -163,7 +168,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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setAdress(String adress) {
 		this.adress = adress;
@@ -172,7 +177,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.company_industry
 	 * @return  the value of customer_organization_info.company_industry
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCompanyIndustry() {
 		return companyIndustry;
@@ -181,9 +186,27 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.company_industry
 	 * @param companyIndustry  the value for customer_organization_info.company_industry
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCompanyIndustry(String companyIndustry) {
 		this.companyIndustry = companyIndustry;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.remarks
+	 * @return  the value of customer_organization_info.remarks
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.remarks
+	 * @param remarks  the value for customer_organization_info.remarks
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 }

+ 86 - 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -721,11 +721,81 @@ public class CustomerOrganizationInfoExample {
 			addCriterion("company_industry not between", value1, value2, "companyIndustry");
 			return (Criteria) this;
 		}
+
+		public Criteria andRemarksIsNull() {
+			addCriterion("remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNotNull() {
+			addCriterion("remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksEqualTo(String value) {
+			addCriterion("remarks =", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotEqualTo(String value) {
+			addCriterion("remarks <>", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThan(String value) {
+			addCriterion("remarks >", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("remarks >=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThan(String value) {
+			addCriterion("remarks <", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThanOrEqualTo(String value) {
+			addCriterion("remarks <=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLike(String value) {
+			addCriterion("remarks like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotLike(String value) {
+			addCriterion("remarks not like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIn(List<String> values) {
+			addCriterion("remarks in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotIn(List<String> values) {
+			addCriterion("remarks not in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksBetween(String value1, String value2) {
+			addCriterion("remarks between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotBetween(String value1, String value2) {
+			addCriterion("remarks not between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -4,74 +4,69 @@ public class CustomerUserInfo {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.id
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.cid
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.name
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
-	 */
-	private String remarks;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.tel_num
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String telNum;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.primary_flg
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private Integer primaryFlg;
 
 	/**
 	 * 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -80,7 +75,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -89,7 +84,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCid() {
 		return cid;
@@ -98,7 +93,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -107,7 +102,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getName() {
 		return name;
@@ -116,7 +111,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -125,7 +120,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getSex() {
 		return sex;
@@ -134,7 +129,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -143,7 +138,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getMobile() {
 		return mobile;
@@ -152,7 +147,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -161,7 +156,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -170,7 +165,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -179,7 +174,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getQq() {
 		return qq;
@@ -188,7 +183,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -197,7 +192,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getWechat() {
 		return wechat;
@@ -206,7 +201,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setWechat(String wechat) {
 		this.wechat = wechat;
@@ -215,7 +210,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getDepatrment() {
 		return depatrment;
@@ -224,7 +219,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setDepatrment(String depatrment) {
 		this.depatrment = depatrment;
@@ -233,7 +228,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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCustomerPosition() {
 		return customerPosition;
@@ -242,34 +237,16 @@ 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCustomerPosition(String customerPosition) {
 		this.customerPosition = customerPosition;
 	}
 
 	/**
-	 * 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  Sat Oct 14 17:29:26 CST 2017
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * 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  Sat Oct 14 17:29:26 CST 2017
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.tel_num
 	 * @return  the value of customer_user_info.tel_num
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getTelNum() {
 		return telNum;
@@ -278,7 +255,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.tel_num
 	 * @param telNum  the value for customer_user_info.tel_num
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setTelNum(String telNum) {
 		this.telNum = telNum;
@@ -287,7 +264,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.primary_flg
 	 * @return  the value of customer_user_info.primary_flg
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public Integer getPrimaryFlg() {
 		return primaryFlg;
@@ -296,7 +273,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.primary_flg
 	 * @param primaryFlg  the value for customer_user_info.primary_flg
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setPrimaryFlg(Integer primaryFlg) {
 		this.primaryFlg = primaryFlg;

+ 16 - 86
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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 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  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -862,76 +862,6 @@ public class CustomerUserInfoExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andRemarksIsNull() {
-			addCriterion("remarks is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksIsNotNull() {
-			addCriterion("remarks is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksEqualTo(String value) {
-			addCriterion("remarks =", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotEqualTo(String value) {
-			addCriterion("remarks <>", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksGreaterThan(String value) {
-			addCriterion("remarks >", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
-			addCriterion("remarks >=", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLessThan(String value) {
-			addCriterion("remarks <", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLessThanOrEqualTo(String value) {
-			addCriterion("remarks <=", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLike(String value) {
-			addCriterion("remarks like", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotLike(String value) {
-			addCriterion("remarks not like", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksIn(List<String> values) {
-			addCriterion("remarks in", values, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotIn(List<String> values) {
-			addCriterion("remarks not in", values, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksBetween(String value1, String value2) {
-			addCriterion("remarks between", value1, value2, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotBetween(String value1, String value2) {
-			addCriterion("remarks not between", value1, value2, "remarks");
-			return (Criteria) this;
-		}
-
 		public Criteria andTelNumIsNull() {
 			addCriterion("tel_num is null");
 			return (Criteria) this;
@@ -1065,7 +995,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -55,6 +55,7 @@ public class CustomerIn {
 	
 	/** 跟单人 **/
 	private String adminName;
+	
 	/** 跟单人 **/
 	private String beforeAdminName;
 	

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

@@ -122,10 +122,9 @@ public class CustomerOut {
 	 */
 	private String adminName;
 	
-	/**
-	 * 跟单时间
-	 */
+	/**跟单时间**/
 	private String followDate;
+	
 	/** 操作前客户状态  **/
 	private String beforeCustomerStatus;
 	

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

@@ -138,7 +138,7 @@ public class AdminCustomerApiController extends BaseApiController {
 	}
 
 	/**
-	 * 查看私有客户
+	 * 查看个人客户列表
 	 * @param request
 	 * @return
 	 */
@@ -152,7 +152,7 @@ public class AdminCustomerApiController extends BaseApiController {
 	
 	
 	/**
-	 * 查询客户资料
+	 * 查询客户详情
 	 * 
 	 * @return
 	 */

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

@@ -187,15 +187,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 				temp = new String[]{co.getCompanyIntention()};
 			}
 			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("6")) _companyIntention += "技术成果&nbsp;";
+				if(s.equals("0")) _companyIntention += "发明专利-";
+				if(s.equals("1")) _companyIntention += "实用型新型专利-";
+				if(s.equals("2")) _companyIntention += "外观专利-";
+				if(s.equals("3")) _companyIntention += "软件著作权-";
+				if(s.equals("4")) _companyIntention += "知识产权贯标-";
+				if(s.equals("5")) _companyIntention += "高企认定-";
+				if(s.equals("6")) _companyIntention += "技术成果-";
 			}
-			_companyIntention = _companyIntention.substring(0, _companyIntention.length()-6);
+			_companyIntention = _companyIntention.substring(0, _companyIntention.length()-1);
 		}		
 		co.set_companyIntention(_companyIntention);
 		if(StringUtils.isNotBlank(co.getFollowDate())) co.setFollowDate(co.getFollowDate().substring(0,19));