瀏覽代碼

变更催款与变更项目新增

Signed-off-by: anderx <312518615@qq.com>
anderx 6 年之前
父節點
當前提交
66cb34ebd0

+ 1 - 1
GeneratorConfig.xml

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

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

@@ -0,0 +1,79 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TChanggeDun;
+import com.goafanti.common.model.TChanggeDunExample;
+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<TChanggeDun> selectByCid(Integer id);
+}

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

@@ -0,0 +1,79 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TChanggeTask;
+import com.goafanti.common.model.TChanggeTaskExample;
+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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 CST 2020
+	 */
+	int updateByPrimaryKey(TChanggeTask record);
+
+	void insertSelectiveList(@Param("list")List<TChanggeTask> list);
+
+	List<TChanggeTask> selectByCid(Integer id);
+}

+ 1 - 1
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -640,7 +640,7 @@ select
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-	a.cw_remarks cwRemarks from new_order_change a where 1 = 1
+	a.cw_remarks cwRemarks from new_order_change a where 1 = 1 and status!=4
 	and a.order_no= #{orderNo}
 	order by a.create_time desc
 	limit 1

+ 469 - 0
src/main/java/com/goafanti/common/mapper/TChanggeDunMapper.xml

@@ -0,0 +1,469 @@
+<?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">
+    <!--
+      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.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="did" jdbcType="INTEGER" property="did" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="project_type" jdbcType="INTEGER" property="projectType" />
+    <result column="dun_type" jdbcType="INTEGER" property="dunType" />
+    <result column="wait_day" jdbcType="INTEGER" property="waitDay" />
+    <result column="effective_count" jdbcType="INTEGER" property="effectiveCount" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="money" jdbcType="DECIMAL" property="money" />
+    <result column="appropriation_ratio" jdbcType="DECIMAL" property="appropriationRatio" />
+  </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.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:25 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
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TChanggeDunExample" 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.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_changge_dun
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_changge_dun
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+    -->
+    delete from t_changge_dun
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChanggeDunExample">
+    <!--
+      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.
+    -->
+    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">
+    <!--
+      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.
+    -->
+    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
+      )
+    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}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TChanggeDun">
+    <!--
+      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.
+    -->
+    insert into t_changge_dun
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="did != null">
+        did,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="projectType != null">
+        project_type,
+      </if>
+      <if test="dunType != null">
+        dun_type,
+      </if>
+      <if test="waitDay != null">
+        wait_day,
+      </if>
+      <if test="effectiveCount != null">
+        effective_count,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="money != null">
+        money,
+      </if>
+      <if test="appropriationRatio != null">
+        appropriation_ratio,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="did != null">
+        #{did,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="projectType != null">
+        #{projectType,jdbcType=INTEGER},
+      </if>
+      <if test="dunType != null">
+        #{dunType,jdbcType=INTEGER},
+      </if>
+      <if test="waitDay != null">
+        #{waitDay,jdbcType=INTEGER},
+      </if>
+      <if test="effectiveCount != null">
+        #{effectiveCount,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="money != null">
+        #{money,jdbcType=DECIMAL},
+      </if>
+      <if test="appropriationRatio != null">
+        #{appropriationRatio,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TChanggeDunExample" 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.
+    -->
+    select count(*) from t_changge_dun
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+    -->
+    update t_changge_dun
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.did != null">
+        did = #{record.did,jdbcType=INTEGER},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tid != null">
+        tid = #{record.tid,jdbcType=INTEGER},
+      </if>
+      <if test="record.projectType != null">
+        project_type = #{record.projectType,jdbcType=INTEGER},
+      </if>
+      <if test="record.dunType != null">
+        dun_type = #{record.dunType,jdbcType=INTEGER},
+      </if>
+      <if test="record.waitDay != null">
+        wait_day = #{record.waitDay,jdbcType=INTEGER},
+      </if>
+      <if test="record.effectiveCount != null">
+        effective_count = #{record.effectiveCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.money != null">
+        money = #{record.money,jdbcType=DECIMAL},
+      </if>
+      <if test="record.appropriationRatio != null">
+        appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:25 CST 2020.
+    -->
+    update t_changge_dun
+    set id = #{record.id,jdbcType=INTEGER},
+      did = #{record.did,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      tid = #{record.tid,jdbcType=INTEGER},
+      project_type = #{record.projectType,jdbcType=INTEGER},
+      dun_type = #{record.dunType,jdbcType=INTEGER},
+      wait_day = #{record.waitDay,jdbcType=INTEGER},
+      effective_count = #{record.effectiveCount,jdbcType=INTEGER},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      money = #{record.money,jdbcType=DECIMAL},
+      appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChanggeDun">
+    <!--
+      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.
+    -->
+    update t_changge_dun
+    <set>
+      <if test="did != null">
+        did = #{did,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="projectType != null">
+        project_type = #{projectType,jdbcType=INTEGER},
+      </if>
+      <if test="dunType != null">
+        dun_type = #{dunType,jdbcType=INTEGER},
+      </if>
+      <if test="waitDay != null">
+        wait_day = #{waitDay,jdbcType=INTEGER},
+      </if>
+      <if test="effectiveCount != null">
+        effective_count = #{effectiveCount,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="money != null">
+        money = #{money,jdbcType=DECIMAL},
+      </if>
+      <if test="appropriationRatio != null">
+        appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TChanggeDun">
+    <!--
+      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.
+    -->
+    update t_changge_dun
+    set did = #{did,jdbcType=INTEGER},
+      cid = #{cid,jdbcType=INTEGER},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      tid = #{tid,jdbcType=INTEGER},
+      project_type = #{projectType,jdbcType=INTEGER},
+      dun_type = #{dunType,jdbcType=INTEGER},
+      wait_day = #{waitDay,jdbcType=INTEGER},
+      effective_count = #{effectiveCount,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      money = #{money,jdbcType=DECIMAL},
+      appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+   <insert id="insertSelectiveList" parameterType="java.util.List">
+    insert into t_changge_dun (did, cid, 
+      order_no, tid, project_type, 
+      dun_type, wait_day, effective_count, 
+      aid, status, create_time, 
+      start_time, money, appropriation_ratio
+      )values
+      <foreach collection="list" item="item" index= "index" 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}, 
+      #{item.aid,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, now(), 
+      #{item.startTime,jdbcType=TIMESTAMP}, #{item.money,jdbcType=DECIMAL}, #{item.appropriationRatio,jdbcType=DECIMAL}
+      )
+    </foreach>
+  </insert>
+  
+  <select id="selectByCid" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_changge_dun
+    where cid= #{id}
+  </select>
+</mapper>

