Procházet zdrojové kódy

项目拆分变更修改

Signed-off-by: anderx <312518615@qq.com>
anderx před 5 roky
rodič
revize
3276cef296

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

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

@@ -10,68 +10,68 @@ import org.apache.ibatis.annotations.Param;
 public interface TChangeTaskMapper {
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	long countByExample(TChangeTaskExample example);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	int deleteByExample(TChangeTaskExample example);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	int insert(TChangeTask record);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	int insertSelective(TChangeTask record);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	List<TChangeTask> selectByExample(TChangeTaskExample example);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	TChangeTask selectByPrimaryKey(Integer id);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TChangeTask record, @Param("example") TChangeTaskExample example);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	int updateByExample(@Param("record") TChangeTask record, @Param("example") TChangeTaskExample example);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TChangeTask record);
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	int updateByPrimaryKey(TChangeTask record);
 

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

@@ -111,5 +111,7 @@ public interface TOrderTaskMapper {
 
 	List<TOrderTaskListBo> splitProjectList(Integer tid);
 
+	List<TOrderTaskBo> selectOrderTaskAll(String orderNo);
+
 
 }

+ 49 - 34
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.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 Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -17,14 +17,15 @@
     <result column="commodity_quantity" jdbcType="INTEGER" property="commodityQuantity" />
     <result column="commodity_price" jdbcType="DECIMAL" property="commodityPrice" />
     <result column="task_comment" jdbcType="VARCHAR" property="taskComment" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="split_status" jdbcType="INTEGER" property="splitStatus" />
   </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 Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -58,7 +59,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -92,16 +93,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     id, tid, cid, order_no, main, commodity_id, commodity_name, commodity_quantity, commodity_price, 
-    task_comment, create_time, type
+    task_comment, type, create_time, split_status
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TChangeTaskExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     select
     <if test="distinct">
@@ -120,7 +121,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -131,7 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     delete from t_change_task
     where id = #{id,jdbcType=INTEGER}
@@ -140,7 +141,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     delete from t_change_task
     <if test="_parameter != null">
@@ -151,24 +152,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     insert into t_change_task (id, tid, cid, 
       order_no, main, commodity_id, 
       commodity_name, commodity_quantity, commodity_price, 
-      task_comment, create_time, type
-      )
+      task_comment, type, create_time, 
+      split_status)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
       #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{commodityId,jdbcType=VARCHAR}, 
       #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, 
-      #{taskComment,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{type,jdbcType=INTEGER}
-      )
+      #{taskComment,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{splitStatus,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     insert into t_change_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -202,11 +203,14 @@
       <if test="taskComment != null">
         task_comment,
       </if>
+      <if test="type != null">
+        type,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="type != null">
-        type,
+      <if test="splitStatus != null">
+        split_status,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -240,11 +244,14 @@
       <if test="taskComment != null">
         #{taskComment,jdbcType=VARCHAR},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
+      <if test="splitStatus != null">
+        #{splitStatus,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -252,7 +259,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     select count(*) from t_change_task
     <if test="_parameter != null">
@@ -263,7 +270,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     update t_change_task
     <set>
@@ -297,11 +304,14 @@
       <if test="record.taskComment != null">
         task_comment = #{record.taskComment,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>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
+      <if test="record.splitStatus != null">
+        split_status = #{record.splitStatus,jdbcType=INTEGER},
       </if>
     </set>
     <if test="_parameter != null">
@@ -312,7 +322,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     update t_change_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -325,8 +335,9 @@
       commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
       commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
       task_comment = #{record.taskComment,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      type = #{record.type,jdbcType=INTEGER}
+      split_status = #{record.splitStatus,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -335,7 +346,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     update t_change_task
     <set>
@@ -366,11 +377,14 @@
       <if test="taskComment != null">
         task_comment = #{taskComment,jdbcType=VARCHAR},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+      <if test="splitStatus != null">
+        split_status = #{splitStatus,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -379,7 +393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+      This element was generated on Tue Mar 17 17:10:55 CST 2020.
     -->
     update t_change_task
     set tid = #{tid,jdbcType=INTEGER},
@@ -391,19 +405,20 @@
       commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
       commodity_price = #{commodityPrice,jdbcType=DECIMAL},
       task_comment = #{taskComment,jdbcType=VARCHAR},
+      type = #{type,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      type = #{type,jdbcType=INTEGER}
+      split_status = #{splitStatus,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
   <insert id="insertSelectiveList" parameterType="java.util.List">
