Просмотр исходного кода

update

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
e3604fc077

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_order_mid"/>
+    <table schema="aft" tableName="user_follow"/>
   </context>
 </generatorConfiguration>

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

@@ -35,6 +35,8 @@ public class AFTConstants {
 	public static final String  FINANCE								= "97";					// 财务专员
 	/**	营销管理员 */
 	public static final String  SALESMAN_ADMIN                      = "9996";				// 营销管理员
+	/**	营销总监 */
+	public static final String  SALESMAN_DIRECTOR                   = "9995";				// 营销总监
 	/** 营销经理 */
 	public static final String  SALESMAN_MANAGER                    = "996";				// 营销经理
 	/**	营销员 */

+ 74 - 74
src/main/java/com/goafanti/common/dao/UserFollowMapper.java

@@ -1,75 +1,75 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.UserFollow;
-import com.goafanti.common.model.UserFollowExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface UserFollowMapper {
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	long countByExample(UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	int deleteByExample(UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	int deleteByPrimaryKey(String id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	int insert(UserFollow record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	int insertSelective(UserFollow record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	List<UserFollow> selectByExample(UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	UserFollow selectByPrimaryKey(String id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	int updateByExampleSelective(@Param("record") UserFollow record, @Param("example") UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	int updateByExample(@Param("record") UserFollow record, @Param("example") UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	int updateByPrimaryKeySelective(UserFollow record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	int updateByPrimaryKey(UserFollow record);
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.UserFollow;
+import com.goafanti.common.model.UserFollowExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface UserFollowMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	long countByExample(UserFollowExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	int deleteByExample(UserFollowExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	int insert(UserFollow record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	int insertSelective(UserFollow record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	List<UserFollow> selectByExample(UserFollowExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	UserFollow selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") UserFollow record, @Param("example") UserFollowExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	int updateByExample(@Param("record") UserFollow record, @Param("example") UserFollowExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	int updateByPrimaryKeySelective(UserFollow record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	int updateByPrimaryKey(UserFollow record);
 }

+ 412 - 397
src/main/java/com/goafanti/common/mapper/UserFollowMapper.xml

@@ -1,398 +1,413 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.UserFollowMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserFollow">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
-    <result column="aid" jdbcType="VARCHAR" property="aid" />
-    <result column="paid" jdbcType="VARCHAR" property="paid" />
-    <result column="result" jdbcType="VARCHAR" property="result" />
-    <result column="attachment_url" jdbcType="VARCHAR" property="attachmentUrl" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="ocb_id" jdbcType="VARCHAR" property="ocbId" />
-    <result column="contact_type" jdbcType="INTEGER" property="contactType" />
-    <result column="effective" jdbcType="INTEGER" property="effective" />
-    <result column="time_stamp" jdbcType="TIMESTAMP" property="timeStamp" />
-    <result column="follow_count" jdbcType="INTEGER" property="followCount" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    id, uid, aid, paid, result, attachment_url, create_time, ocb_id, contact_type, effective, 
-    time_stamp, follow_count
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.UserFollowExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from user_follow
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from user_follow
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    delete from user_follow
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.UserFollowExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    delete from user_follow
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.UserFollow">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    insert into user_follow (id, uid, aid, 
-      paid, result, attachment_url, 
-      create_time, ocb_id, contact_type, 
-      effective, time_stamp, follow_count
-      )
-    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
-      #{paid,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{ocbId,jdbcType=VARCHAR}, #{contactType,jdbcType=INTEGER}, 
-      #{effective,jdbcType=INTEGER}, #{timeStamp,jdbcType=TIMESTAMP}, #{followCount,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserFollow">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    insert into user_follow
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="uid != null">
-        uid,
-      </if>
-      <if test="aid != null">
-        aid,
-      </if>
-      <if test="paid != null">
-        paid,
-      </if>
-      <if test="result != null">
-        result,
-      </if>
-      <if test="attachmentUrl != null">
-        attachment_url,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="ocbId != null">
-        ocb_id,
-      </if>
-      <if test="contactType != null">
-        contact_type,
-      </if>
-      <if test="effective != null">
-        effective,
-      </if>
-      <if test="timeStamp != null">
-        time_stamp,
-      </if>
-      <if test="followCount != null">
-        follow_count,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="uid != null">
-        #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="aid != null">
-        #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="paid != null">
-        #{paid,jdbcType=VARCHAR},
-      </if>
-      <if test="result != null">
-        #{result,jdbcType=VARCHAR},
-      </if>
-      <if test="attachmentUrl != null">
-        #{attachmentUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ocbId != null">
-        #{ocbId,jdbcType=VARCHAR},
-      </if>
-      <if test="contactType != null">
-        #{contactType,jdbcType=INTEGER},
-      </if>
-      <if test="effective != null">
-        #{effective,jdbcType=INTEGER},
-      </if>
-      <if test="timeStamp != null">
-        #{timeStamp,jdbcType=TIMESTAMP},
-      </if>
-      <if test="followCount != null">
-        #{followCount,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.UserFollowExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    select count(*) from user_follow
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    update user_follow
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.uid != null">
-        uid = #{record.uid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.aid != null">
-        aid = #{record.aid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.paid != null">
-        paid = #{record.paid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.result != null">
-        result = #{record.result,jdbcType=VARCHAR},
-      </if>
-      <if test="record.attachmentUrl != null">
-        attachment_url = #{record.attachmentUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.ocbId != null">
-        ocb_id = #{record.ocbId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.contactType != null">
-        contact_type = #{record.contactType,jdbcType=INTEGER},
-      </if>
-      <if test="record.effective != null">
-        effective = #{record.effective,jdbcType=INTEGER},
-      </if>
-      <if test="record.timeStamp != null">
-        time_stamp = #{record.timeStamp,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.followCount != null">
-        follow_count = #{record.followCount,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    update user_follow
-    set id = #{record.id,jdbcType=VARCHAR},
-      uid = #{record.uid,jdbcType=VARCHAR},
-      aid = #{record.aid,jdbcType=VARCHAR},
-      paid = #{record.paid,jdbcType=VARCHAR},
-      result = #{record.result,jdbcType=VARCHAR},
-      attachment_url = #{record.attachmentUrl,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      ocb_id = #{record.ocbId,jdbcType=VARCHAR},
-      contact_type = #{record.contactType,jdbcType=INTEGER},
-      effective = #{record.effective,jdbcType=INTEGER},
-      time_stamp = #{record.timeStamp,jdbcType=TIMESTAMP},
-      follow_count = #{record.followCount,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserFollow">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    update user_follow
-    <set>
-      <if test="uid != null">
-        uid = #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="aid != null">
-        aid = #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="paid != null">
-        paid = #{paid,jdbcType=VARCHAR},
-      </if>
-      <if test="result != null">
-        result = #{result,jdbcType=VARCHAR},
-      </if>
-      <if test="attachmentUrl != null">
-        attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ocbId != null">
-        ocb_id = #{ocbId,jdbcType=VARCHAR},
-      </if>
-      <if test="contactType != null">
-        contact_type = #{contactType,jdbcType=INTEGER},
-      </if>
-      <if test="effective != null">
-        effective = #{effective,jdbcType=INTEGER},
-      </if>
-      <if test="timeStamp != null">
-        time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
-      </if>
-      <if test="followCount != null">
-        follow_count = #{followCount,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserFollow">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 14 19:38:26 CST 2017.
-    -->
-    update user_follow
-    set uid = #{uid,jdbcType=VARCHAR},
-      aid = #{aid,jdbcType=VARCHAR},
-      paid = #{paid,jdbcType=VARCHAR},
-      result = #{result,jdbcType=VARCHAR},
-      attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      ocb_id = #{ocbId,jdbcType=VARCHAR},
-      contact_type = #{contactType,jdbcType=INTEGER},
-      effective = #{effective,jdbcType=INTEGER},
-      time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
-      follow_count = #{followCount,jdbcType=INTEGER}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.UserFollowMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="paid" jdbcType="VARCHAR" property="paid" />
+    <result column="result" jdbcType="VARCHAR" property="result" />
+    <result column="attachment_url" jdbcType="VARCHAR" property="attachmentUrl" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="ocb_id" jdbcType="VARCHAR" property="ocbId" />
+    <result column="contact_type" jdbcType="INTEGER" property="contactType" />
+    <result column="effective" jdbcType="INTEGER" property="effective" />
+    <result column="time_stamp" jdbcType="TIMESTAMP" property="timeStamp" />
+    <result column="follow_count" jdbcType="INTEGER" property="followCount" />
+    <result column="guidance" jdbcType="VARCHAR" property="guidance" />
+  </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 09 14:59:28 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    id, uid, aid, paid, result, attachment_url, create_time, ocb_id, contact_type, effective, 
+    time_stamp, follow_count, guidance
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.UserFollowExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from user_follow
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from user_follow
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    delete from user_follow
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.UserFollowExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    delete from user_follow
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    insert into user_follow (id, uid, aid, 
+      paid, result, attachment_url, 
+      create_time, ocb_id, contact_type, 
+      effective, time_stamp, follow_count, 
+      guidance)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
+      #{paid,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{ocbId,jdbcType=VARCHAR}, #{contactType,jdbcType=INTEGER}, 
+      #{effective,jdbcType=INTEGER}, #{timeStamp,jdbcType=TIMESTAMP}, #{followCount,jdbcType=INTEGER}, 
+      #{guidance,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    insert into user_follow
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="paid != null">
+        paid,
+      </if>
+      <if test="result != null">
+        result,
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="ocbId != null">
+        ocb_id,
+      </if>
+      <if test="contactType != null">
+        contact_type,
+      </if>
+      <if test="effective != null">
+        effective,
+      </if>
+      <if test="timeStamp != null">
+        time_stamp,
+      </if>
+      <if test="followCount != null">
+        follow_count,
+      </if>
+      <if test="guidance != null">
+        guidance,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="paid != null">
+        #{paid,jdbcType=VARCHAR},
+      </if>
+      <if test="result != null">
+        #{result,jdbcType=VARCHAR},
+      </if>
+      <if test="attachmentUrl != null">
+        #{attachmentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ocbId != null">
+        #{ocbId,jdbcType=VARCHAR},
+      </if>
+      <if test="contactType != null">
+        #{contactType,jdbcType=INTEGER},
+      </if>
+      <if test="effective != null">
+        #{effective,jdbcType=INTEGER},
+      </if>
+      <if test="timeStamp != null">
+        #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+      <if test="followCount != null">
+        #{followCount,jdbcType=INTEGER},
+      </if>
+      <if test="guidance != null">
+        #{guidance,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.UserFollowExample" 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 09 14:59:28 CST 2020.
+    -->
+    select count(*) from user_follow
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    update user_follow
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uid != null">
+        uid = #{record.uid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.paid != null">
+        paid = #{record.paid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.result != null">
+        result = #{record.result,jdbcType=VARCHAR},
+      </if>
+      <if test="record.attachmentUrl != null">
+        attachment_url = #{record.attachmentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.ocbId != null">
+        ocb_id = #{record.ocbId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contactType != null">
+        contact_type = #{record.contactType,jdbcType=INTEGER},
+      </if>
+      <if test="record.effective != null">
+        effective = #{record.effective,jdbcType=INTEGER},
+      </if>
+      <if test="record.timeStamp != null">
+        time_stamp = #{record.timeStamp,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.followCount != null">
+        follow_count = #{record.followCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.guidance != null">
+        guidance = #{record.guidance,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    update user_follow
+    set id = #{record.id,jdbcType=VARCHAR},
+      uid = #{record.uid,jdbcType=VARCHAR},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      paid = #{record.paid,jdbcType=VARCHAR},
+      result = #{record.result,jdbcType=VARCHAR},
+      attachment_url = #{record.attachmentUrl,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      ocb_id = #{record.ocbId,jdbcType=VARCHAR},
+      contact_type = #{record.contactType,jdbcType=INTEGER},
+      effective = #{record.effective,jdbcType=INTEGER},
+      time_stamp = #{record.timeStamp,jdbcType=TIMESTAMP},
+      follow_count = #{record.followCount,jdbcType=INTEGER},
+      guidance = #{record.guidance,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    update user_follow
+    <set>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="paid != null">
+        paid = #{paid,jdbcType=VARCHAR},
+      </if>
+      <if test="result != null">
+        result = #{result,jdbcType=VARCHAR},
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ocbId != null">
+        ocb_id = #{ocbId,jdbcType=VARCHAR},
+      </if>
+      <if test="contactType != null">
+        contact_type = #{contactType,jdbcType=INTEGER},
+      </if>
+      <if test="effective != null">
+        effective = #{effective,jdbcType=INTEGER},
+      </if>
+      <if test="timeStamp != null">
+        time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+      <if test="followCount != null">
+        follow_count = #{followCount,jdbcType=INTEGER},
+      </if>
+      <if test="guidance != null">
+        guidance = #{guidance,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Oct 09 14:59:28 CST 2020.
+    -->
+    update user_follow
+    set uid = #{uid,jdbcType=VARCHAR},
+      aid = #{aid,jdbcType=VARCHAR},
+      paid = #{paid,jdbcType=VARCHAR},
+      result = #{result,jdbcType=VARCHAR},
+      attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      ocb_id = #{ocbId,jdbcType=VARCHAR},
+      contact_type = #{contactType,jdbcType=INTEGER},
+      effective = #{effective,jdbcType=INTEGER},
+      time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
+      follow_count = #{followCount,jdbcType=INTEGER},
+      guidance = #{guidance,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
 </mapper>

Разница между файлами не показана из-за своего большого размера
+ 2056 - 2069
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml


+ 305 - 282
src/main/java/com/goafanti/common/model/UserFollow.java

@@ -1,283 +1,306 @@
-package com.goafanti.common.model;
-
-import java.util.Date;
-
-public class UserFollow {
-
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private String id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.uid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private String uid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.aid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private String aid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.paid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private String paid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.result
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private String result;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.attachment_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private String attachmentUrl;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.create_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.ocb_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private String ocbId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.contact_type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private Integer contactType;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.effective
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private Integer effective;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.time_stamp
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private Date timeStamp;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.follow_count
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	private Integer followCount;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.id
-	 * @return  the value of user_follow.id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.id
-	 * @param id  the value for user_follow.id
-	 * @mbg.generated  Tue Nov 14 19:38:26 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 user_follow.uid
-	 * @return  the value of user_follow.uid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public String getUid() {
-		return uid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.uid
-	 * @param uid  the value for user_follow.uid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setUid(String uid) {
-		this.uid = uid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.aid
-	 * @return  the value of user_follow.aid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public String getAid() {
-		return aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.aid
-	 * @param aid  the value for user_follow.aid
-	 * @mbg.generated  Tue Nov 14 19:38:26 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 user_follow.paid
-	 * @return  the value of user_follow.paid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public String getPaid() {
-		return paid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.paid
-	 * @param paid  the value for user_follow.paid
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setPaid(String paid) {
-		this.paid = paid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.result
-	 * @return  the value of user_follow.result
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public String getResult() {
-		return result;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.result
-	 * @param result  the value for user_follow.result
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setResult(String result) {
-		this.result = result;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.attachment_url
-	 * @return  the value of user_follow.attachment_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public String getAttachmentUrl() {
-		return attachmentUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.attachment_url
-	 * @param attachmentUrl  the value for user_follow.attachment_url
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setAttachmentUrl(String attachmentUrl) {
-		this.attachmentUrl = attachmentUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.create_time
-	 * @return  the value of user_follow.create_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.create_time
-	 * @param createTime  the value for user_follow.create_time
-	 * @mbg.generated  Tue Nov 14 19:38:26 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 user_follow.ocb_id
-	 * @return  the value of user_follow.ocb_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public String getOcbId() {
-		return ocbId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.ocb_id
-	 * @param ocbId  the value for user_follow.ocb_id
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setOcbId(String ocbId) {
-		this.ocbId = ocbId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.contact_type
-	 * @return  the value of user_follow.contact_type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public Integer getContactType() {
-		return contactType;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.contact_type
-	 * @param contactType  the value for user_follow.contact_type
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setContactType(Integer contactType) {
-		this.contactType = contactType;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.effective
-	 * @return  the value of user_follow.effective
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public Integer getEffective() {
-		return effective;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.effective
-	 * @param effective  the value for user_follow.effective
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setEffective(Integer effective) {
-		this.effective = effective;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.time_stamp
-	 * @return  the value of user_follow.time_stamp
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public Date getTimeStamp() {
-		return timeStamp;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.time_stamp
-	 * @param timeStamp  the value for user_follow.time_stamp
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setTimeStamp(Date timeStamp) {
-		this.timeStamp = timeStamp;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.follow_count
-	 * @return  the value of user_follow.follow_count
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public Integer getFollowCount() {
-		return followCount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.follow_count
-	 * @param followCount  the value for user_follow.follow_count
-	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017
-	 */
-	public void setFollowCount(Integer followCount) {
-		this.followCount = followCount;
-	}
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class UserFollow {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.id
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.uid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private String uid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.aid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.paid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private String paid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.result
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private String result;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.attachment_url
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private String attachmentUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.create_time
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.ocb_id
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private String ocbId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.contact_type
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private Integer contactType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.effective
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private Integer effective;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.time_stamp
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private Date timeStamp;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.follow_count
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private Integer followCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.guidance
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	private String guidance;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.id
+	 * @return  the value of user_follow.id
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.id
+	 * @param id  the value for user_follow.id
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.uid
+	 * @return  the value of user_follow.uid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public String getUid() {
+		return uid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.uid
+	 * @param uid  the value for user_follow.uid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.aid
+	 * @return  the value of user_follow.aid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.aid
+	 * @param aid  the value for user_follow.aid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.paid
+	 * @return  the value of user_follow.paid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public String getPaid() {
+		return paid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.paid
+	 * @param paid  the value for user_follow.paid
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setPaid(String paid) {
+		this.paid = paid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.result
+	 * @return  the value of user_follow.result
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public String getResult() {
+		return result;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.result
+	 * @param result  the value for user_follow.result
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setResult(String result) {
+		this.result = result;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.attachment_url
+	 * @return  the value of user_follow.attachment_url
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public String getAttachmentUrl() {
+		return attachmentUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.attachment_url
+	 * @param attachmentUrl  the value for user_follow.attachment_url
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setAttachmentUrl(String attachmentUrl) {
+		this.attachmentUrl = attachmentUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.create_time
+	 * @return  the value of user_follow.create_time
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.create_time
+	 * @param createTime  the value for user_follow.create_time
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.ocb_id
+	 * @return  the value of user_follow.ocb_id
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public String getOcbId() {
+		return ocbId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.ocb_id
+	 * @param ocbId  the value for user_follow.ocb_id
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setOcbId(String ocbId) {
+		this.ocbId = ocbId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.contact_type
+	 * @return  the value of user_follow.contact_type
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public Integer getContactType() {
+		return contactType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.contact_type
+	 * @param contactType  the value for user_follow.contact_type
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setContactType(Integer contactType) {
+		this.contactType = contactType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.effective
+	 * @return  the value of user_follow.effective
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public Integer getEffective() {
+		return effective;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.effective
+	 * @param effective  the value for user_follow.effective
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setEffective(Integer effective) {
+		this.effective = effective;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.time_stamp
+	 * @return  the value of user_follow.time_stamp
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public Date getTimeStamp() {
+		return timeStamp;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.time_stamp
+	 * @param timeStamp  the value for user_follow.time_stamp
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setTimeStamp(Date timeStamp) {
+		this.timeStamp = timeStamp;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.follow_count
+	 * @return  the value of user_follow.follow_count
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public Integer getFollowCount() {
+		return followCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.follow_count
+	 * @param followCount  the value for user_follow.follow_count
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setFollowCount(Integer followCount) {
+		this.followCount = followCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.guidance
+	 * @return  the value of user_follow.guidance
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public String getGuidance() {
+		return guidance;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.guidance
+	 * @param guidance  the value for user_follow.guidance
+	 * @mbg.generated  Fri Oct 09 14:59:28 CST 2020
+	 */
+	public void setGuidance(String guidance) {
+		this.guidance = guidance;
+	}
 }

Разница между файлами не показана из-за своего большого размера
+ 1121 - 1051
src/main/java/com/goafanti/common/model/UserFollowExample.java


+ 209 - 199
src/main/java/com/goafanti/customer/bo/CustomerListOut.java

@@ -1,200 +1,210 @@
-package com.goafanti.customer.bo;
-
-public class CustomerListOut extends CustomerListIn{	
-	/** 客户ID **/
-	private String uid;
-	
-	/** 联系人 **/
-	private String contacts;
-	
-	/** 联系电话 **/
-	private String contactMobile;
-	
-	/** 创建时间 **/
-	private String createTime;
-	
-	/** 转换时间  **/
-	private String transferTime;
-	
-	/** 营销员姓名 **/
-	private String adminName;
-	
-	/** 专家发布状态**/
-	private String releaseStatus;
-	
-	/** 审核意见**/
-	private String auditOpinion;
-	
-	/** 是否为咨询师 **/
-	private String consultant;
-	
-	/** 专家审核状态 **/
-	private String expertAudit ;
-	
-	/** 最后跟进时间 **/
-	private String lastFollowTime;
-	
-	/** 最后签单时间 **/
-	private String lastSignTime;
-	
-	/** 剩余私有时间 **/
-	private String surplusFollowTime;
-	
-	/** 剩余签单时间 **/
-	private String surplusSignTime;
-	
-	/** 资料所属人 **/
-	private String informationMaintainer;
-	
-	private String shareType;
-	
-	private String mid;
-	
-	private Integer level;
-	
-	public String getAuditOpinion() {
-		return auditOpinion;
-	}
-
-	public void setAuditOpinion(String auditOpinion) {
-		this.auditOpinion = auditOpinion;
-	}
-
-	public String getReleaseStatus() {
-		return releaseStatus;
-	}
-
-	public void setReleaseStatus(String releaseStatus) {
-		this.releaseStatus = releaseStatus;
-	}
-
-	public String getUid() {
-		return uid;
-	}
-
-	public void setUid(String uid) {
-		this.uid = uid;
-	}
-
-	public String getContacts() {
-		return contacts;
-	}
-
-	public void setContacts(String contacts) {
-		this.contacts = contacts;
-	}
-
-	public String getContactMobile() {
-		return contactMobile;
-	}
-
-	public void setContactMobile(String contactMobile) {
-		this.contactMobile = contactMobile;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getTransferTime() {
-		return transferTime;
-	}
-
-	public void setTransferTime(String transferTime) {
-		this.transferTime = transferTime;
-	}
-
-	public String getAdminName() {
-		return adminName;
-	}
-
-	public void setAdminName(String adminName) {
-		this.adminName = adminName;
-	}
-
-	public String getExpertAudit() {
-		return expertAudit;
-	}
-
-	public void setExpertAudit(String expertAudit) {
-		this.expertAudit = expertAudit;
-	}
-	public String getConsultant() {
-		return consultant;
-	}
-
-	public void setConsultant(String consultant) {
-		this.consultant = consultant;
-	}
-
-	public String getLastFollowTime() {
-		return lastFollowTime;
-	}
-
-	public void setLastFollowTime(String lastFollowTime) {
-		this.lastFollowTime = lastFollowTime;
-	}
-
-	public String getLastSignTime() {
-		return lastSignTime;
-	}
-
-	public void setLastSignTime(String lastSignTime) {
-		this.lastSignTime = lastSignTime;
-	}
-
-	public String getSurplusFollowTime() {
-		return surplusFollowTime;
-	}
-
-	public void setSurplusFollowTime(String surplusFollowTime) {
-		this.surplusFollowTime = surplusFollowTime;
-	}
-
-	public String getSurplusSignTime() {
-		return surplusSignTime;
-	}
-
-	public void setSurplusSignTime(String surplusSignTime) {
-		this.surplusSignTime = surplusSignTime;
-	}
-
-	public String getInformationMaintainer() {
-		return informationMaintainer;
-	}
-
-	public void setInformationMaintainer(String informationMaintainer) {
-		this.informationMaintainer = informationMaintainer;
-	}
-
-	public String getShareType() {
-		return shareType;
-	}
-
-	public void setShareType(String shareType) {
-		this.shareType = shareType;
-	}
-
-	public String getMid() {
-		return mid;
-	}
-
-	public void setMid(String mid) {
-		this.mid = mid;
-	}
-
-	public Integer getLevel() {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
-	
-
+package com.goafanti.customer.bo;
+
+public class CustomerListOut extends CustomerListIn{	
+	/** 客户ID **/
+	private String uid;
+	
+	/** 联系人 **/
+	private String contacts;
+	
+	/** 联系电话 **/
+	private String contactMobile;
+	
+	/** 创建时间 **/
+	private String createTime;
+	
+	/** 转换时间  **/
+	private String transferTime;
+	
+	/** 营销员姓名 **/
+	private String adminName;
+	
+	/** 专家发布状态**/
+	private String releaseStatus;
+	
+	/** 审核意见**/
+	private String auditOpinion;
+	
+	/** 是否为咨询师 **/
+	private String consultant;
+	
+	/** 专家审核状态 **/
+	private String expertAudit ;
+	
+	/** 最后跟进时间 **/
+	private String lastFollowTime;
+	
+	/** 最后签单时间 **/
+	private String lastSignTime;
+	
+	/** 剩余私有时间 **/
+	private String surplusFollowTime;
+	
+	/** 剩余签单时间 **/
+	private String surplusSignTime;
+	
+	/** 资料所属人 **/
+	private String informationMaintainer;
+	
+	private String shareType;
+	
+	private String mid;
+	
+	private Integer level;
+	
+	private String aName;
+	
+	public String getAuditOpinion() {
+		return auditOpinion;
+	}
+
+	public void setAuditOpinion(String auditOpinion) {
+		this.auditOpinion = auditOpinion;
+	}
+
+	public String getReleaseStatus() {
+		return releaseStatus;
+	}
+
+	public void setReleaseStatus(String releaseStatus) {
+		this.releaseStatus = releaseStatus;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getContactMobile() {
+		return contactMobile;
+	}
+
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getTransferTime() {
+		return transferTime;
+	}
+
+	public void setTransferTime(String transferTime) {
+		this.transferTime = transferTime;
+	}
+
+	public String getAdminName() {
+		return adminName;
+	}
+
+	public void setAdminName(String adminName) {
+		this.adminName = adminName;
+	}
+
+	public String getExpertAudit() {
+		return expertAudit;
+	}
+
+	public void setExpertAudit(String expertAudit) {
+		this.expertAudit = expertAudit;
+	}
+	public String getConsultant() {
+		return consultant;
+	}
+
+	public void setConsultant(String consultant) {
+		this.consultant = consultant;
+	}
+
+	public String getLastFollowTime() {
+		return lastFollowTime;
+	}
+
+	public void setLastFollowTime(String lastFollowTime) {
+		this.lastFollowTime = lastFollowTime;
+	}
+
+	public String getLastSignTime() {
+		return lastSignTime;
+	}
+
+	public void setLastSignTime(String lastSignTime) {
+		this.lastSignTime = lastSignTime;
+	}
+
+	public String getSurplusFollowTime() {
+		return surplusFollowTime;
+	}
+
+	public void setSurplusFollowTime(String surplusFollowTime) {
+		this.surplusFollowTime = surplusFollowTime;
+	}
+
+	public String getSurplusSignTime() {
+		return surplusSignTime;
+	}
+
+	public void setSurplusSignTime(String surplusSignTime) {
+		this.surplusSignTime = surplusSignTime;
+	}
+
+	public String getInformationMaintainer() {
+		return informationMaintainer;
+	}
+
+	public void setInformationMaintainer(String informationMaintainer) {
+		this.informationMaintainer = informationMaintainer;
+	}
+
+	public String getShareType() {
+		return shareType;
+	}
+
+	public void setShareType(String shareType) {
+		this.shareType = shareType;
+	}
+
+	public String getMid() {
+		return mid;
+	}
+
+	public void setMid(String mid) {
+		this.mid = mid;
+	}
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+	public String getaName() {
+		return aName;
+	}
+
+	public void setaName(String aName) {
+		this.aName = aName;
+	}
+
+	
+
 }

+ 129 - 120
src/main/java/com/goafanti/customer/bo/FollowListBo.java

@@ -1,120 +1,129 @@
-package com.goafanti.customer.bo;
-
-public class FollowListBo {
-	/** 跟进记录ID **/
-	private String followId;
-	
-	/** 管理员ID **/
-	private String aid;
-	
-	/** 跟进时间  **/
-	private String followTime;
-	
-	/** 客户名 **/
-	private String identifyName;
-	
-	/** 联系人 **/
-	private String contacts;
-	
-	/** 联系电话 **/
-	private String contactMobile;
-	
-	/** 跟进结果 **/
-	private String result;
-	
-	/** 拜访人姓名 **/
-	private String adminName;
-	
-	/** 拜访方式 **/
-	private String contactType;
-	
-	/** user_follow_business ID **/ 
-	private String ufbId;
-	
-	/** 跟进状态 **/ 
-	private String followSituation;
-	
-	/** 客户状态 **/
-	private String customerStatus;
-	
-	/** 是否拜访只读 **/
-	private Integer readOnly;
-	public String getFollowId() {
-		return followId;
-	}
-	public void setFollowId(String followId) {
-		this.followId = followId;
-	}
-	public String getAid() {
-		return aid;
-	}
-	public void setAid(String aid) {
-		this.aid = aid;
-	}
-	public String getFollowTime() {
-		return followTime;
-	}
-	public void setFollowTime(String followTime) {
-		this.followTime = followTime;
-	}
-	public String getIdentifyName() {
-		return identifyName;
-	}
-	public void setIdentifyName(String identifyName) {
-		this.identifyName = identifyName;
-	}
-	public String getContacts() {
-		return contacts;
-	}
-	public void setContacts(String contacts) {
-		this.contacts = contacts;
-	}
-	public String getContactMobile() {
-		return contactMobile;
-	}
-	public void setContactMobile(String contactMobile) {
-		this.contactMobile = contactMobile;
-	}
-	public String getResult() {
-		return result;
-	}
-	public void setResult(String result) {
-		this.result = result;
-	}
-	public String getAdminName() {
-		return adminName;
-	}
-	public void setAdminName(String adminName) {
-		this.adminName = adminName;
-	}
-	public String getContactType() {
-		return contactType;
-	}
-	public void setContactType(String contactType) {
-		this.contactType = contactType;
-	}
-	public String getUfbId() {
-		return ufbId;
-	}
-	public void setUfbId(String ufbId) {
-		this.ufbId = ufbId;
-	}
-	public String getFollowSituation() {
-		return followSituation;
-	}
-	public void setFollowSituation(String followSituation) {
-		this.followSituation = followSituation;
-	}
-	public String getCustomerStatus() {
-		return customerStatus;
-	}
-	public void setCustomerStatus(String customerStatus) {
-		this.customerStatus = customerStatus;
-	}
-	public Integer getReadOnly() {
-		return readOnly;
-	}
-	public void setReadOnly(Integer readOnly) {
-		this.readOnly = readOnly;
-	}
-}
+package com.goafanti.customer.bo;
+
+public class FollowListBo {
+	/** 跟进记录ID **/
+	private String followId;
+	
+	/** 管理员ID **/
+	private String aid;
+	
+	/** 跟进时间  **/
+	private String followTime;
+	
+	/** 客户名 **/
+	private String identifyName;
+	
+	/** 联系人 **/
+	private String contacts;
+	
+	/** 联系电话 **/
+	private String contactMobile;
+	
+	/** 跟进结果 **/
+	private String result;
+	
+	/** 拜访人姓名 **/
+	private String adminName;
+	
+	/** 拜访方式 **/
+	private String contactType;
+	
+	/** user_follow_business ID **/ 
+	private String ufbId;
+	
+	/** 跟进状态 **/ 
+	private String followSituation;
+	
+	/** 客户状态 **/
+	private String customerStatus;
+	
+	/** 是否拜访只读 **/
+	private Integer readOnly;
+	/** 跟进指导 **/
+	private String  guidance;
+	
+	public String getFollowId() {
+		return followId;
+	}
+	public void setFollowId(String followId) {
+		this.followId = followId;
+	}
+	public String getAid() {
+		return aid;
+	}
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+	public String getFollowTime() {
+		return followTime;
+	}
+	public void setFollowTime(String followTime) {
+		this.followTime = followTime;
+	}
+	public String getIdentifyName() {
+		return identifyName;
+	}
+	public void setIdentifyName(String identifyName) {
+		this.identifyName = identifyName;
+	}
+	public String getContacts() {
+		return contacts;
+	}
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+	public String getContactMobile() {
+		return contactMobile;
+	}
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+	public String getResult() {
+		return result;
+	}
+	public void setResult(String result) {
+		this.result = result;
+	}
+	public String getAdminName() {
+		return adminName;
+	}
+	public void setAdminName(String adminName) {
+		this.adminName = adminName;
+	}
+	public String getContactType() {
+		return contactType;
+	}
+	public void setContactType(String contactType) {
+		this.contactType = contactType;
+	}
+	public String getUfbId() {
+		return ufbId;
+	}
+	public void setUfbId(String ufbId) {
+		this.ufbId = ufbId;
+	}
+	public String getFollowSituation() {
+		return followSituation;
+	}
+	public void setFollowSituation(String followSituation) {
+		this.followSituation = followSituation;
+	}
+	public String getCustomerStatus() {
+		return customerStatus;
+	}
+	public void setCustomerStatus(String customerStatus) {
+		this.customerStatus = customerStatus;
+	}
+	public Integer getReadOnly() {
+		return readOnly;
+	}
+	public void setReadOnly(Integer readOnly) {
+		this.readOnly = readOnly;
+	}
+	public String getGuidance() {
+		return guidance;
+	}
+	public void setGuidance(String guidance) {
+		this.guidance = guidance;
+	}
+}

Разница между файлами не показана из-за своего большого размера
+ 1226 - 1206
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java


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

@@ -70,10 +70,11 @@ public interface CustomerService {
 	 * 私有单位客户列表查询
 	 * @param cin
 	 * @param pageSize
+	 * @param pageSize2 
 	 * @param pageNumber
 	 * @return
 	 */
-	Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli,Integer sort,Integer sortType, Integer pageNo, Integer pageSize);
+	Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli,Integer sort,Integer sortType,Integer power, Integer pageNo, Integer pageSize);
 	
 	/**
 	 * 公共单位客户列表查询
@@ -515,5 +516,7 @@ public interface CustomerService {
 	int pushReleaseUser(String id);
 	List<userDaysBo> selectUserDays(String id);
 	
+	int addGuidance(String followId, String guidance);
+	
 	
 }

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

@@ -169,7 +169,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli,Integer sort,Integer sortType, Integer pageNo,Integer pageSize) {
+	public Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli,Integer sort,Integer sortType, Integer power,
+			Integer pageNo,Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
 		cli.setAid(TokenManager.getAdminId());
 //		cli.setAid("1");
@@ -177,6 +178,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		Map<String,Object> params = disposeParams(cli);
 		params.put("sort", sort);
 		params.put("sortType",sortType);
+		if (power==null||TokenManager.hasRole(AFTConstants.SALESMAN)) {
+			params.put("power", 0);
+		}else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)) {
+			params.put("power", 1);
+		}else if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR)) {
+			params.put("power", 2);
+		}
 		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("selectPrivateOrganizationCustomerList","selectPrivateOrganizationCustomerCount",params,pageNo,pageSize);
 		List<CustomerListOut> tmpList = (List<CustomerListOut>)list.getList();
 		setCustomerList(tmpList,0);
@@ -403,10 +411,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if(bo.getRegisteredCapital()!=null)number+=1;
 		if(StringUtils.isNotBlank(bo.getCooperationSituation()))number+=1; 
 		if(StringUtils.isNotBlank(bo.getQualification()))number+=1; 
-//		if(bo.getAssets()!=null)number+=1;
-//		if(bo.getLastYearResearchAmount()!=null)number+=1;
-//		if(bo.getYearSalesAmount()!=null)number+=1;
-//		if(StringUtils.isNotBlank(bo.getAccomplishSituation()))number+=1;
 		if (organizationAnnualReportMapper.selectOrgAnnualCount(bo.getUid())>0)number+=1;
 		if (organizationAnnualReportMapper.selectOrgYearProjectCount(bo.getUid())>0)number+=1;
 		if(StringUtils.isNotBlank(bo.getCoreTechnology()))number+=1;
@@ -425,7 +429,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			} catch (NoSuchMethodException e) {
 				e.printStackTrace();
 			}
-			//BeanUtilsExt.copyProperties(ui, bo);
 			user.setId(bo.getUid());
 			user.setSocietyTag(bo.getSocietyTag());
 			user.setHeadPortraitUrl(bo.getHeadPortraitUrl());
@@ -450,10 +453,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		List<FollowListBo> list = (List<FollowListBo>)page.getList();
 		for(FollowListBo bo : list){
 			if(bo.getAid().equals(TokenManager.getAdminId())){
+				
 				bo.setReadOnly(AFTConstants.NO);
 			}else{
+				bo.setContactMobile("***");
+				bo.setContacts("***");
 				bo.setReadOnly(AFTConstants.YES);
 			} 
+			
 		}
 		page.setList(list);
 		return page;
@@ -478,7 +485,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	@Transactional
 	public int addFollow(FollowBusinessBo fbb) throws BusinessException{
-		//if(fbb.getUserBusinessList().size()<1) throw new BusinessException(new Error(ErrorConstants.AT_LEAST_A_BUSINESS,"",""));
 		//更新跟进记录表
 		SimpleDateFormat format = new SimpleDateFormat(AFTConstants.YYYYMMDDHHMMSS);
 		UserFollow userFollow = new UserFollow();
@@ -517,7 +523,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				ufbId = UUID.randomUUID().toString();
 				businessName = businessProjectMapper.selectByPrimaryKey(ub.getBusinessProjectId()).getBname();
 				UserBusiness us=userBusinessMapper.selectByPrimaryKey(ub.getBusinessId());
-				//sas
 				if(StringUtils.isNotBlank(ub.getBusinessId())){
 					//更新业务表
 					userBusiness.setId(ub.getBusinessId());
@@ -538,7 +543,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 					}
 					
 					
-					//releaseProject(businessLockedList);
 					if (us.getFollowSituation()!=5&&ub.getFollowSituation()==5) {//如果改成已签合同,则锁定业务
 						if (StringUtils.isNotBlank(fbb.getUid())) ub.setUid(fbb.getUid());
 						lockProject(ub);//锁定客户业务
@@ -1279,6 +1283,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public int updateMainContact(String ocbId,String uid) {
 		organizationContactBookMapper.updateSubContact(uid);
+		OrganizationIdentity oi=new OrganizationIdentity();
+		OrganizationContactBook ocb= organizationContactBookMapper.selectByPrimaryKey(ocbId);
+		oi.setUid(uid);
+		oi.setContacts(ocb.getName());
+		oi.setContactMobile(ocb.getMobile());
+		organizationIdentityMapper.updateServiceByUid(oi);
 		organizationContactBookMapper.updateMainContact(ocbId);
 		return 1;
 	}
@@ -1326,6 +1336,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}
+			if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
+				if(!clo.getAid().equals(TokenManager.getAdminId())) {
+				clo.setContacts("***");
+				clo.setContactMobile("***");
+				}
+			}
 		}
 	}
 	
@@ -1606,5 +1622,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return list;
 	}
 
+	@Override
+	public int addGuidance(String followId, String guidance) {
+		UserFollow uf=new UserFollow();
+		uf.setId(followId);
+		uf.setGuidance(guidance);
+		return userFollowMapper.updateByPrimaryKeySelective(uf);
+	}
+
 
 }

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
-#jdbc.password=123456
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.username=dev
+jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=aftdev
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570