Browse Source

订单变更1.3开发

anderx 6 years ago
parent
commit
03459142fd

+ 14 - 14
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -11,85 +11,85 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	long countByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int deleteByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	List<TOrderTask> selectByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 61 - 25
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -40,12 +40,14 @@
     <result column="arrival_money" jdbcType="INTEGER" property="arrivalMoney" />
     <result column="outsource_name" jdbcType="VARCHAR" property="outsourceName" />
     <result column="outsource_price" jdbcType="DECIMAL" property="outsourcePrice" />
+    <result column="consultant_id" jdbcType="VARCHAR" property="consultantId" />
+    <result column="manager_id" jdbcType="VARCHAR" property="managerId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -53,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -87,7 +89,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -121,20 +123,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
     task_comment, task_start_time, task_end_time, project_status, accept_time, review_time, 
     publicity_time, licence_time, certificate_number, status, form_retrieve, task_refund, 
     refund_content, retrieve_content, declare_user, declare_pwd, set_up_amount, arrival_money, 
-    outsource_name, outsource_price
+    outsource_name, outsource_price, consultant_id, manager_id
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     attachment_url
   </sql>
@@ -142,7 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     select
     <if test="distinct">
@@ -163,7 +165,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     select
     <if test="distinct">
@@ -182,7 +184,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -195,7 +197,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -204,7 +206,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -215,7 +217,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -228,7 +230,8 @@
       task_refund, refund_content, retrieve_content, 
       declare_user, declare_pwd, set_up_amount, 
       arrival_money, outsource_name, outsource_price, 
-      attachment_url)
+      consultant_id, manager_id, attachment_url
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, 
       #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
       #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, 
@@ -240,13 +243,14 @@
       #{taskRefund,jdbcType=INTEGER}, #{refundContent,jdbcType=VARCHAR}, #{retrieveContent,jdbcType=VARCHAR}, 
       #{declareUser,jdbcType=VARCHAR}, #{declarePwd,jdbcType=VARCHAR}, #{setUpAmount,jdbcType=DECIMAL}, 
       #{arrivalMoney,jdbcType=INTEGER}, #{outsourceName,jdbcType=VARCHAR}, #{outsourcePrice,jdbcType=DECIMAL}, 
-      #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{consultantId,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -349,6 +353,12 @@
       <if test="outsourcePrice != null">
         outsource_price,
       </if>
+      <if test="consultantId != null">
+        consultant_id,
+      </if>
+      <if test="managerId != null">
+        manager_id,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -453,6 +463,12 @@
       <if test="outsourcePrice != null">
         #{outsourcePrice,jdbcType=DECIMAL},
       </if>
+      <if test="consultantId != null">
+        #{consultantId,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        #{managerId,jdbcType=VARCHAR},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -462,7 +478,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -473,7 +489,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     update t_order_task
     <set>
@@ -576,6 +592,12 @@
       <if test="record.outsourcePrice != null">
         outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL},
       </if>
+      <if test="record.consultantId != null">
+        consultant_id = #{record.consultantId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.managerId != null">
+        manager_id = #{record.managerId,jdbcType=VARCHAR},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -588,7 +610,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -624,6 +646,8 @@
       arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
       outsource_name = #{record.outsourceName,jdbcType=VARCHAR},
       outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL},
+      consultant_id = #{record.consultantId,jdbcType=VARCHAR},
+      manager_id = #{record.managerId,jdbcType=VARCHAR},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -633,7 +657,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -668,7 +692,9 @@
       set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
       arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
       outsource_name = #{record.outsourceName,jdbcType=VARCHAR},
-      outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL}
+      outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL},
+      consultant_id = #{record.consultantId,jdbcType=VARCHAR},
+      manager_id = #{record.managerId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -677,7 +703,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     update t_order_task
     <set>
@@ -777,6 +803,12 @@
       <if test="outsourcePrice != null">
         outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
       </if>
+      <if test="consultantId != null">
+        consultant_id = #{consultantId,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        manager_id = #{managerId,jdbcType=VARCHAR},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -787,7 +819,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -822,6 +854,8 @@
       arrival_money = #{arrivalMoney,jdbcType=INTEGER},
       outsource_name = #{outsourceName,jdbcType=VARCHAR},
       outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