+ 386 - 0
src/main/java/com/goafanti/common/mapper/TChanggeTaskMapper.xml

@@ -0,0 +1,386 @@
+<?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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
+    <result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
+    <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" />
+  </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:42 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    id, tid, cid, order_no, commodity_id, commodity_name, commodity_quantity, commodity_price, 
+    task_comment, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TChanggeTaskExample" 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:42 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_changge_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_changge_task
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    delete from t_changge_task
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChanggeTaskExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    insert into t_changge_task (id, tid, cid, 
+      order_no, commodity_id, commodity_name, 
+      commodity_quantity, commodity_price, task_comment, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
+      #{orderNo,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
+      #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, #{taskComment,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TChanggeTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    insert into t_changge_task
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="commodityId != null">
+        commodity_id,
+      </if>
+      <if test="commodityName != null">
+        commodity_name,
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity,
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price,
+      </if>
+      <if test="taskComment != null">
+        task_comment,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityPrice != null">
+        #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskComment != null">
+        #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TChanggeTaskExample" 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:42 CST 2020.
+    -->
+    select count(*) from t_changge_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    update t_changge_task
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.tid != null">
+        tid = #{record.tid,jdbcType=INTEGER},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityId != null">
+        commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityName != null">
+        commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityQuantity != null">
+        commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.commodityPrice != null">
+        commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.taskComment != null">
+        task_comment = #{record.taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    update t_changge_task
+    set id = #{record.id,jdbcType=INTEGER},
+      tid = #{record.tid,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      task_comment = #{record.taskComment,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChanggeTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    update t_changge_task
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        commodity_id = #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        commodity_name = #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskComment != null">
+        task_comment = #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TChanggeTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jan 10 14:42:42 CST 2020.
+    -->
+    update t_changge_task
+    set tid = #{tid,jdbcType=INTEGER},
+      cid = #{cid,jdbcType=INTEGER},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      commodity_id = #{commodityId,jdbcType=VARCHAR},
+      commodity_name = #{commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      task_comment = #{taskComment,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <insert id="insertSelectiveList" parameterType="java.util.List">
+    insert into t_changge_task ( tid, cid, 
+      order_no, commodity_id, commodity_name, 
+      commodity_quantity, commodity_price, task_comment, 
+      create_time)
+    values 
+    <foreach collection="list" item="item" index= "index" separator =",">
+      ( #{item.tid,jdbcType=INTEGER}, #{item.cid,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())
+    </foreach>
+  </insert>
+  <select id="selectByCid" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_changge_task
+    where cid= #{id}
+  </select>
+</mapper>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -912,7 +912,8 @@
   	 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}
+  	where a.super_id is null and  a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
+  	
   </select>
   
   

+ 353 - 0
src/main/java/com/goafanti/common/model/TChanggeDun.java

@@ -0,0 +1,353 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TChanggeDun {
+
+	/**
+	 * 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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	private BigDecimal appropriationRatio;
+
+	/**
+	 * 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
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * 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
+	 */
+	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_dun.did
+	 * @return  the value of t_changge_dun.did
+	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 */
+	public Integer getDid() {
+		return did;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setDid(Integer did) {
+		this.did = did;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getCid() {
+		return cid;
+	}
+
+	/**
+	 * 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
+	 */
+	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_dun.order_no
+	 * @return  the value of t_changge_dun.order_no
+	 * @mbg.generated  Fri Jan 10 14:42:25 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_dun.order_no
+	 * @param orderNo  the value for t_changge_dun.order_no
+	 * @mbg.generated  Fri Jan 10 14:42:25 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_dun.tid
+	 * @return  the value of t_changge_dun.tid
+	 * @mbg.generated  Fri Jan 10 14:42:25 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_dun.tid
+	 * @param tid  the value for t_changge_dun.tid
+	 * @mbg.generated  Fri Jan 10 14:42:25 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_dun.project_type
+	 * @return  the value of t_changge_dun.project_type
+	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 */
+	public Integer getProjectType() {
+		return projectType;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setProjectType(Integer projectType) {
+		this.projectType = projectType;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getDunType() {
+		return dunType;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setDunType(Integer dunType) {
+		this.dunType = dunType;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getWaitDay() {
+		return waitDay;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setWaitDay(Integer waitDay) {
+		this.waitDay = waitDay;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getEffectiveCount() {
+		return effectiveCount;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setEffectiveCount(Integer effectiveCount) {
+		this.effectiveCount = effectiveCount;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * 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
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * 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
+	 */
+	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_dun.start_time
+	 * @return  the value of t_changge_dun.start_time
+	 * @mbg.generated  Fri Jan 10 14:42:25 CST 2020
+	 */
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public BigDecimal getMoney() {
+		return money;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setMoney(BigDecimal money) {
+		this.money = money;
+	}
+
+	/**
+	 * 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
+	 */
+	public BigDecimal getAppropriationRatio() {
+		return appropriationRatio;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setAppropriationRatio(BigDecimal appropriationRatio) {
+		this.appropriationRatio = appropriationRatio;
+	}
+}

File diff suppressed because it is too large
+ 1183 - 0
src/main/java/com/goafanti/common/model/TChanggeDunExample.java


+ 238 - 0
src/main/java/com/goafanti/common/model/TChanggeTask.java

@@ -0,0 +1,238 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TChanggeTask {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.id
+	 * @mbg.generated  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 CST 2020
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_id
+	 * @mbg.generated  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 CST 2020
+	 */
+	private Date createTime;
+
+	/**
+	 * 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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.commodity_id
+	 * @return  the value of t_changge_task.commodity_id
+	 * @mbg.generated  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+}

+ 903 - 0
src/main/java/com/goafanti/common/model/TChanggeTaskExample.java

@@ -0,0 +1,903 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TChanggeTaskExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 CST 2020
+	 */
+	public TChanggeTaskExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 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  Fri Jan 10 14:42:42 CST 2020
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(Integer value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(Integer value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(Integer value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(Integer value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(Integer value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<Integer> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<Integer> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(Integer value1, Integer value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidIsNull() {
+			addCriterion("tid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidIsNotNull() {
+			addCriterion("tid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidEqualTo(Integer value) {
+			addCriterion("tid =", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotEqualTo(Integer value) {
+			addCriterion("tid <>", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidGreaterThan(Integer value) {
+			addCriterion("tid >", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidGreaterThanOrEqualTo(Integer value) {
+			addCriterion("tid >=", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidLessThan(Integer value) {
+			addCriterion("tid <", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidLessThanOrEqualTo(Integer value) {
+			addCriterion("tid <=", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidIn(List<Integer> values) {
+			addCriterion("tid in", values, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotIn(List<Integer> values) {
+			addCriterion("tid not in", values, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidBetween(Integer value1, Integer value2) {
+			addCriterion("tid between", value1, value2, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotBetween(Integer value1, Integer value2) {
+			addCriterion("tid not between", value1, value2, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIsNull() {
+			addCriterion("cid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIsNotNull() {
+			addCriterion("cid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidEqualTo(Integer value) {
+			addCriterion("cid =", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotEqualTo(Integer value) {
+			addCriterion("cid <>", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidGreaterThan(Integer value) {
+			addCriterion("cid >", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidGreaterThanOrEqualTo(Integer value) {
+			addCriterion("cid >=", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidLessThan(Integer value) {
+			addCriterion("cid <", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidLessThanOrEqualTo(Integer value) {
+			addCriterion("cid <=", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIn(List<Integer> values) {
+			addCriterion("cid in", values, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotIn(List<Integer> values) {
+			addCriterion("cid not in", values, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidBetween(Integer value1, Integer value2) {
+			addCriterion("cid between", value1, value2, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotBetween(Integer value1, Integer value2) {
+			addCriterion("cid not between", value1, value2, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIsNull() {
+			addCriterion("order_no is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIsNotNull() {
+			addCriterion("order_no is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoEqualTo(String value) {
+			addCriterion("order_no =", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotEqualTo(String value) {
+			addCriterion("order_no <>", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoGreaterThan(String value) {
+			addCriterion("order_no >", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+			addCriterion("order_no >=", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLessThan(String value) {
+			addCriterion("order_no <", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLessThanOrEqualTo(String value) {
+			addCriterion("order_no <=", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLike(String value) {
+			addCriterion("order_no like", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotLike(String value) {
+			addCriterion("order_no not like", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIn(List<String> values) {
+			addCriterion("order_no in", values, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotIn(List<String> values) {
+			addCriterion("order_no not in", values, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoBetween(String value1, String value2) {
+			addCriterion("order_no between", value1, value2, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotBetween(String value1, String value2) {
+			addCriterion("order_no not between", value1, value2, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdIsNull() {
+			addCriterion("commodity_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdIsNotNull() {
+			addCriterion("commodity_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdEqualTo(String value) {
+			addCriterion("commodity_id =", value, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdNotEqualTo(String value) {
+			addCriterion("commodity_id <>", value, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdGreaterThan(String value) {
+			addCriterion("commodity_id >", value, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdGreaterThanOrEqualTo(String value) {
+			addCriterion("commodity_id >=", value, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdLessThan(String value) {
+			addCriterion("commodity_id <", value, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdLessThanOrEqualTo(String value) {
+			addCriterion("commodity_id <=", value, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdLike(String value) {
+			addCriterion("commodity_id like", value, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdNotLike(String value) {
+			addCriterion("commodity_id not like", value, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdIn(List<String> values) {
+			addCriterion("commodity_id in", values, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdNotIn(List<String> values) {
+			addCriterion("commodity_id not in", values, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdBetween(String value1, String value2) {
+			addCriterion("commodity_id between", value1, value2, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityIdNotBetween(String value1, String value2) {
+			addCriterion("commodity_id not between", value1, value2, "commodityId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameIsNull() {
+			addCriterion("commodity_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameIsNotNull() {
+			addCriterion("commodity_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameEqualTo(String value) {
+			addCriterion("commodity_name =", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameNotEqualTo(String value) {
+			addCriterion("commodity_name <>", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameGreaterThan(String value) {
+			addCriterion("commodity_name >", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameGreaterThanOrEqualTo(String value) {
+			addCriterion("commodity_name >=", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameLessThan(String value) {
+			addCriterion("commodity_name <", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameLessThanOrEqualTo(String value) {
+			addCriterion("commodity_name <=", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameLike(String value) {
+			addCriterion("commodity_name like", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameNotLike(String value) {
+			addCriterion("commodity_name not like", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameIn(List<String> values) {
+			addCriterion("commodity_name in", values, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameNotIn(List<String> values) {
+			addCriterion("commodity_name not in", values, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameBetween(String value1, String value2) {
+			addCriterion("commodity_name between", value1, value2, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameNotBetween(String value1, String value2) {
+			addCriterion("commodity_name not between", value1, value2, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityIsNull() {
+			addCriterion("commodity_quantity is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityIsNotNull() {
+			addCriterion("commodity_quantity is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityEqualTo(Integer value) {
+			addCriterion("commodity_quantity =", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityNotEqualTo(Integer value) {
+			addCriterion("commodity_quantity <>", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityGreaterThan(Integer value) {
+			addCriterion("commodity_quantity >", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityGreaterThanOrEqualTo(Integer value) {
+			addCriterion("commodity_quantity >=", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityLessThan(Integer value) {
+			addCriterion("commodity_quantity <", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityLessThanOrEqualTo(Integer value) {
+			addCriterion("commodity_quantity <=", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityIn(List<Integer> values) {
+			addCriterion("commodity_quantity in", values, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityNotIn(List<Integer> values) {
+			addCriterion("commodity_quantity not in", values, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityBetween(Integer value1, Integer value2) {
+			addCriterion("commodity_quantity between", value1, value2, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityNotBetween(Integer value1, Integer value2) {
+			addCriterion("commodity_quantity not between", value1, value2, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceIsNull() {
+			addCriterion("commodity_price is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceIsNotNull() {
+			addCriterion("commodity_price is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceEqualTo(BigDecimal value) {
+			addCriterion("commodity_price =", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceNotEqualTo(BigDecimal value) {
+			addCriterion("commodity_price <>", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceGreaterThan(BigDecimal value) {
+			addCriterion("commodity_price >", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("commodity_price >=", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceLessThan(BigDecimal value) {
+			addCriterion("commodity_price <", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("commodity_price <=", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceIn(List<BigDecimal> values) {
+			addCriterion("commodity_price in", values, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceNotIn(List<BigDecimal> values) {
+			addCriterion("commodity_price not in", values, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("commodity_price between", value1, value2, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("commodity_price not between", value1, value2, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentIsNull() {
+			addCriterion("task_comment is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentIsNotNull() {
+			addCriterion("task_comment is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentEqualTo(String value) {
+			addCriterion("task_comment =", value, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentNotEqualTo(String value) {
+			addCriterion("task_comment <>", value, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentGreaterThan(String value) {
+			addCriterion("task_comment >", value, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentGreaterThanOrEqualTo(String value) {
+			addCriterion("task_comment >=", value, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentLessThan(String value) {
+			addCriterion("task_comment <", value, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentLessThanOrEqualTo(String value) {
+			addCriterion("task_comment <=", value, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentLike(String value) {
+			addCriterion("task_comment like", value, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentNotLike(String value) {
+			addCriterion("task_comment not like", value, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentIn(List<String> values) {
+			addCriterion("task_comment in", values, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentNotIn(List<String> values) {
+			addCriterion("task_comment not in", values, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentBetween(String value1, String value2) {
+			addCriterion("task_comment between", value1, value2, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskCommentNotBetween(String value1, String value2) {
+			addCriterion("task_comment not between", value1, value2, "taskComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNull() {
+			addCriterion("create_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNotNull() {
+			addCriterion("create_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeEqualTo(Date value) {
+			addCriterion("create_time =", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotEqualTo(Date value) {
+			addCriterion("create_time <>", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThan(Date value) {
+			addCriterion("create_time >", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("create_time >=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThan(Date value) {
+			addCriterion("create_time <", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+			addCriterion("create_time <=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIn(List<Date> values) {
+			addCriterion("create_time in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotIn(List<Date> values) {
+			addCriterion("create_time not in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
+			addCriterion("create_time between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+			addCriterion("create_time not between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_changge_task
+	 * @mbg.generated  Fri Jan 10 14:42:42 CST 2020
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table t_changge_task
+     *
+     * @mbg.generated do_not_delete_during_merge Fri Jan 10 14:30:20 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

+ 4 - 4
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -671,13 +671,13 @@ public class AdminOrderApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 发起订单变更
+	 * 发起订单变更(作废)
 	 * @param orderNo
 	 * @param changeComment
 	 * @return
 	 */
-	@RequestMapping(value = "/addOrderChange",method = RequestMethod.POST)
-	public Result addOrderChange(String orderNo,String changeComment){
+	@RequestMapping(value = "/taddOrderChange",method = RequestMethod.POST)
+	public Result addOrderChange(String orderNo,String changeComment,String taskList,String dunList){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
@@ -687,7 +687,7 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更说明"));
 			return res;
 		}
-		orderServiceImpl.addOrderChange(orderNo,changeComment);
+		orderServiceImpl.addOrderChange(orderNo,changeComment,taskList,dunList);
 		return res;
 	}
 	

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

@@ -15,16 +15,19 @@ 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.utils.StringUtils;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
 @RestController
-@RequestMapping(value = "/api/admin/orderChange")
+@RequestMapping(value = "/open/admin/orderChange")
 public class OrderChangeApiController extends CertifyApiController {
 	
 	@Autowired
 	private OrderChangeService	orderChangeService;
+	@Autowired
 	
 	
 	/**
@@ -44,6 +47,70 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.setData(orderChangeService.addOrderChange(t,startRemarks));
 		return res;
 	}
+	
+	@RequestMapping(value = "/addChangeTask", method = RequestMethod.GET)
+	public Result addChangeTask(TChanggeTask t){
+		Result res = new Result();
+		if(StringUtils.isBlank(t.getCommodityId())){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目"));
+			return res;
+		}
+		if(null==t.getCommodityPrice()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目金额"));
+			return res;
+		}
+		if(null==t.getCommodityQuantity()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目数量"));
+			return res;
+		}
+		if(StringUtils.isBlank(t.getOrderNo())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		
+		res.setData(orderChangeService.addChangeTask(t));
+		return res;
+	}
+	@RequestMapping(value = "/addChangeDun", method = RequestMethod.GET)
+	public Result addChangeDun(TChanggeDun d){
+		Result res = new Result();
+		if(StringUtils.isBlank(d.getOrderNo())||null==d.getTid()) {
+			res.getError().add(buildError("", "订单编号与项目编号必须指定"));
+			return res;
+		}
+		if(null==d.getProjectType()||null==d.getDunType()) {
+			res.getError().add(buildError("", "项目分类和催款分类必须指定"));
+			return res;
+		}
+		res.setData(orderChangeService.addChangeDun(d));
+		return res;
+	}
+	/**
+	 *    查看变更项目
+	 */
+	@RequestMapping(value = "/changeTasklist", method = RequestMethod.GET)
+	public Result changeTasklist(Integer id){
+		Result res = new Result();
+		if(null==id){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "变更id"));
+			return res;
+		}
+		res.setData(orderChangeService.changeTasklist( id));
+		return res;
+	}
+	/**
+	 *    查看变更催款
+	 */
+	@RequestMapping(value = "/changeDunlist", method = RequestMethod.GET)
+	public Result changeDunlist(Integer id){
+		Result res = new Result();
+		if(null==id){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "变更id"));
+			return res;
+		}
+		res.setData(orderChangeService.changeDunlist( id));
+		return res;
+	}
 	/**
 	 *    订单查看变更详情
 	 */

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

@@ -7,6 +7,8 @@ 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.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
@@ -46,6 +48,15 @@ public interface OrderChangeService {
 			String startTime, String endTime, String depId, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
 			Integer pageNo) throws IOException ;
 
+	List<TChanggeTask> changeTasklist(Integer id);
+
+	List<TChanggeDun> changeDunlist(Integer id);
+
+	int addChangeTask(TChanggeTask t);
+
+	int addChangeDun(TChanggeDun d);
+
+
 	
 
 

+ 3 - 1
src/main/java/com/goafanti/order/service/OrderService.java

@@ -452,9 +452,11 @@ public interface OrderService {
 	 * 添加变更记录
 	 * @param orderNo
 	 * @param changeComment
+	 * @param dunList 
+	 * @param taskList 
 	 * @return
 	 */
-	int addOrderChange(String orderNo, String changeComment);
+	int addOrderChange(String orderNo, String changeComment, String taskList, String dunList);
 
 	/**
 	 * 查看变更记录列表

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

@@ -20,6 +20,9 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.OrderExamineBo;
@@ -30,6 +33,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.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderDunMapper;
 import com.goafanti.common.dao.TOrderInvoiceMapper;
@@ -41,6 +46,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.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.Admin;
@@ -65,6 +72,8 @@ import com.goafanti.order.enums.OrderType;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 @Service
 public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
 	@Autowired
@@ -99,7 +108,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	private AdminMapper	adminMapper;
 	@Autowired
 	private OrderNewService	orderNewService;
-	
+	@Autowired
+	private TChanggeTaskMapper	tChanggeTaskMapper;
+	@Autowired
+	private TChanggeDunMapper	tChanggeDunMapper;
 	
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
@@ -593,6 +605,28 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				      return str + num;
 				    }
 			}
+
+			@Override
+			public List<TChanggeTask> changeTasklist(Integer id) {
+				List<TChanggeTask> list=tChanggeTaskMapper.selectByCid(id);
+				return list;
+			}
+
+			@Override
+			public List<TChanggeDun> changeDunlist(Integer id) {
+				List<TChanggeDun> list=tChanggeDunMapper.selectByCid(id);
+				return list;
+			}
+
+			@Override
+			public int addChangeTask(TChanggeTask t) {
+				return tChanggeTaskMapper.insertSelective(t);
+			}
+
+			@Override
+			public int addChangeDun(TChanggeDun d) {
+				return tChanggeDunMapper.insertSelective(d);
+			}
 		
 
 }

+ 4 - 2
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -1887,14 +1888,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	@Transactional
-	public int addOrderChange(String orderNo, String changeComment) {
+	public int addOrderChange(String orderNo, String changeComment,String taskList,String dunList) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		tOrder.setChangeStatus(ChangeState.CHANGING.getCode());
 		TOrderChange change = new TOrderChange();
 		change.setCreaterId(TokenManager.getAdminId());
 		change.setCreateTime(new Date());
 		change.setOrderNo(orderNo);
-		change.setId(UUID.randomUUID().toString());
+		String id=UUID.randomUUID().toString();
+		change.setId(id);
 		change.setChangeComment(changeComment);
 		change.setChangeStatus(ChangeState.CHANGING.getCode());
 		change.setDeleteSign(DeleteStatus.UNDELETE.getCode());