Ver código fonte

变更修改

Signed-off-by: anderx <312518615@qq.com>
anderx 6 anos atrás
pai
commit
18ea523c7c

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

@@ -0,0 +1,81 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.model.TChangeDunExample;
+import com.goafanti.order.bo.TChangeDunOut;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TChangeDunMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	long countByExample(TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	int deleteByExample(TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	int insert(TChangeDun record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	int insertSelective(TChangeDun record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	List<TChangeDun> selectByExample(TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	TChangeDun selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") TChangeDun record, @Param("example") TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	int updateByExample(@Param("record") TChangeDun record, @Param("example") TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	int updateByPrimaryKeySelective(TChangeDun record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	int updateByPrimaryKey(TChangeDun record);
+
+	void insertSelectiveList(@Param("list")List<TChangeDun> list);
+
+	List<TChangeDunOut> selectByCid(Integer id);
+}

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

@@ -0,0 +1,81 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TChangeTask;
+import com.goafanti.common.model.TChangeTaskExample;
+import com.goafanti.order.bo.TChangeTaskOut;
+
+import java.util.List;
+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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	int updateByPrimaryKey(TChangeTask record);
+
+	void insertSelectiveList(@Param("list")List<TChangeTask> list);
+
+	List<TChangeTaskOut> selectByCid(Integer id);
+}

+ 0 - 81
src/main/java/com/goafanti/common/dao/TChanggeDunMapper.java

@@ -1,81 +0,0 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.TChanggeDun;
-import com.goafanti.common.model.TChanggeDunExample;
-import com.goafanti.order.bo.TChanggeDunOut;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface TChanggeDunMapper {
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	long countByExample(TChanggeDunExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	int deleteByExample(TChanggeDunExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	int deleteByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	int insert(TChanggeDun record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	int insertSelective(TChanggeDun record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	List<TChanggeDun> selectByExample(TChanggeDunExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	TChanggeDun selectByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") TChanggeDun record, @Param("example") TChanggeDunExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	int updateByExample(@Param("record") TChanggeDun record, @Param("example") TChanggeDunExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	int updateByPrimaryKeySelective(TChanggeDun record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
-	 */
-	int updateByPrimaryKey(TChanggeDun record);
-
-	void insertSelectiveList(@Param("list")List<TChanggeDun> list);
-
-	List<TChanggeDunOut> selectByCid(Integer id);
-}

+ 0 - 81
src/main/java/com/goafanti/common/dao/TChanggeTaskMapper.java

@@ -1,81 +0,0 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.TChanggeTask;
-import com.goafanti.common.model.TChanggeTaskExample;
-import com.goafanti.order.bo.TChanggeTaskOut;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface TChanggeTaskMapper {
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	long countByExample(TChanggeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	int deleteByExample(TChanggeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 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  Sat Jan 11 11:53:39 CST 2020
-	 */
-	int insert(TChanggeTask record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	int insertSelective(TChanggeTask record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	List<TChanggeTask> selectByExample(TChanggeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	TChanggeTask selectByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") TChanggeTask record, @Param("example") TChanggeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	int updateByExample(@Param("record") TChanggeTask record, @Param("example") TChanggeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	int updateByPrimaryKeySelective(TChanggeTask record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
-	 */
-	int updateByPrimaryKey(TChanggeTask record);
-
-	void insertSelectiveList(@Param("list")List<TChanggeTask> list);
-
-	List<TChanggeTaskOut> selectByCid(Integer id);
-}

+ 48 - 33
src/main/java/com/goafanti/common/mapper/TChanggeDunMapper.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.TChanggeDunMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TChanggeDun">
+<mapper namespace="com.goafanti.common.dao.TChangeDunMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TChangeDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="did" jdbcType="INTEGER" property="did" />
@@ -22,12 +22,13 @@
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="money" jdbcType="DECIMAL" property="money" />
     <result column="appropriation_ratio" jdbcType="DECIMAL" property="appropriationRatio" />
+    <result column="type" jdbcType="INTEGER" property="type" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -61,7 +62,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -95,16 +96,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     id, did, cid, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, 
-    status, create_time, start_time, money, appropriation_ratio
+    status, create_time, start_time, money, appropriation_ratio, type
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TChanggeDunExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TChangeDunExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     select
     <if test="distinct">
@@ -123,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -134,46 +135,46 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     delete from t_changge_dun
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChanggeDunExample">
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChangeDunExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     delete from t_changge_dun
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TChanggeDun">
+  <insert id="insert" parameterType="com.goafanti.common.model.TChangeDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     insert into t_changge_dun (id, did, cid, 
       order_no, tid, project_type, 
       dun_type, wait_day, effective_count, 
       aid, status, create_time, 
-      start_time, money, appropriation_ratio
-      )
+      start_time, money, appropriation_ratio, 
+      type)
     values (#{id,jdbcType=INTEGER}, #{did,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
       #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER}, 
       #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, #{effectiveCount,jdbcType=INTEGER}, 
       #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}, #{appropriationRatio,jdbcType=DECIMAL}
-      )
+      #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}, #{appropriationRatio,jdbcType=DECIMAL}, 
+      #{type,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TChanggeDun">
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     insert into t_changge_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -222,6 +223,9 @@
       <if test="appropriationRatio != null">
         appropriation_ratio,
       </if>
+      <if test="type != null">
+        type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -269,13 +273,16 @@
       <if test="appropriationRatio != null">
         #{appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TChanggeDunExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.goafanti.common.model.TChangeDunExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     select count(*) from t_changge_dun
     <if test="_parameter != null">
@@ -286,7 +293,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     update t_changge_dun
     <set>
@@ -335,6 +342,9 @@
       <if test="record.appropriationRatio != null">
         appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -344,7 +354,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     update t_changge_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -361,16 +371,17 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       money = #{record.money,jdbcType=DECIMAL},
-      appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL}
+      appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
+      type = #{record.type,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChanggeDun">
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChangeDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     update t_changge_dun
     <set>
@@ -416,14 +427,17 @@
       <if test="appropriationRatio != null">
         appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TChanggeDun">
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TChangeDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+      This element was generated on Mon Jan 13 09:27:23 CST 2020.
     -->
     update t_changge_dun
     set did = #{did,jdbcType=INTEGER},
@@ -439,7 +453,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       start_time = #{startTime,jdbcType=TIMESTAMP},
       money = #{money,jdbcType=DECIMAL},
-      appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL}
+      appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
+      type = #{type,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -450,7 +465,7 @@
       aid, status, create_time, 
       start_time, money, appropriation_ratio
       )values
-      <foreach collection="list" item="item" index= "index" separator =",">
+      <foreach collection="list" index="index" item="item" separator=",">
       ( #{item.did,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, 
       #{item.orderNo,jdbcType=VARCHAR}, #{item.tid,jdbcType=INTEGER}, #{item.projectType,jdbcType=INTEGER}, 
       #{item.dunType,jdbcType=INTEGER}, #{item.waitDay,jdbcType=INTEGER}, #{item.effectiveCount,jdbcType=INTEGER}, 
@@ -460,7 +475,7 @@
     </foreach>
   </insert>
   
-  <select id="selectByCid" resultType="com.goafanti.order.bo.TChanggeDunOut">
+  <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeDunOut">
   select a.id,a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
   	  b.set_up_amount setUpAmount, a.effective_count effectiveCount, a.aid, a.create_time createTime ,
   	  ifnull(c.commodity_name,d.commodity_name) commodityName,a.money,a.status, a.appropriation_ratio appropriationRatio

+ 47 - 30
src/main/java/com/goafanti/common/mapper/TChanggeTaskMapper.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.TChanggeTaskMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TChanggeTask">
+<mapper namespace="com.goafanti.common.dao.TChangeTaskMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TChangeTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -18,12 +18,13 @@
     <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" />
   </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 Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +58,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +92,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     id, tid, cid, order_no, main, commodity_id, commodity_name, commodity_quantity, commodity_price, 
-    task_comment, create_time
+    task_comment, create_time, type
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TChanggeTaskExample" resultMap="BaseResultMap">
+  <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 Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     select
     <if test="distinct">
@@ -119,7 +120,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,42 +131,44 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     delete from t_changge_task
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChanggeTaskExample">
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChangeTaskExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     delete from t_changge_task
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TChanggeTask">
+  <insert id="insert" 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 Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     insert into t_changge_task (id, tid, cid, 
       order_no, main, commodity_id, 
       commodity_name, commodity_quantity, commodity_price, 
-      task_comment, create_time)
+      task_comment, create_time, type
+      )
     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})
+      #{taskComment,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{type,jdbcType=INTEGER}
+      )
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TChanggeTask">
+  <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 Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     insert into t_changge_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -202,6 +205,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="type != null">
+        type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -237,13 +243,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TChanggeTaskExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.goafanti.common.model.TChangeTaskExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     select count(*) from t_changge_task
     <if test="_parameter != null">
@@ -254,7 +263,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     update t_changge_task
     <set>
@@ -291,6 +300,9 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -300,7 +312,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     update t_changge_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -313,16 +325,17 @@
       commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
       commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
       task_comment = #{record.taskComment,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      type = #{record.type,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChanggeTask">
+  <update id="updateByPrimaryKeySelective" 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 Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     update t_changge_task
     <set>
@@ -356,14 +369,17 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TChanggeTask">
+  <update id="updateByPrimaryKey" 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 Sat Jan 11 11:53:39 CST 2020.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
     -->
     update t_changge_task
     set tid = #{tid,jdbcType=INTEGER},
@@ -375,7 +391,8 @@
       commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
       commodity_price = #{commodityPrice,jdbcType=DECIMAL},
       task_comment = #{taskComment,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      type = #{type,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -392,7 +409,7 @@
       now())
     </foreach>
   </insert>
-  <select id="selectByCid" resultType="com.goafanti.order.bo.TChanggeTaskOut">
+  <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.task_comment as taskComment ,a.commodity_price as commodityPrice

+ 69 - 46
src/main/java/com/goafanti/common/model/TChanggeDun.java

@@ -3,88 +3,93 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class TChanggeDun {
+public class TChangeDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.id
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.did
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer did;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.cid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.order_no
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.tid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.project_type
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer projectType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.dun_type
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer dunType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.wait_day
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer waitDay;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.effective_count
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer effectiveCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.aid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.status
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.create_time
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.start_time
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private Date startTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.money
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private BigDecimal money;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.appropriation_ratio
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	private BigDecimal appropriationRatio;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_dun.type
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	private Integer type;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.id
 	 * @return  the value of t_changge_dun.id
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -93,7 +98,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.id
 	 * @param id  the value for t_changge_dun.id
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -102,7 +107,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.did
 	 * @return  the value of t_changge_dun.did
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getDid() {
 		return did;
@@ -111,7 +116,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.did
 	 * @param did  the value for t_changge_dun.did
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setDid(Integer did) {
 		this.did = did;
@@ -120,7 +125,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.cid
 	 * @return  the value of t_changge_dun.cid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -129,7 +134,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.cid
 	 * @param cid  the value for t_changge_dun.cid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -138,7 +143,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.order_no
 	 * @return  the value of t_changge_dun.order_no
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -147,7 +152,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.order_no
 	 * @param orderNo  the value for t_changge_dun.order_no
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -156,7 +161,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.tid
 	 * @return  the value of t_changge_dun.tid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -165,7 +170,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.tid
 	 * @param tid  the value for t_changge_dun.tid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -174,7 +179,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.project_type
 	 * @return  the value of t_changge_dun.project_type
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -183,7 +188,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.project_type
 	 * @param projectType  the value for t_changge_dun.project_type
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -192,7 +197,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.dun_type
 	 * @return  the value of t_changge_dun.dun_type
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -201,7 +206,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.dun_type
 	 * @param dunType  the value for t_changge_dun.dun_type
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -210,7 +215,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.wait_day
 	 * @return  the value of t_changge_dun.wait_day
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -219,7 +224,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.wait_day
 	 * @param waitDay  the value for t_changge_dun.wait_day
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
@@ -228,7 +233,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.effective_count
 	 * @return  the value of t_changge_dun.effective_count
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getEffectiveCount() {
 		return effectiveCount;
@@ -237,7 +242,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.effective_count
 	 * @param effectiveCount  the value for t_changge_dun.effective_count
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setEffectiveCount(Integer effectiveCount) {
 		this.effectiveCount = effectiveCount;
@@ -246,7 +251,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.aid
 	 * @return  the value of t_changge_dun.aid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -255,7 +260,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.aid
 	 * @param aid  the value for t_changge_dun.aid
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -264,7 +269,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.status
 	 * @return  the value of t_changge_dun.status
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -273,7 +278,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.status
 	 * @param status  the value for t_changge_dun.status
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -282,7 +287,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.create_time
 	 * @return  the value of t_changge_dun.create_time
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -291,7 +296,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.create_time
 	 * @param createTime  the value for t_changge_dun.create_time
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -300,7 +305,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.start_time
 	 * @return  the value of t_changge_dun.start_time
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -309,7 +314,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.start_time
 	 * @param startTime  the value for t_changge_dun.start_time
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -318,7 +323,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.money
 	 * @return  the value of t_changge_dun.money
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public BigDecimal getMoney() {
 		return money;
@@ -327,7 +332,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.money
 	 * @param money  the value for t_changge_dun.money
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setMoney(BigDecimal money) {
 		this.money = money;
@@ -336,7 +341,7 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.appropriation_ratio
 	 * @return  the value of t_changge_dun.appropriation_ratio
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public BigDecimal getAppropriationRatio() {
 		return appropriationRatio;
@@ -345,9 +350,27 @@ public class TChanggeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.appropriation_ratio
 	 * @param appropriationRatio  the value for t_changge_dun.appropriation_ratio
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setAppropriationRatio(BigDecimal appropriationRatio) {
 		this.appropriationRatio = appropriationRatio;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_dun.type
+	 * @return  the value of t_changge_dun.type
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_dun.type
+	 * @param type  the value for t_changge_dun.type
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }

+ 78 - 18
src/main/java/com/goafanti/common/model/TChanggeDunExample.java

@@ -5,34 +5,34 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class TChanggeDunExample {
+public class TChangeDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
-	public TChanggeDunExample() {
+	public TChangeDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TChanggeDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1083,11 +1083,71 @@ public class TChanggeDunExample {
 			addCriterion("appropriation_ratio not between", value1, value2, "appropriationRatio");
 			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;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_dun
-	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:23 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 57 - 34
src/main/java/com/goafanti/common/model/TChanggeTask.java

@@ -3,68 +3,73 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class TChanggeTask {
+public class TChangeTask {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.id
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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
+	 */
+	private Integer type;
 
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -73,7 +78,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -82,7 +87,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -91,7 +96,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -100,7 +105,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -109,7 +114,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -118,7 +123,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -127,7 +132,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -136,7 +141,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public Integer getMain() {
 		return main;
@@ -145,7 +150,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setMain(Integer main) {
 		this.main = main;
@@ -154,7 +159,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -163,7 +168,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -172,7 +177,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -181,7 +186,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -190,7 +195,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -199,7 +204,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -208,7 +213,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
@@ -217,7 +222,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
@@ -226,7 +231,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -235,7 +240,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -244,7 +249,7 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -253,9 +258,27 @@ public class TChanggeTask {
 	/**
 	 * 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }

+ 78 - 18
src/main/java/com/goafanti/common/model/TChanggeTaskExample.java

@@ -5,34 +5,34 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class TChanggeTaskExample {
+public class TChangeTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
-	public TChanggeTaskExample() {
+	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  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TChanggeTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -863,11 +863,71 @@ public class TChanggeTaskExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			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;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
-	 * @mbg.generated  Sat Jan 11 11:53:39 CST 2020
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 2 - 2
src/main/java/com/goafanti/order/bo/TChanggeDunOut.java

@@ -4,11 +4,11 @@ import java.math.BigDecimal;
 import java.util.Calendar;
 
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.model.TChanggeDun;
+import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.order.enums.NewOrderDunType;
 
-public class TChanggeDunOut extends TChanggeDun{
+public class TChangeDunOut extends TChangeDun{
 	private String dunTypeName;
 	private String commodityName;
 	private String startDate;

+ 2 - 2
src/main/java/com/goafanti/order/bo/TChanggeTaskOut.java

@@ -1,8 +1,8 @@
 package com.goafanti.order.bo;
 
-import com.goafanti.common.model.TChanggeTask;
+import com.goafanti.common.model.TChangeTask;
 
-public class TChanggeTaskOut extends TChanggeTask{
+public class TChangeTaskOut extends TChangeTask{
 	private String cname;
 	private Integer cSort;
 	public Integer getcSort() {

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

@@ -15,8 +15,8 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.OrderRefundInvoice;
-import com.goafanti.common.model.TChanggeDun;
-import com.goafanti.common.model.TChanggeTask;
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
@@ -48,7 +48,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	}
 	
 	@RequestMapping(value = "/addChangeTask", method = RequestMethod.POST)
-	public Result addChangeTask(TChanggeTask t){
+	public Result addChangeTask(TChangeTask t){
 		Result res = new Result();
 		if(StringUtils.isBlank(t.getCommodityId())){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目"));
@@ -109,7 +109,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteChangeTask", method = RequestMethod.POST)
-	public Result deleteChangeTask(TChanggeTask t){
+	public Result deleteChangeTask(TChangeTask t){
 		Result res = new Result();
 		if (null==t.getId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
@@ -125,7 +125,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteChangeDun", method = RequestMethod.POST)
-	public Result deleteChangeDun(TChanggeDun t){
+	public Result deleteChangeDun(TChangeDun t){
 		Result res = new Result();
 		if (null==t.getId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更任务id"));
@@ -135,7 +135,7 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 	@RequestMapping(value = "/addChangeDun", method = RequestMethod.POST)
-	public Result addChangeDun(TChanggeDun d){
+	public Result addChangeDun(TChangeDun d){
 		Result res = new Result();
 		if(StringUtils.isBlank(d.getOrderNo())||null==d.getTid()) {
 			res.getError().add(buildError("", "订单编号与项目编号必须指定"));

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

@@ -7,14 +7,14 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.goafanti.common.model.OrderRefundInvoice;
-import com.goafanti.common.model.TChanggeDun;
-import com.goafanti.common.model.TChanggeTask;
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.model.TChangeTask;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
-import com.goafanti.order.bo.TChanggeDunOut;
-import com.goafanti.order.bo.TChanggeTaskOut;
+import com.goafanti.order.bo.TChangeDunOut;
+import com.goafanti.order.bo.TChangeTaskOut;
 
 public interface OrderChangeService {
 
@@ -51,17 +51,17 @@ public interface OrderChangeService {
 
 
 
-	int addChangeTask(TChanggeTask t);
+	int addChangeTask(TChangeTask t);
 
-	int addChangeDun(TChanggeDun d);
+	int addChangeDun(TChangeDun d);
 
 	int deleteChangeTask(Integer id);
 
 	int deleteChangeDun(Integer id);
 
-	List<TChanggeTaskOut> selectChangeTask(Integer cid);
+	List<TChangeTaskOut> selectChangeTask(Integer cid);
 	
-	List<TChanggeDunOut> selectChangeDun(Integer cid);
+	List<TChangeDunOut> selectChangeDun(Integer cid);
 
 
 }

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

@@ -32,8 +32,8 @@ import com.goafanti.common.dao.OrderChangeLogMapper;
 import com.goafanti.common.dao.OrderExamineMapper;
 import com.goafanti.common.dao.OrderRefundInvoiceMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
-import com.goafanti.common.dao.TChanggeDunMapper;
-import com.goafanti.common.dao.TChanggeTaskMapper;
+import com.goafanti.common.dao.TChangeDunMapper;
+import com.goafanti.common.dao.TChangeTaskMapper;
 import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderDunMapper;
 import com.goafanti.common.dao.TOrderInvoiceMapper;
@@ -45,8 +45,8 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.OrderChangeLog;
 import com.goafanti.common.model.OrderExamine;
 import com.goafanti.common.model.OrderRefundInvoice;
-import com.goafanti.common.model.TChanggeDun;
-import com.goafanti.common.model.TChanggeTask;
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderTask;
@@ -65,8 +65,8 @@ import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
-import com.goafanti.order.bo.TChanggeDunOut;
-import com.goafanti.order.bo.TChanggeTaskOut;
+import com.goafanti.order.bo.TChangeDunOut;
+import com.goafanti.order.bo.TChangeTaskOut;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.enums.OrderChangeType;
@@ -111,9 +111,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderNewService	orderNewService;
 	@Autowired
-	private TChanggeTaskMapper	tChanggeTaskMapper;
+	private TChangeTaskMapper	TChangeTaskMapper;
 	@Autowired
-	private TChanggeDunMapper	tChanggeDunMapper;
+	private TChangeDunMapper	TChangeDunMapper;
 	
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
@@ -134,9 +134,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		newOrderChangeMapper.insertSelective(t);
 		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNoAndStatus(t.getOrderNo());
 		List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null,null);
-		List<TChanggeDun> listcd=new ArrayList<>();
+		List<TChangeDun> listcd=new ArrayList<>();
 		for (OutNewOrderDunBo d : listDun) {
-			TChanggeDun cd=new TChanggeDun();
+			TChangeDun cd=new TChangeDun();
 			cd.setOrderNo(d.getOrderNo());
 			cd.setAid(d.getAid());
 			cd.setAppropriationRatio(d.getAppropriationRatio());
@@ -151,11 +151,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			cd.setEffectiveCount(d.getEffectiveCount());
 			listcd.add(cd);
 		}
-		tChanggeDunMapper.insertSelectiveList(listcd);
+		TChangeDunMapper.insertSelectiveList(listcd);
 		List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
-		List<TChanggeTask> listck=new ArrayList<>();
+		List<TChangeTask> listck=new ArrayList<>();
 		for (TOrderTaskBo tt : listTask) {
-			TChanggeTask ck=new TChanggeTask();
+			TChangeTask ck=new TChangeTask();
 			ck.setOrderNo(tt.getOrderNo());
 			ck.setCid(ncb.getId());
 			ck.setCommodityId(tt.getCommodityId());
@@ -168,7 +168,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ck.setTid(tt.getId());
 			listck.add(ck);
 		}
-		tChanggeTaskMapper.insertSelectiveList(listck);
+		TChangeTaskMapper.insertSelectiveList(listck);
 		OrderChangeLog ocl=new OrderChangeLog();
 		ocl.setAuditor(TokenManager.getAdminId());
 		ocl.setOrderNo(t.getOrderNo());
@@ -545,10 +545,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 	private void pushTaskAndDun(Integer id,String orderNo) {
 		List<TOrderTaskBo> listot=tOrderTaskMapper.selectOrderTask(orderNo);
-		List<TChanggeTaskOut> listct=tChanggeTaskMapper.selectByCid(id);
+		List<TChangeTaskOut> listct=TChangeTaskMapper.selectByCid(id);
 		for (TOrderTaskBo ot : listot) {
 			boolean flag=true;
-			for (TChanggeTaskOut ct : listct) {
+			for (TChangeTaskOut ct : listct) {
 				if (ot.getId()==ct.getTid()) {
 					flag=false;
 				}
@@ -556,7 +556,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 			if(flag)tOrderTaskMapper.deleteByPrimaryKey(ot.getId());
 		}
-		for (TChanggeTaskOut cd : listct) {
+		for (TChangeTaskOut cd : listct) {
 			if (cd.getTid()==null) {
 			TOrderTask ot=new TOrderTask();
 			ot.setOrderNo(cd.getOrderNo());
@@ -570,14 +570,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ot.setTaskStatus(0);
 			tOrderTaskMapper.insertSelective(ot);
 			cd.setTid(ot.getId());
-			tChanggeTaskMapper.updateByPrimaryKeySelective(cd);
+			TChangeTaskMapper.updateByPrimaryKeySelective(cd);
 			}
 		}
-		List<TChanggeDunOut> listcd=tChanggeDunMapper.selectByCid(id);new ArrayList<>();
+		List<TChangeDunOut> listcd=TChangeDunMapper.selectByCid(id);new ArrayList<>();
 		List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(orderNo,null,null);
 		for (OutNewOrderDunBo nb2 : listDun) {
 			boolean flag=true;
-			for (TChanggeDunOut cd2 : listcd) {
+			for (TChangeDunOut cd2 : listcd) {
 				if (nb2.getId()==cd2.getDid()) {
 					flag=false;
 				}
@@ -585,7 +585,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 			if(flag)newOrderDunMapper.deleteByPrimaryKey(nb2.getId());
 		}
-		for (TChanggeDunOut cd : listcd) {
+		for (TChangeDunOut cd : listcd) {
 			if (cd.getDid()==null) {
 			NewOrderDun nd=new NewOrderDun();
 			nd.setOrderNo(cd.getOrderNo());
@@ -723,34 +723,34 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 
 			@Override
-			public int addChangeTask(TChanggeTask t) {
-				return tChanggeTaskMapper.insertSelective(t);
+			public int addChangeTask(TChangeTask t) {
+				return TChangeTaskMapper.insertSelective(t);
 			}
 
 			@Override
-			public int addChangeDun(TChanggeDun d) {
+			public int addChangeDun(TChangeDun d) {
 				d.setAid(TokenManager.getAdminId());
-				return tChanggeDunMapper.insertSelective(d);
+				return TChangeDunMapper.insertSelective(d);
 			}
 
 			@Override
 			public int deleteChangeTask(Integer id) {
-				return tChanggeTaskMapper.deleteByPrimaryKey(id);
+				return TChangeTaskMapper.deleteByPrimaryKey(id);
 			}
 
 			@Override
 			public int deleteChangeDun(Integer id) {
-				return tChanggeDunMapper.deleteByPrimaryKey(id);
+				return TChangeDunMapper.deleteByPrimaryKey(id);
 			}
 
 			@Override
-			public List<TChanggeTaskOut> selectChangeTask(Integer cid) {
-				return tChanggeTaskMapper.selectByCid(cid);
+			public List<TChangeTaskOut> selectChangeTask(Integer cid) {
+				return TChangeTaskMapper.selectByCid(cid);
 			}
 
 			@Override
-			public List<TChanggeDunOut> selectChangeDun(Integer cid) {
-				return tChanggeDunMapper.selectByCid(cid);
+			public List<TChangeDunOut> selectChangeDun(Integer cid) {
+				return TChangeDunMapper.selectByCid(cid);
 			}