Explorar el Código

四月份开发

Signed-off-by: anderx <312518615@qq.com>
anderx hace 5 años
padre
commit
5c6d656beb

+ 1 - 1
GeneratorConfig.xml

@@ -9,7 +9,7 @@
     <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="new_order_change"/>
+    <table schema="aft" tableName="user_transfer_log"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

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

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

+ 3 - 0
src/main/java/com/goafanti/common/dao/TChangeDunMapper.java

@@ -88,6 +88,9 @@ public interface TChangeDunMapper {
 	 */
 	int updateByTid(@Param("tid")Integer tid,@Param("cid")Integer cid,@Param("type")Integer type);
 
+
+	void deleteByCtid(Integer id);
+
 	
 
 	

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

@@ -108,4 +108,6 @@ public interface UserLockReleaseMapper {
 
 	int updatePrivateBusinessTransfer(@Param("inputId")String inputId, @Param("uid")String uid, @Param("pid")String pid,@Param("aid")String aid);
 
+	List<LockingReleaseBo> checkUserProject(@Param("uid")String uid, @Param("pid")String pid, @Param("aid")String aid);
+
 }

+ 100 - 0
src/main/java/com/goafanti/common/dao/UserTransferLogMapper.java

@@ -0,0 +1,100 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.UserTransferLog;
+import com.goafanti.common.model.UserTransferLogExample;
+import com.goafanti.customer.bo.transferListBo;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface UserTransferLogMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    long countByExample(UserTransferLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    int deleteByExample(UserTransferLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    int insert(UserTransferLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    int insertSelective(UserTransferLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    List<UserTransferLog> selectByExample(UserTransferLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    UserTransferLog selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") UserTransferLog record, @Param("example") UserTransferLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    int updateByExample(@Param("record") UserTransferLog record, @Param("example") UserTransferLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    int updateByPrimaryKeySelective(UserTransferLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    int updateByPrimaryKey(UserTransferLog record);
+
+	List<transferListBo> selectByUidGetList(String uid);
+}

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

@@ -509,5 +509,10 @@
   		</if>
   </update>
   
+    <delete id="deleteByCtid" parameterType="java.lang.Integer">
+    
+    delete from t_change_dun
+    where ctid = #{id,jdbcType=INTEGER}
+  </delete>
  
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -413,4 +413,14 @@
   <update id="updatePrivateBusinessTransfer">
  	update user_lock_release set aid=#{inputId} where uid= #{uid} and business_project_id= #{pid} and aid= #{aid}; 
   </update>
+  
+  <select id="checkUserProject" resultType="com.goafanti.customer.bo.LockingReleaseBo">
+  	select 
+		 id, type, uid, aid, business_project_id as  businessProjectId, status 
+	 from user_lock_release where type =1
+	and status=0
+	and uid=#{uid,jdbcType=VARCHAR}
+	and aid=#{aid,jdbcType=VARCHAR}
+	and business_project_id=#{pid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 326 - 0
src/main/java/com/goafanti/common/mapper/UserTransferLogMapper.xml

@@ -0,0 +1,326 @@
+<?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.UserTransferLogMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserTransferLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="pid" jdbcType="VARCHAR" property="pid" />
+    <result column="take_aid" jdbcType="VARCHAR" property="takeAid" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 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 Thu Apr 09 11:39:03 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 Thu Apr 09 11:39:03 CST 2020.
+    -->
+    id, uid, aid, pid, take_aid, type, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.UserTransferLogExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from user_transfer_log
+    <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.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from user_transfer_log
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    delete from user_transfer_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.UserTransferLogExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    delete from user_transfer_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserTransferLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    insert into user_transfer_log (id, uid, aid, 
+      pid, take_aid, type, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
+      #{pid,jdbcType=VARCHAR}, #{takeAid,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserTransferLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    insert into user_transfer_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="takeAid != null">
+        take_aid,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null">
+        #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="takeAid != null">
+        #{takeAid,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.UserTransferLogExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    select count(*) from user_transfer_log
+    <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 Thu Apr 09 11:39:03 CST 2020.
+    -->
+    update user_transfer_log
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </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.pid != null">
+        pid = #{record.pid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.takeAid != null">
+        take_aid = #{record.takeAid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </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 Thu Apr 09 11:39:03 CST 2020.
+    -->
+    update user_transfer_log
+    set id = #{record.id,jdbcType=INTEGER},
+      uid = #{record.uid,jdbcType=VARCHAR},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      pid = #{record.pid,jdbcType=VARCHAR},
+      take_aid = #{record.takeAid,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserTransferLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    update user_transfer_log
+    <set>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null">
+        pid = #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="takeAid != null">
+        take_aid = #{takeAid,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserTransferLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Apr 09 11:39:03 CST 2020.
+    -->
+    update user_transfer_log
+    set uid = #{uid,jdbcType=VARCHAR},
+      aid = #{aid,jdbcType=VARCHAR},
+      pid = #{pid,jdbcType=VARCHAR},
+      take_aid = #{takeAid,jdbcType=VARCHAR},
+      type = #{type,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectByUidGetList" resultType="com.goafanti.customer.bo.transferListBo">
+	select a.id,a.type,b.nickname userName,c.name usedAName,d.name newAName,e.bname Pname, 
+  	date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createDate
+  	from user_transfer_log a left join user b on a.uid=b.id
+	left join admin c on a.aid=c.id left join admin d on a.take_aid=d.id
+	left join business_project e on a.pid=e.id 
+	where uid= #{uid}
+  </select>
+</mapper>

+ 236 - 0
src/main/java/com/goafanti/common/model/UserTransferLog.java

@@ -0,0 +1,236 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class UserTransferLog {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_transfer_log.id
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_transfer_log.uid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    private String uid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_transfer_log.aid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    private String aid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_transfer_log.pid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    private String pid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_transfer_log.take_aid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    private String takeAid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_transfer_log.type
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    private Integer type;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_transfer_log.create_time
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_transfer_log.id
+     *
+     * @return the value of user_transfer_log.id
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_transfer_log.id
+     *
+     * @param id the value for user_transfer_log.id
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_transfer_log.uid
+     *
+     * @return the value of user_transfer_log.uid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_transfer_log.uid
+     *
+     * @param uid the value for user_transfer_log.uid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 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_transfer_log.aid
+     *
+     * @return the value of user_transfer_log.aid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public String getAid() {
+        return aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_transfer_log.aid
+     *
+     * @param aid the value for user_transfer_log.aid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 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_transfer_log.pid
+     *
+     * @return the value of user_transfer_log.pid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public String getPid() {
+        return pid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_transfer_log.pid
+     *
+     * @param pid the value for user_transfer_log.pid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_transfer_log.take_aid
+     *
+     * @return the value of user_transfer_log.take_aid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public String getTakeAid() {
+        return takeAid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_transfer_log.take_aid
+     *
+     * @param takeAid the value for user_transfer_log.take_aid
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void setTakeAid(String takeAid) {
+        this.takeAid = takeAid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_transfer_log.type
+     *
+     * @return the value of user_transfer_log.type
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_transfer_log.type
+     *
+     * @param type the value for user_transfer_log.type
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_transfer_log.create_time
+     *
+     * @return the value of user_transfer_log.create_time
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_transfer_log.create_time
+     *
+     * @param createTime the value for user_transfer_log.create_time
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 763 - 0
src/main/java/com/goafanti/common/model/UserTransferLogExample.java

@@ -0,0 +1,763 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class UserTransferLogExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public UserTransferLogExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNull() {
+            addCriterion("aid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNotNull() {
+            addCriterion("aid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidEqualTo(String value) {
+            addCriterion("aid =", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotEqualTo(String value) {
+            addCriterion("aid <>", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThan(String value) {
+            addCriterion("aid >", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThanOrEqualTo(String value) {
+            addCriterion("aid >=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThan(String value) {
+            addCriterion("aid <", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThanOrEqualTo(String value) {
+            addCriterion("aid <=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLike(String value) {
+            addCriterion("aid like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotLike(String value) {
+            addCriterion("aid not like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIn(List<String> values) {
+            addCriterion("aid in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotIn(List<String> values) {
+            addCriterion("aid not in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidBetween(String value1, String value2) {
+            addCriterion("aid between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotBetween(String value1, String value2) {
+            addCriterion("aid not between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNull() {
+            addCriterion("pid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("pid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(String value) {
+            addCriterion("pid =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(String value) {
+            addCriterion("pid <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(String value) {
+            addCriterion("pid >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(String value) {
+            addCriterion("pid >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(String value) {
+            addCriterion("pid <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(String value) {
+            addCriterion("pid <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLike(String value) {
+            addCriterion("pid like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotLike(String value) {
+            addCriterion("pid not like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<String> values) {
+            addCriterion("pid in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<String> values) {
+            addCriterion("pid not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(String value1, String value2) {
+            addCriterion("pid between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(String value1, String value2) {
+            addCriterion("pid not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidIsNull() {
+            addCriterion("take_aid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidIsNotNull() {
+            addCriterion("take_aid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidEqualTo(String value) {
+            addCriterion("take_aid =", value, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidNotEqualTo(String value) {
+            addCriterion("take_aid <>", value, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidGreaterThan(String value) {
+            addCriterion("take_aid >", value, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidGreaterThanOrEqualTo(String value) {
+            addCriterion("take_aid >=", value, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidLessThan(String value) {
+            addCriterion("take_aid <", value, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidLessThanOrEqualTo(String value) {
+            addCriterion("take_aid <=", value, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidLike(String value) {
+            addCriterion("take_aid like", value, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidNotLike(String value) {
+            addCriterion("take_aid not like", value, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidIn(List<String> values) {
+            addCriterion("take_aid in", values, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidNotIn(List<String> values) {
+            addCriterion("take_aid not in", values, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidBetween(String value1, String value2) {
+            addCriterion("take_aid between", value1, value2, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTakeAidNotBetween(String value1, String value2) {
+            addCriterion("take_aid not between", value1, value2, "takeAid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Integer value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Integer value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Integer value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Integer value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Integer> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Integer> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Integer value1, Integer value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Apr 09 11:39:03 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table user_transfer_log
+     *
+     * @mbg.generated Thu Apr 09 11:39:03 CST 2020
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 55 - 0
src/main/java/com/goafanti/customer/bo/transferListBo.java

@@ -0,0 +1,55 @@
+package com.goafanti.customer.bo;
+
+public class transferListBo {
+	private Integer id;
+	private Integer type;
+	private String userName;
+	private String usedAName;
+	private String newAName;
+	private String pName;
+	private String createDate;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getUsedAName() {
+		return usedAName;
+	}
+	public void setUsedAName(String usedAName) {
+		this.usedAName = usedAName;
+	}
+	public String getNewAName() {
+		return newAName;
+	}
+	public void setNewAName(String newAName) {
+		this.newAName = newAName;
+	}
+	public String getpName() {
+		return pName;
+	}
+	public void setpName(String pName) {
+		this.pName = pName;
+	}
+	public String getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+	
+	
+}

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

@@ -731,6 +731,24 @@ public class AdminCustomerApiController extends BaseApiController{
 		return res;
 	}
 	
+	/**
+	   *   客户转交记录 
+	 * @param uid 客户编号
+	 * @param aid 管理员编号
+	 * @param oldAid 接收者编号
+	 * @return
+	 */
+	@RequestMapping(value = "/transferList", method = RequestMethod.GET)
+	public Result transferList(String uid){
+		Result res = new Result();
+		if(StringUtils.isBlank(uid) ){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"客户编号", "客户编号"));
+			return res;
+		}
+		res.data(customerService.transferList( uid));
+		return res;
+	}
+	
 	/** 查询我的业务列表 **/
 	@RequestMapping(value = "/listBusiness", method = RequestMethod.POST)
 	public Result listBusiness(BusinessListBo blo,Integer pageNo, Integer pageSize){
@@ -1160,7 +1178,7 @@ public class AdminCustomerApiController extends BaseApiController{
 			res.getError().add(buildError("请确正确的接收者。","请确正确的接收者。"));
 			return res;
 		}
-		int i= adminService.updatePrivateBusinessTransfer( inputId, uid, pid );
+		int i= customerService.updatePrivateBusinessTransfer( inputId, uid, pid );
 		if (i<1) {
 			res.getError().add(buildError("请确认客户与业务归属是否正确。","请确认客户与业务归属是否正确。"));
 			return res;

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

@@ -25,6 +25,7 @@ import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.bo.FollowListBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.bo.StatisticBo;
+import com.goafanti.customer.bo.transferListBo;
 
 public interface CustomerService {
 	/**
@@ -508,5 +509,8 @@ public interface CustomerService {
 	XSSFWorkbook privateUnitCustomerOutXls(CustomerListIn cli ,Integer sort,Integer sortType,Integer pageNo, Integer pageSize);
 	int customerHandOver(String userIds, String receiveId);
 	
+	List<transferListBo> transferList(String uid);
+	int updatePrivateBusinessTransfer(String inputId, String uid, String pid);
+	
 	
 }

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

@@ -38,6 +38,7 @@ import com.goafanti.common.dao.UserFollowMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserLockReleaseMapper;
 import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.dao.UserTransferLogMapper;
 import com.goafanti.common.enums.CustomerStatusFiled;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.IdentityProcess;
@@ -55,6 +56,7 @@ import com.goafanti.common.model.UserFollow;
 import com.goafanti.common.model.UserFollowBusiness;
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.model.UserLockRelease;
+import com.goafanti.common.model.UserTransferLog;
 import com.goafanti.common.utils.BeanUtilsExt;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.ExportExcelUtil;
@@ -75,6 +77,7 @@ import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.bo.FollowListBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.bo.StatisticBo;
+import com.goafanti.customer.bo.transferListBo;
 import com.goafanti.customer.service.CustomerService;
 
 @Service
@@ -109,6 +112,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	private OrganizationAnnualReportMapper	organizationAnnualReportMapper;
 	@Resource
 	private OrganizationYearProjectMapper	organizationYearProjectMapper;
+	@Resource
+	private UserTransferLogMapper	userTransferLogMapper;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
 	
@@ -317,8 +322,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		cob.setMajor(AFTConstants.YES);
 		organizationContactBookMapper.insert(cob);
 		//新增锁定数据
-		addUserLock(uid, TokenManager.getAdminId(), now);
-//		addUserLock(uid, "1", now);
+		addUserLock(uid, TokenManager.getAdminId(),0,null, now);
 		return 1;
 	}
 
@@ -936,7 +940,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			user.setInformationMaintainer(TokenManager.getAdminId());
 			user.setSource(2);//客户来源设置为领取
 			user.setTransferTime(now);
-			flag = addUserLock(uid,TokenManager.getAdminId(),now); //指定用户锁定客户
+			flag = addUserLock(uid,TokenManager.getAdminId(),0,null,now); //指定用户锁定客户
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
 			if(userMapper.UserReceiveCount(TokenManager.getAdminId())>AFTConstants.USER_RCEIVE_MAX)
 			throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""+(AFTConstants.USER_RCEIVE_MAX+1),""));
@@ -948,8 +952,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			//查询这个客户是否是登陆人的客户
 			if(userMapper.getAidAndUser(uid,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
 			flag = updateUserLock(uid,oldAid,UserLockReleaseStatus.LOCKED.getCode(),UserLockReleaseStatus.RELEASE.getCode()); //原用户释放客户
-			if(flag > 0 ) flag = addUserLock(uid,String.valueOf(params[0]),now); //指定用户锁定客户
+			if(flag > 0 ) flag = addUserLock(uid,String.valueOf(params[0]),0,null,now); //指定用户锁定客户
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_TRANSFER_FAIL,""));
+			addtransferLog(uid,null,TokenManager.getAdminId(),String.valueOf(params[0]),0);
 		}
 		return userMapper.updateByPrimaryKeySelective(user);
 	}
@@ -1346,10 +1351,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return userLockReleaseMapper.updateUserLock(uid,aid,oldStatus,newStatus);
 	}
 	
-	private int addUserLock(String uid,String aid,Date lockTime){
+	private int addUserLock(String uid,String aid,Integer type,String pid,Date lockTime){
 		UserLockRelease ulr = new UserLockRelease();
 		ulr.setId(UUID.randomUUID().toString());
-		ulr.setType(0);
+		if (type==0) {
+			ulr.setType(0);
+		}else {
+			ulr.setType(1);
+			ulr.setBusinessProjectId(pid);
+		}
 		ulr.setAid(aid);
 		ulr.setLockTime(lockTime);
 		ulr.setStatus(UserLockReleaseStatus.LOCKED.getCode());
@@ -1357,6 +1367,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return userLockReleaseMapper.insert(ulr);
 	}
 	
+	
+	
 	/**
 	 * 查询需要释放客户
 	 * @param uid
@@ -1497,4 +1509,55 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 
+	
+	@Override
+	public int updatePrivateBusinessTransfer(String inputId, String uid, String pid) {
+		Date now = new Date();
+		List<LockingReleaseBo> list=userLockReleaseMapper.checkUserProject(uid, pid,TokenManager.getAdminId());
+		if (list.isEmpty()) {
+			throw new BusinessException(new Error("客户归属错误","客户归属错误"));
+		}else if(list.size()>1) {
+			throw new BusinessException(new Error("业务数量错误","业务数量错误"));
+		}
+		LockingReleaseBo l=list.get(0);
+		UserLockRelease ul=new UserLockRelease();
+		ul.setId(l.getId());
+		ul.setStatus(2);
+		ul.setReleaseTime(now);
+		userLockReleaseMapper.updateByPrimaryKeySelective(ul);
+		addtransferLog(uid,pid,TokenManager.getAdminId(),inputId,1);
+		addUserLock(uid,inputId,1,pid,now); //指定用户锁定客户
+		List<BusinessListBo> bl=userBusinessMapper.selectBusinessProjectByUAPid(uid, inputId, pid);
+		if (bl.isEmpty()) {
+			UserBusiness ub=new UserBusiness();
+			ub.setId(UUID.randomUUID().toString());
+			ub.setAid(inputId);
+			ub.setUid(uid);
+			ub.setBusinessProjectId(pid);
+			ub.setCustomerStatus(4);
+			ub.setFollowSituation(5);
+			ub.setRemarks("转交客户业务触发");
+			userBusinessMapper.insertSelective(ub);
+		}
+		return 1;
+	}
+
+	private void addtransferLog(String uid, String pid, String aid, String takeAid,Integer type) {
+		UserTransferLog utl=new UserTransferLog();
+		utl.setAid(aid);
+		utl.setCreateTime(new Date());
+		utl.setPid(pid);
+		utl.setTakeAid(takeAid);
+		utl.setType(type);
+		utl.setUid(uid);
+		userTransferLogMapper.insertSelective(utl);
+		
+	}
+
+	@Override
+	public List<transferListBo> transferList(String uid) {
+		return userTransferLogMapper.selectByUidGetList(uid);
+	}
+
+
 }

+ 20 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.OrderRefundInvoice;
@@ -21,6 +22,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.order.bo.InputNewOrderRefund;
 import com.goafanti.order.bo.InputTChangeTask;
 import com.goafanti.order.bo.NewOrderChangeBo;
+import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.service.OrderChangeService;
 
 @RestController
@@ -372,6 +374,23 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.data(orderChangeService.pushCompleteOrderChange(nb));
 		return res;
 	}
+	/**
+	 * 取消变更
+	 */
+	@RequestMapping(value ="/cancelOrderChange",method = RequestMethod.POST)
+	public Result cancelOrderChange(NewOrderChangeBo nb) {
+		Result res =new Result();
+		if (null==nb.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "变更编号", "变更编号"));
+			return res;
+		}
+		if (nb.getProcessState()!=0&&(nb.getStatus()!=0 && nb.getStatus()!=3)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "变更流程或状态", "变更流程或状态"));
+			return res;
+		}
+		res.data(orderChangeService.updateCancelOrderChange(nb));
+		return res;
+	}
 	
 	
 	/**
@@ -459,5 +478,6 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.setData(orderChangeService.pushRefund(id,refundUrl));
 		return res;
 	}
+
 	
 }

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -85,5 +85,7 @@ public interface OrderChangeService {
 
 	boolean checkrefund(InputNewOrderRefund or);
 
+	int updateCancelOrderChange(NewOrderChangeBo nb);
+
 
 }

+ 21 - 3
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -900,8 +900,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					}
 				}else {
 					if (t.getType()==3) {
-						tChangeTaskMapper.deleteByTid(t.getTid());
-						
+						tChangeTaskMapper.deleteByPrimaryKey(t.getId());
+						tChangeDunMapper.deleteByCtid(t.getId());
 					}
 				}
 				return tChangeTaskMapper.updateByPrimaryKeySelective(t);
@@ -909,7 +909,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 			@Override
 			public int updateChangeDun(TChangeDun t) {
-				return tChangeDunMapper.updateByPrimaryKeySelective(t);
+				if (t.getTid()!=null) {
+					return tChangeDunMapper.updateByPrimaryKeySelective(t);	
+				}else {
+					return tChangeDunMapper.deleteByPrimaryKey(t.getId());
+				}
+				
 			}
 
 			@Override
@@ -1003,4 +1008,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				}
 				return true;
 			}
+
+			@Override
+			public int updateCancelOrderChange(NewOrderChangeBo nb) {
+				NewOrderChange noc=new NewOrderChange();
+				noc.setId(nb.getId());
+				noc.setStatus(5);
+				newOrderChangeMapper.updateByPrimaryKeySelective(noc);
+				TOrderNew t=new TOrderNew();
+				t.setOrderNo(nb.getOrderNo());
+				t.setDeleteSign(0);
+				tOrderNewMapper.updateByPrimaryKeySelective(t);
+				return 1;
+			}
 }