-    insert into t_change_task ( tid, cid, 
+    insert into t_change_task ( tid, cid, split_status,
       order_no, commodity_id, commodity_name, 
       commodity_quantity, commodity_price, task_comment, 
       create_time)
     values 
     <foreach collection="list" index="index" item="item" separator=",">
-      ( #{item.tid,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, 
+      ( #{item.tid,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, #{item.splitStatus,jdbcType=INTEGER},
       #{item.orderNo,jdbcType=VARCHAR}, #{item.commodityId,jdbcType=VARCHAR}, #{item.commodityName,jdbcType=VARCHAR}, 
       #{item.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR}, 
       now())
@@ -412,7 +427,7 @@
   <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeTaskOut">
      select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,
   	 a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,
-  a.task_comment as taskComment ,a.commodity_price as commodityPrice
+  a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus
     from t_change_task a left join business_project i on a.commodity_id=i.id
   	left join business_category c on i.cid=c.id 
   	where a.cid= #{id} order by a.id

+ 12 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1024,6 +1024,18 @@
   	where a.super_id is null and a.split_status !=2 and  a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
   </select>
   
+  <select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">
+        select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
+  a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
+  c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
+  a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
+  a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,a.split_status splitStatus
+  	 from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
+  	 left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
+  	 left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
+  	where a.super_id is null  and  a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
+  </select>
+  
   
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
   	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,e.contract_no contractNo,a.task_receiver taskReceiver,

+ 124 - 101
src/main/java/com/goafanti/common/model/TChangeTask.java

@@ -6,279 +6,302 @@ import java.util.Date;
 public class TChangeTask {
 
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.id
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.id
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private Integer id;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.tid
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.tid
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private Integer tid;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.cid
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.cid
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private Integer cid;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.order_no
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.order_no
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private String orderNo;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.main
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.main
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private Integer main;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_id
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_id
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private String commodityId;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_name
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_name
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private String commodityName;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_quantity
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_quantity
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private Integer commodityQuantity;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_price
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_price
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private BigDecimal commodityPrice;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.task_comment
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.task_comment
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private String taskComment;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.create_time
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.type
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 */
+	private Integer type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.create_time
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	private Date createTime;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.type
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.split_status
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
-	private Integer type;
+	private Integer splitStatus;
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.id
-	 * @return  the value of t_changge_task.id
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.id
+	 * @return  the value of t_change_task.id
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public Integer getId() {
 		return id;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.id
-	 * @param id  the value for t_changge_task.id
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.id
+	 * @param id  the value for t_change_task.id
+	 * @mbg.generated  Tue Mar 17 17:10:55 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 t_changge_task.tid
-	 * @return  the value of t_changge_task.tid
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.tid
+	 * @return  the value of t_change_task.tid
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.tid
-	 * @param tid  the value for t_changge_task.tid
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.tid
+	 * @param tid  the value for t_change_task.tid
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.cid
-	 * @return  the value of t_changge_task.cid
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.cid
+	 * @return  the value of t_change_task.cid
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.cid
-	 * @param cid  the value for t_changge_task.cid
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.cid
+	 * @param cid  the value for t_change_task.cid
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.order_no
-	 * @return  the value of t_changge_task.order_no
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.order_no
+	 * @return  the value of t_change_task.order_no
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.order_no
-	 * @param orderNo  the value for t_changge_task.order_no
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.order_no
+	 * @param orderNo  the value for t_change_task.order_no
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.main
-	 * @return  the value of t_changge_task.main
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.main
+	 * @return  the value of t_change_task.main
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public Integer getMain() {
 		return main;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.main
-	 * @param main  the value for t_changge_task.main
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.main
+	 * @param main  the value for t_change_task.main
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setMain(Integer main) {
 		this.main = main;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_id
-	 * @return  the value of t_changge_task.commodity_id
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_id
+	 * @return  the value of t_change_task.commodity_id
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public String getCommodityId() {
 		return commodityId;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_id
-	 * @param commodityId  the value for t_changge_task.commodity_id
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_id
+	 * @param commodityId  the value for t_change_task.commodity_id
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_name
-	 * @return  the value of t_changge_task.commodity_name
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_name
+	 * @return  the value of t_change_task.commodity_name
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public String getCommodityName() {
 		return commodityName;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_name
-	 * @param commodityName  the value for t_changge_task.commodity_name
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_name
+	 * @param commodityName  the value for t_change_task.commodity_name
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_quantity
-	 * @return  the value of t_changge_task.commodity_quantity
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_quantity
+	 * @return  the value of t_change_task.commodity_quantity
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_quantity
-	 * @param commodityQuantity  the value for t_changge_task.commodity_quantity
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_quantity
+	 * @param commodityQuantity  the value for t_change_task.commodity_quantity
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_price
-	 * @return  the value of t_changge_task.commodity_price
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_price
+	 * @return  the value of t_change_task.commodity_price
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_price
-	 * @param commodityPrice  the value for t_changge_task.commodity_price
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_price
+	 * @param commodityPrice  the value for t_change_task.commodity_price
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.task_comment
-	 * @return  the value of t_changge_task.task_comment
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.task_comment
+	 * @return  the value of t_change_task.task_comment
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public String getTaskComment() {
 		return taskComment;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.task_comment
-	 * @param taskComment  the value for t_changge_task.task_comment
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.task_comment
+	 * @param taskComment  the value for t_change_task.task_comment
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.create_time
-	 * @return  the value of t_changge_task.create_time
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.type
+	 * @return  the value of t_change_task.type
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.type
+	 * @param type  the value for t_change_task.type
+	 * @mbg.generated  Tue Mar 17 17:10:55 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 t_change_task.create_time
+	 * @return  the value of t_change_task.create_time
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.create_time
-	 * @param createTime  the value for t_changge_task.create_time
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.create_time
+	 * @param createTime  the value for t_change_task.create_time
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.type
-	 * @return  the value of t_changge_task.type
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.split_status
+	 * @return  the value of t_change_task.split_status
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
-	public Integer getType() {
-		return type;
+	public Integer getSplitStatus() {
+		return splitStatus;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.type
-	 * @param type  the value for t_changge_task.type
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.split_status
+	 * @param splitStatus  the value for t_change_task.split_status
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
-	public void setType(Integer type) {
-		this.type = type;
+	public void setSplitStatus(Integer splitStatus) {
+		this.splitStatus = splitStatus;
 	}
 }

+ 116 - 56
src/main/java/com/goafanti/common/model/TChangeTaskExample.java

@@ -7,80 +7,80 @@ import java.util.List;
 
 public class TChangeTaskExample {
     /**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	protected String orderByClause;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	protected boolean distinct;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public TChangeTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,8 +89,8 @@ public class TChangeTaskExample {
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,8 +101,8 @@ public class TChangeTaskExample {
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,8 +110,8 @@ public class TChangeTaskExample {
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,8 +120,8 @@ public class TChangeTaskExample {
 	}
 
 	/**
-	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -804,6 +804,66 @@ public class TChangeTaskExample {
 			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;
@@ -864,70 +924,70 @@ public class TChangeTaskExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIsNull() {
-			addCriterion("type is null");
+		public Criteria andSplitStatusIsNull() {
+			addCriterion("split_status is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIsNotNull() {
-			addCriterion("type is not null");
+		public Criteria andSplitStatusIsNotNull() {
+			addCriterion("split_status is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeEqualTo(Integer value) {
-			addCriterion("type =", value, "type");
+		public Criteria andSplitStatusEqualTo(Integer value) {
+			addCriterion("split_status =", value, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotEqualTo(Integer value) {
-			addCriterion("type <>", value, "type");
+		public Criteria andSplitStatusNotEqualTo(Integer value) {
+			addCriterion("split_status <>", value, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThan(Integer value) {
-			addCriterion("type >", value, "type");
+		public Criteria andSplitStatusGreaterThan(Integer value) {
+			addCriterion("split_status >", value, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
-			addCriterion("type >=", value, "type");
+		public Criteria andSplitStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_status >=", value, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThan(Integer value) {
-			addCriterion("type <", value, "type");
+		public Criteria andSplitStatusLessThan(Integer value) {
+			addCriterion("split_status <", value, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThanOrEqualTo(Integer value) {
-			addCriterion("type <=", value, "type");
+		public Criteria andSplitStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("split_status <=", value, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIn(List<Integer> values) {
-			addCriterion("type in", values, "type");
+		public Criteria andSplitStatusIn(List<Integer> values) {
+			addCriterion("split_status in", values, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotIn(List<Integer> values) {
-			addCriterion("type not in", values, "type");
+		public Criteria andSplitStatusNotIn(List<Integer> values) {
+			addCriterion("split_status not in", values, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeBetween(Integer value1, Integer value2) {
-			addCriterion("type between", value1, value2, "type");
+		public Criteria andSplitStatusBetween(Integer value1, Integer value2) {
+			addCriterion("split_status between", value1, value2, "splitStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
-			addCriterion("type not between", value1, value2, "type");
+		public Criteria andSplitStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_status not between", value1, value2, "splitStatus");
 			return (Criteria) this;
 		}
 	}
 
 	/**
-	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
-	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_task
+	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -173,8 +173,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				}
 				TChangeDunMapper.insertSelectiveList(listcd);
 			}
-			List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
 			List<TChangeTask> listck=new ArrayList<>();
+			List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo());
 			if (listTask!=null&&!listTask.isEmpty()) {
 				for (TOrderTaskBo tt : listTask) {
 					TChangeTask ck=new TChangeTask();
@@ -186,6 +186,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					ck.setCommodityPrice(tt.getCommodityPrice());
 					ck.setCommodityQuantity(tt.getCommodityQuantity());
 					ck.setTaskComment(tt.getTaskComment());
+					ck.setSplitStatus(tt.getSplitStatus());
 					ck.setMain(tt.getMain());
 					ck.setTid(tt.getId());
 					listck.add(ck);

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

@@ -351,7 +351,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			//设置父任务
 			TOrderTaskDetailBo t2=new TOrderTaskDetailBo();
 			t2.setOrderNo(t.getOrderNo());
-			t2.setId(task2.getId().toString());
+			t2.setId(task2.getSplitSuper().toString());
 			t2.setProjectStatus(task3.getProjectStatus());
 			pushOrderDun(t2,task3);
 		}