+      consultant_id = #{consultantId,jdbcType=VARCHAR},
+      manager_id = #{managerId,jdbcType=VARCHAR},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -829,7 +863,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 12 11:12:48 CST 2019.
+      This element was generated on Thu Sep 26 15:38:54 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -863,7 +897,9 @@
       set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
       arrival_money = #{arrivalMoney,jdbcType=INTEGER},
       outsource_name = #{outsourceName,jdbcType=VARCHAR},
-      outsource_price = #{outsourcePrice,jdbcType=DECIMAL}
+      outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
+      consultant_id = #{consultantId,jdbcType=VARCHAR},
+      manager_id = #{managerId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">

+ 148 - 102
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -8,178 +8,188 @@ import com.goafanti.common.utils.StringUtils;
 public class TOrderTask {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.order_no
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.main
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer main;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.super_id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String superId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String commodityId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_name
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String commodityName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_quantity
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer commodityQuantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_mode
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String commodityMode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_price
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private BigDecimal commodityPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer taskStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_distribution_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Date taskDistributionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_allocator
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String taskAllocator;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_receiver
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String taskReceiver;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_comment
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String taskComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_start_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Date taskStartTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_end_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Date taskEndTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.project_status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer projectStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.accept_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Date acceptTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.review_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Date reviewTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.publicity_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Date publicityTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.licence_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Date licenceTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.certificate_number
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String certificateNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.form_retrieve
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer formRetrieve;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_refund
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer taskRefund;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.refund_content
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String refundContent;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.retrieve_content
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String retrieveContent;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.declare_user
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String declareUser;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.declare_pwd
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String declarePwd;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.set_up_amount
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private BigDecimal setUpAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.arrival_money
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private Integer arrivalMoney;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.outsource_name
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String outsourceName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.outsource_price
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private BigDecimal outsourcePrice;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.consultant_id
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 */
+	private String consultantId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.manager_id
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 */
+	private String managerId;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.attachment_url
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	private String attachmentUrl;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.id
 	 * @return  the value of t_order_task.id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -188,7 +198,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.id
 	 * @param id  the value for t_order_task.id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -197,7 +207,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.order_no
 	 * @return  the value of t_order_task.order_no
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -206,7 +216,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.order_no
 	 * @param orderNo  the value for t_order_task.order_no
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -215,7 +225,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.main
 	 * @return  the value of t_order_task.main
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getMain() {
 		return main;
@@ -224,7 +234,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.main
 	 * @param main  the value for t_order_task.main
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setMain(Integer main) {
 		this.main = main;
@@ -233,7 +243,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.super_id
 	 * @return  the value of t_order_task.super_id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getSuperId() {
 		return superId;
@@ -242,7 +252,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.super_id
 	 * @param superId  the value for t_order_task.super_id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setSuperId(String superId) {
 		this.superId = superId;
@@ -251,7 +261,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_id
 	 * @return  the value of t_order_task.commodity_id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -260,7 +270,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_id
 	 * @param commodityId  the value for t_order_task.commodity_id
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -269,7 +279,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_name
 	 * @return  the value of t_order_task.commodity_name
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -278,7 +288,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_name
 	 * @param commodityName  the value for t_order_task.commodity_name
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -287,7 +297,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_quantity
 	 * @return  the value of t_order_task.commodity_quantity
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -296,7 +306,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_quantity
 	 * @param commodityQuantity  the value for t_order_task.commodity_quantity
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -305,7 +315,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_mode
 	 * @return  the value of t_order_task.commodity_mode
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getCommodityMode() {
 		return commodityMode;
@@ -314,7 +324,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_mode
 	 * @param commodityMode  the value for t_order_task.commodity_mode
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setCommodityMode(String commodityMode) {
 		this.commodityMode = commodityMode;
@@ -323,7 +333,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_price
 	 * @return  the value of t_order_task.commodity_price
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
@@ -332,7 +342,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_price
 	 * @param commodityPrice  the value for t_order_task.commodity_price
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
@@ -341,7 +351,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_status
 	 * @return  the value of t_order_task.task_status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getTaskStatus() {
 		return taskStatus;
@@ -350,7 +360,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_status
 	 * @param taskStatus  the value for t_order_task.task_status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setTaskStatus(Integer taskStatus) {
 		this.taskStatus = taskStatus;
@@ -359,7 +369,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_distribution_time
 	 * @return  the value of t_order_task.task_distribution_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Date getTaskDistributionTime() {
 		return taskDistributionTime;
@@ -368,7 +378,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_distribution_time
 	 * @param taskDistributionTime  the value for t_order_task.task_distribution_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setTaskDistributionTime(Date taskDistributionTime) {
 		this.taskDistributionTime = taskDistributionTime;
@@ -377,7 +387,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_allocator
 	 * @return  the value of t_order_task.task_allocator
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getTaskAllocator() {
 		return taskAllocator;
@@ -386,7 +396,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_allocator
 	 * @param taskAllocator  the value for t_order_task.task_allocator
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setTaskAllocator(String taskAllocator) {
 		this.taskAllocator = taskAllocator;
@@ -395,7 +405,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_receiver
 	 * @return  the value of t_order_task.task_receiver
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getTaskReceiver() {
 		return taskReceiver;
@@ -404,7 +414,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_receiver
 	 * @param taskReceiver  the value for t_order_task.task_receiver
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
@@ -413,7 +423,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_comment
 	 * @return  the value of t_order_task.task_comment
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -422,7 +432,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_comment
 	 * @param taskComment  the value for t_order_task.task_comment
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -431,7 +441,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_start_time
 	 * @return  the value of t_order_task.task_start_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Date getTaskStartTime() {
 		return taskStartTime;
@@ -440,7 +450,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_start_time
 	 * @param taskStartTime  the value for t_order_task.task_start_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setTaskStartTime(Date taskStartTime) {
 		this.taskStartTime = taskStartTime;
@@ -449,7 +459,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_end_time
 	 * @return  the value of t_order_task.task_end_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Date getTaskEndTime() {
 		return taskEndTime;
@@ -458,7 +468,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_end_time
 	 * @param taskEndTime  the value for t_order_task.task_end_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setTaskEndTime(Date taskEndTime) {
 		this.taskEndTime = taskEndTime;
@@ -467,7 +477,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.project_status
 	 * @return  the value of t_order_task.project_status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getProjectStatus() {
 		return projectStatus;
@@ -476,7 +486,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.project_status
 	 * @param projectStatus  the value for t_order_task.project_status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
@@ -485,7 +495,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.accept_time
 	 * @return  the value of t_order_task.accept_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Date getAcceptTime() {
 		return acceptTime;
@@ -494,7 +504,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.accept_time
 	 * @param acceptTime  the value for t_order_task.accept_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setAcceptTime(Date acceptTime) {
 		this.acceptTime = acceptTime;
@@ -503,7 +513,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.review_time
 	 * @return  the value of t_order_task.review_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Date getReviewTime() {
 		return reviewTime;
@@ -512,7 +522,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.review_time
 	 * @param reviewTime  the value for t_order_task.review_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setReviewTime(Date reviewTime) {
 		this.reviewTime = reviewTime;
@@ -521,7 +531,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.publicity_time
 	 * @return  the value of t_order_task.publicity_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Date getPublicityTime() {
 		return publicityTime;
@@ -530,7 +540,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.publicity_time
 	 * @param publicityTime  the value for t_order_task.publicity_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setPublicityTime(Date publicityTime) {
 		this.publicityTime = publicityTime;
@@ -539,7 +549,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.licence_time
 	 * @return  the value of t_order_task.licence_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Date getLicenceTime() {
 		return licenceTime;
@@ -548,7 +558,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.licence_time
 	 * @param licenceTime  the value for t_order_task.licence_time
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setLicenceTime(Date licenceTime) {
 		this.licenceTime = licenceTime;
@@ -557,7 +567,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.certificate_number
 	 * @return  the value of t_order_task.certificate_number
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getCertificateNumber() {
 		return certificateNumber;
@@ -566,7 +576,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.certificate_number
 	 * @param certificateNumber  the value for t_order_task.certificate_number
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setCertificateNumber(String certificateNumber) {
 		this.certificateNumber = certificateNumber;
@@ -575,7 +585,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.status
 	 * @return  the value of t_order_task.status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -584,7 +594,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.status
 	 * @param status  the value for t_order_task.status
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -593,7 +603,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.form_retrieve
 	 * @return  the value of t_order_task.form_retrieve
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getFormRetrieve() {
 		return formRetrieve;
@@ -602,7 +612,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.form_retrieve
 	 * @param formRetrieve  the value for t_order_task.form_retrieve
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setFormRetrieve(Integer formRetrieve) {
 		this.formRetrieve = formRetrieve;
@@ -611,7 +621,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_refund
 	 * @return  the value of t_order_task.task_refund
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getTaskRefund() {
 		return taskRefund;
@@ -620,7 +630,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_refund
 	 * @param taskRefund  the value for t_order_task.task_refund
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setTaskRefund(Integer taskRefund) {
 		this.taskRefund = taskRefund;
@@ -629,7 +639,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.refund_content
 	 * @return  the value of t_order_task.refund_content
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getRefundContent() {
 		return refundContent;
@@ -638,7 +648,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.refund_content
 	 * @param refundContent  the value for t_order_task.refund_content
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setRefundContent(String refundContent) {
 		this.refundContent = refundContent;
@@ -647,7 +657,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.retrieve_content
 	 * @return  the value of t_order_task.retrieve_content
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getRetrieveContent() {
 		return retrieveContent;
@@ -656,7 +666,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.retrieve_content
 	 * @param retrieveContent  the value for t_order_task.retrieve_content
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setRetrieveContent(String retrieveContent) {
 		this.retrieveContent = retrieveContent;
@@ -665,7 +675,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.declare_user
 	 * @return  the value of t_order_task.declare_user
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getDeclareUser() {
 		return declareUser;
@@ -674,7 +684,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.declare_user
 	 * @param declareUser  the value for t_order_task.declare_user
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setDeclareUser(String declareUser) {
 		this.declareUser = declareUser;
@@ -683,7 +693,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.declare_pwd
 	 * @return  the value of t_order_task.declare_pwd
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getDeclarePwd() {
 		return declarePwd;
@@ -692,7 +702,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.declare_pwd
 	 * @param declarePwd  the value for t_order_task.declare_pwd
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setDeclarePwd(String declarePwd) {
 		this.declarePwd = declarePwd;
@@ -701,7 +711,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.set_up_amount
 	 * @return  the value of t_order_task.set_up_amount
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public BigDecimal getSetUpAmount() {
 		return setUpAmount;
@@ -710,7 +720,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.set_up_amount
 	 * @param setUpAmount  the value for t_order_task.set_up_amount
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setSetUpAmount(BigDecimal setUpAmount) {
 		this.setUpAmount = setUpAmount;
@@ -719,7 +729,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.arrival_money
 	 * @return  the value of t_order_task.arrival_money
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Integer getArrivalMoney() {
 		return arrivalMoney;
@@ -728,7 +738,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.arrival_money
 	 * @param arrivalMoney  the value for t_order_task.arrival_money
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setArrivalMoney(Integer arrivalMoney) {
 		this.arrivalMoney = arrivalMoney;
@@ -737,7 +747,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.outsource_name
 	 * @return  the value of t_order_task.outsource_name
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getOutsourceName() {
 		return outsourceName;
@@ -746,7 +756,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.outsource_name
 	 * @param outsourceName  the value for t_order_task.outsource_name
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setOutsourceName(String outsourceName) {
 		this.outsourceName = outsourceName;
@@ -755,7 +765,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.outsource_price
 	 * @return  the value of t_order_task.outsource_price
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public BigDecimal getOutsourcePrice() {
 		return outsourcePrice;
@@ -764,16 +774,52 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.outsource_price
 	 * @param outsourcePrice  the value for t_order_task.outsource_price
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setOutsourcePrice(BigDecimal outsourcePrice) {
 		this.outsourcePrice = outsourcePrice;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.consultant_id
+	 * @return  the value of t_order_task.consultant_id
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 */
+	public String getConsultantId() {
+		return consultantId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.consultant_id
+	 * @param consultantId  the value for t_order_task.consultant_id
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 */
+	public void setConsultantId(String consultantId) {
+		this.consultantId = consultantId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.manager_id
+	 * @return  the value of t_order_task.manager_id
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 */
+	public String getManagerId() {
+		return managerId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.manager_id
+	 * @param managerId  the value for t_order_task.manager_id
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 */
+	public void setManagerId(String managerId) {
+		this.managerId = managerId;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.attachment_url
 	 * @return  the value of t_order_task.attachment_url
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -782,7 +828,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.attachment_url
 	 * @param attachmentUrl  the value for t_order_task.attachment_url
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;

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

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public TOrderTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2310,11 +2310,151 @@ public class TOrderTaskExample {
 			addCriterion("outsource_price not between", value1, value2, "outsourcePrice");
 			return (Criteria) this;
 		}
+
+		public Criteria andConsultantIdIsNull() {
+			addCriterion("consultant_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdIsNotNull() {
+			addCriterion("consultant_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdEqualTo(String value) {
+			addCriterion("consultant_id =", value, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdNotEqualTo(String value) {
+			addCriterion("consultant_id <>", value, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdGreaterThan(String value) {
+			addCriterion("consultant_id >", value, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdGreaterThanOrEqualTo(String value) {
+			addCriterion("consultant_id >=", value, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdLessThan(String value) {
+			addCriterion("consultant_id <", value, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdLessThanOrEqualTo(String value) {
+			addCriterion("consultant_id <=", value, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdLike(String value) {
+			addCriterion("consultant_id like", value, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdNotLike(String value) {
+			addCriterion("consultant_id not like", value, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdIn(List<String> values) {
+			addCriterion("consultant_id in", values, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdNotIn(List<String> values) {
+			addCriterion("consultant_id not in", values, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdBetween(String value1, String value2) {
+			addCriterion("consultant_id between", value1, value2, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIdNotBetween(String value1, String value2) {
+			addCriterion("consultant_id not between", value1, value2, "consultantId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdIsNull() {
+			addCriterion("manager_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdIsNotNull() {
+			addCriterion("manager_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdEqualTo(String value) {
+			addCriterion("manager_id =", value, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdNotEqualTo(String value) {
+			addCriterion("manager_id <>", value, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdGreaterThan(String value) {
+			addCriterion("manager_id >", value, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdGreaterThanOrEqualTo(String value) {
+			addCriterion("manager_id >=", value, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdLessThan(String value) {
+			addCriterion("manager_id <", value, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdLessThanOrEqualTo(String value) {
+			addCriterion("manager_id <=", value, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdLike(String value) {
+			addCriterion("manager_id like", value, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdNotLike(String value) {
+			addCriterion("manager_id not like", value, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdIn(List<String> values) {
+			addCriterion("manager_id in", values, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdNotIn(List<String> values) {
+			addCriterion("manager_id not in", values, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdBetween(String value1, String value2) {
+			addCriterion("manager_id between", value1, value2, "managerId");
+			return (Criteria) this;
+		}
+
+		public Criteria andManagerIdNotBetween(String value1, String value2) {
+			addCriterion("manager_id not between", value1, value2, "managerId");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 3 - 0
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -36,6 +36,9 @@ public class OrderProjectApiController extends CertifyApiController {
 	
 	/**
 	 * 项目分配
+	 * taskId 项目ID
+	 * taskReceiverId 受理人ID
+	 * specially 0 任务派单(咨询师经理派单) 1项目派单(咨询师管理员派单)2咨询师退回给经理
 	 */
 	@RequestMapping(value = "/projectDistribution", method = RequestMethod.POST)
 	public Result projectDistribution(Integer taskId,String taskReceiverId,Integer specially ){

+ 8 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -89,15 +89,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setTaskReceiver(taskReceiverId);
 		t.setTaskDistributionTime(new Date());
 		insetLog(taskId, taskReceiverId);
-		tOrderTaskMapper.updateByPrimaryKeySelective(t);
-		updateOrder(t);
-		
 		//0-经理 (经理分派会创建子项目)1 管理员或经理转交
 		if (specially==1) {
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMDDPD.getCode());
+			t.setManagerId(taskReceiverId);
+			tOrderTaskMapper.updateByPrimaryKeySelective(t);
 		}else if (specially==0) {
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode());
+			t.setConsultantId(taskReceiverId);
+			tOrderTaskMapper.updateByPrimaryKeySelective(t);
+		}else if(specially==2) { //咨询师推给咨询师经理
+			t.setConsultantId(null);
+			tOrderTaskMapper.updateByPrimaryKey(t);
 		}
+		updateOrder(t);
 		return 1;
 	}
 	public void addOrderLog(String orderNo, Integer code) {

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.18
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com/1.1.18
+#avatar.host=//sb.jishutao.com
 
 #连测试
-#avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.18
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.18
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload