Browse Source

项目任务修改开发

anderx 6 years ago
parent
commit
1074e0a83c

+ 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="t_order_invoice"/>
+    <table schema="aft" tableName="t_order_task"/>
   </context>
 </generatorConfiguration>

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

@@ -11,85 +11,85 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	long countByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int deleteByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	List<TOrderTask> selectByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 96 - 0
src/main/java/com/goafanti/common/dao/TaskLogMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TaskLog;
+import com.goafanti.common.model.TaskLogExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TaskLogMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    long countByExample(TaskLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    int deleteByExample(TaskLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    int insert(TaskLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    int insertSelective(TaskLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    List<TaskLog> selectByExample(TaskLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    TaskLog selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    int updateByExampleSelective(@Param("record") TaskLog record, @Param("example") TaskLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    int updateByExample(@Param("record") TaskLog record, @Param("example") TaskLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    int updateByPrimaryKeySelective(TaskLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    int updateByPrimaryKey(TaskLog record);
+}

+ 96 - 0
src/main/java/com/goafanti/common/dao/TaskProgressMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TaskProgress;
+import com.goafanti.common.model.TaskProgressExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TaskProgressMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    long countByExample(TaskProgressExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    int deleteByExample(TaskProgressExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    int insert(TaskProgress record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    int insertSelective(TaskProgress record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    List<TaskProgress> selectByExample(TaskProgressExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    TaskProgress selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    int updateByExampleSelective(@Param("record") TaskProgress record, @Param("example") TaskProgressExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    int updateByExample(@Param("record") TaskProgress record, @Param("example") TaskProgressExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    int updateByPrimaryKeySelective(TaskProgress record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    int updateByPrimaryKey(TaskProgress record);
+}

+ 174 - 35
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -29,12 +29,20 @@
     <result column="publicity_time" jdbcType="DATE" property="publicityTime" />
     <result column="licence_time" jdbcType="DATE" property="licenceTime" />
     <result column="certificate_number" jdbcType="VARCHAR" property="certificateNumber" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="form_retrieve" jdbcType="INTEGER" property="formRetrieve" />
+    <result column="declare_user" jdbcType="VARCHAR" property="declareUser" />
+    <result column="declare_pwd" jdbcType="VARCHAR" property="declarePwd" />
+    <result column="task_refund" jdbcType="INTEGER" property="taskRefund" />
+    <result column="refund_content" jdbcType="VARCHAR" property="refundContent" />
+    <result column="set_up_amount" jdbcType="DECIMAL" property="setUpAmount" />
+    <result column="arrival_money" jdbcType="INTEGER" property="arrivalMoney" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -42,7 +50,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -76,7 +84,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -110,18 +118,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
     task_comment, task_start_time, task_end_time, project_status, accept_time, review_time, 
-    publicity_time, licence_time, certificate_number
+    publicity_time, licence_time, certificate_number, status, form_retrieve, declare_user, 
+    declare_pwd, task_refund, refund_content, set_up_amount, arrival_money
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     attachment_url
   </sql>
@@ -129,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     select
     <if test="distinct">
@@ -150,7 +159,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     select
     <if test="distinct">
@@ -169,7 +178,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -182,7 +191,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -191,7 +200,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -202,7 +211,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -211,7 +220,10 @@
       task_receiver, task_comment, task_start_time, 
       task_end_time, project_status, accept_time, 
       review_time, publicity_time, licence_time, 
-      certificate_number, attachment_url)
+      certificate_number, status, form_retrieve, 
+      declare_user, declare_pwd, task_refund, 
+      refund_content, set_up_amount, arrival_money, 
+      attachment_url)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, 
       #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
       #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, 
@@ -219,13 +231,16 @@
       #{taskReceiver,jdbcType=VARCHAR}, #{taskComment,jdbcType=VARCHAR}, #{taskStartTime,jdbcType=TIMESTAMP}, 
       #{taskEndTime,jdbcType=TIMESTAMP}, #{projectStatus,jdbcType=INTEGER}, #{acceptTime,jdbcType=DATE}, 
       #{reviewTime,jdbcType=DATE}, #{publicityTime,jdbcType=DATE}, #{licenceTime,jdbcType=DATE}, 
-      #{certificateNumber,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{certificateNumber,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{formRetrieve,jdbcType=INTEGER}, 
+      #{declareUser,jdbcType=VARCHAR}, #{declarePwd,jdbcType=VARCHAR}, #{taskRefund,jdbcType=INTEGER}, 
+      #{refundContent,jdbcType=VARCHAR}, #{setUpAmount,jdbcType=DECIMAL}, #{arrivalMoney,jdbcType=INTEGER}, 
+      #{attachmentUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -295,6 +310,30 @@
       <if test="certificateNumber != null">
         certificate_number,
       </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="formRetrieve != null">
+        form_retrieve,
+      </if>
+      <if test="declareUser != null">
+        declare_user,
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd,
+      </if>
+      <if test="taskRefund != null">
+        task_refund,
+      </if>
+      <if test="refundContent != null">
+        refund_content,
+      </if>
+      <if test="setUpAmount != null">
+        set_up_amount,
+      </if>
+      <if test="arrivalMoney != null">
+        arrival_money,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -366,6 +405,30 @@
       <if test="certificateNumber != null">
         #{certificateNumber,jdbcType=VARCHAR},
       </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="formRetrieve != null">
+        #{formRetrieve,jdbcType=INTEGER},
+      </if>
+      <if test="declareUser != null">
+        #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        #{declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="taskRefund != null">
+        #{taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="refundContent != null">
+        #{refundContent,jdbcType=VARCHAR},
+      </if>
+      <if test="setUpAmount != null">
+        #{setUpAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="arrivalMoney != null">
+        #{arrivalMoney,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -375,7 +438,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -386,7 +449,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     update t_order_task
     <set>
@@ -456,6 +519,30 @@
       <if test="record.certificateNumber != null">
         certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
       </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.formRetrieve != null">
+        form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
+      </if>
+      <if test="record.declareUser != null">
+        declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.declarePwd != null">
+        declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskRefund != null">
+        task_refund = #{record.taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="record.refundContent != null">
+        refund_content = #{record.refundContent,jdbcType=VARCHAR},
+      </if>
+      <if test="record.setUpAmount != null">
+        set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.arrivalMoney != null">
+        arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -468,7 +555,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -493,6 +580,14 @@
       publicity_time = #{record.publicityTime,jdbcType=DATE},
       licence_time = #{record.licenceTime,jdbcType=DATE},
       certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
+      declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
+      task_refund = #{record.taskRefund,jdbcType=INTEGER},
+      refund_content = #{record.refundContent,jdbcType=VARCHAR},
+      set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
+      arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -502,7 +597,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -526,7 +621,15 @@
       review_time = #{record.reviewTime,jdbcType=DATE},
       publicity_time = #{record.publicityTime,jdbcType=DATE},
       licence_time = #{record.licenceTime,jdbcType=DATE},
-      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR}
+      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
+      declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
+      task_refund = #{record.taskRefund,jdbcType=INTEGER},
+      refund_content = #{record.refundContent,jdbcType=VARCHAR},
+      set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
+      arrival_money = #{record.arrivalMoney,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -535,7 +638,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     update t_order_task
     <set>
@@ -602,12 +705,33 @@
       <if test="certificateNumber != null">
         certificate_number = #{certificateNumber,jdbcType=VARCHAR},
       </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="formRetrieve != null">
+        form_retrieve = #{formRetrieve,jdbcType=INTEGER},
+      </if>
+      <if test="declareUser != null">
+        declare_user = #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="taskRefund != null">
+        task_refund = #{taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="refundContent != null">
+        refund_content = #{refundContent,jdbcType=VARCHAR},
+      </if>
+      <if test="setUpAmount != null">
+        set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="arrivalMoney != null">
+        arrival_money = #{arrivalMoney,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
-      <if test="certificateNumber != null">
-        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -615,7 +739,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -639,6 +763,14 @@
       publicity_time = #{publicityTime,jdbcType=DATE},
       licence_time = #{licenceTime,jdbcType=DATE},
       certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      form_retrieve = #{formRetrieve,jdbcType=INTEGER},
+      declare_user = #{declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      task_refund = #{taskRefund,jdbcType=INTEGER},
+      refund_content = #{refundContent,jdbcType=VARCHAR},
+      set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
+      arrival_money = #{arrivalMoney,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -646,7 +778,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Mon Jun 03 14:30:20 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -669,7 +801,15 @@
       review_time = #{reviewTime,jdbcType=DATE},
       publicity_time = #{publicityTime,jdbcType=DATE},
       licence_time = #{licenceTime,jdbcType=DATE},
-      certificate_number = #{certificateNumber,jdbcType=VARCHAR}
+      certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      form_retrieve = #{formRetrieve,jdbcType=INTEGER},
+      declare_user = #{declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      task_refund = #{taskRefund,jdbcType=INTEGER},
+      refund_content = #{refundContent,jdbcType=VARCHAR},
+      set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
+      arrival_money = #{arrivalMoney,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
@@ -697,11 +837,9 @@
     where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    and a.commodity_quantity =1
     </if>
     <if test="specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    and a.super_id is null
     </if>
     <if test="specially == 2">
     and d.superior_id= (select department_id from admin where  id= #{aid,jdbcType=VARCHAR})
@@ -743,11 +881,9 @@
     where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    and a.commodity_quantity =1
     </if>
     <if test="specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    and a.super_id is null
     </if>
     <if test="specially == 2">
     and d.superior_id= (select department_id from admin where  id= #{aid,jdbcType=VARCHAR})
@@ -775,11 +911,13 @@
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-  select  
+select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,
     a.project_status as projectStatus,a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,
-	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.certificate_number as certificateNumber,
-	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,
+	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,
+	a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,
+	a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,
+	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
 	e.contacts ,e.contact_mobile as contactMobile ,e.legal_person as legalPerson,e.legal_person_tel as legalPersonTel
@@ -787,6 +925,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id
     left join t_order_new e on a.order_no=e.order_no
+    left join department h on e.order_dep=h.id
     left join user f on e.buyer_id=f.id
     left join admin g on e.salesman_id=g.id
     where a.id= #{id,jdbcType=VARCHAR}

+ 271 - 0
src/main/java/com/goafanti/common/mapper/TaskLogMapper.xml

@@ -0,0 +1,271 @@
+<?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.TaskLogMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="task_id" jdbcType="INTEGER" property="taskId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    <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 Mon Jun 03 11:03:37 CST 2019.
+    -->
+    <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 Mon Jun 03 11:03:37 CST 2019.
+    -->
+    id, content, create_time, task_id
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TaskLogExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from task_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from task_log
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    delete from task_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TaskLogExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    delete from task_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    insert into task_log (id, content, create_time, 
+      task_id)
+    values (#{id,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{taskId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    insert into task_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TaskLogExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    select count(*) from task_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    update task_log
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.content != null">
+        content = #{record.content,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=INTEGER},
+      </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 Mon Jun 03 11:03:37 CST 2019.
+    -->
+    update task_log
+    set id = #{record.id,jdbcType=INTEGER},
+      content = #{record.content,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    update task_log
+    <set>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+    -->
+    update task_log
+    set content = #{content,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 286 - 0
src/main/java/com/goafanti/common/mapper/TaskProgressMapper.xml

@@ -0,0 +1,286 @@
+<?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.TaskProgressMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="Number" jdbcType="INTEGER" property="number" />
+    <result column="licence_time" jdbcType="TIMESTAMP" property="licenceTime" />
+    <result column="task_id" jdbcType="INTEGER" property="taskId" />
+    <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 Mon Jun 03 11:03:50 CST 2019.
+    -->
+    <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 Mon Jun 03 11:03:50 CST 2019.
+    -->
+    <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 Mon Jun 03 11:03:50 CST 2019.
+    -->
+    id, Number, licence_time, task_id, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TaskProgressExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from task_progress
+    <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 Mon Jun 03 11:03:50 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from task_progress
+    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 Mon Jun 03 11:03:50 CST 2019.
+    -->
+    delete from task_progress
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TaskProgressExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    delete from task_progress
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    insert into task_progress (id, Number, licence_time, 
+      task_id, create_time)
+    values (#{id,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{licenceTime,jdbcType=TIMESTAMP}, 
+      #{taskId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    insert into task_progress
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="number != null">
+        Number,
+      </if>
+      <if test="licenceTime != null">
+        licence_time,
+      </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=INTEGER},
+      </if>
+      <if test="licenceTime != null">
+        #{licenceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TaskProgressExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    select count(*) from task_progress
+    <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 Mon Jun 03 11:03:50 CST 2019.
+    -->
+    update task_progress
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.number != null">
+        Number = #{record.number,jdbcType=INTEGER},
+      </if>
+      <if test="record.licenceTime != null">
+        licence_time = #{record.licenceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    update task_progress
+    set id = #{record.id,jdbcType=INTEGER},
+      Number = #{record.number,jdbcType=INTEGER},
+      licence_time = #{record.licenceTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    update task_progress
+    <set>
+      <if test="number != null">
+        Number = #{number,jdbcType=INTEGER},
+      </if>
+      <if test="licenceTime != null">
+        licence_time = #{licenceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+    -->
+    update task_progress
+    set Number = #{number,jdbcType=INTEGER},
+      licence_time = #{licenceTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

File diff suppressed because it is too large
+ 665 - 653
src/main/java/com/goafanti/common/model/TOrderTask.java


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

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public TOrderTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1600,11 +1600,521 @@ public class TOrderTaskExample {
 			addCriterion("certificate_number not between", value1, value2, "certificateNumber");
 			return (Criteria) this;
 		}
+
+		public Criteria andStatusIsNull() {
+			addCriterion("status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIsNotNull() {
+			addCriterion("status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusEqualTo(Integer value) {
+			addCriterion("status =", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotEqualTo(Integer value) {
+			addCriterion("status <>", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThan(Integer value) {
+			addCriterion("status >", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("status >=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThan(Integer value) {
+			addCriterion("status <", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("status <=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIn(List<Integer> values) {
+			addCriterion("status in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotIn(List<Integer> values) {
+			addCriterion("status not in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusBetween(Integer value1, Integer value2) {
+			addCriterion("status between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("status not between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveIsNull() {
+			addCriterion("form_retrieve is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveIsNotNull() {
+			addCriterion("form_retrieve is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveEqualTo(Integer value) {
+			addCriterion("form_retrieve =", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveNotEqualTo(Integer value) {
+			addCriterion("form_retrieve <>", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveGreaterThan(Integer value) {
+			addCriterion("form_retrieve >", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveGreaterThanOrEqualTo(Integer value) {
+			addCriterion("form_retrieve >=", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveLessThan(Integer value) {
+			addCriterion("form_retrieve <", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveLessThanOrEqualTo(Integer value) {
+			addCriterion("form_retrieve <=", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveIn(List<Integer> values) {
+			addCriterion("form_retrieve in", values, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveNotIn(List<Integer> values) {
+			addCriterion("form_retrieve not in", values, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveBetween(Integer value1, Integer value2) {
+			addCriterion("form_retrieve between", value1, value2, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveNotBetween(Integer value1, Integer value2) {
+			addCriterion("form_retrieve not between", value1, value2, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserIsNull() {
+			addCriterion("declare_user is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserIsNotNull() {
+			addCriterion("declare_user is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserEqualTo(String value) {
+			addCriterion("declare_user =", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserNotEqualTo(String value) {
+			addCriterion("declare_user <>", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserGreaterThan(String value) {
+			addCriterion("declare_user >", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserGreaterThanOrEqualTo(String value) {
+			addCriterion("declare_user >=", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserLessThan(String value) {
+			addCriterion("declare_user <", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserLessThanOrEqualTo(String value) {
+			addCriterion("declare_user <=", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserLike(String value) {
+			addCriterion("declare_user like", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserNotLike(String value) {
+			addCriterion("declare_user not like", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserIn(List<String> values) {
+			addCriterion("declare_user in", values, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserNotIn(List<String> values) {
+			addCriterion("declare_user not in", values, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserBetween(String value1, String value2) {
+			addCriterion("declare_user between", value1, value2, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserNotBetween(String value1, String value2) {
+			addCriterion("declare_user not between", value1, value2, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIsNull() {
+			addCriterion("declare_pwd is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIsNotNull() {
+			addCriterion("declare_pwd is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdEqualTo(String value) {
+			addCriterion("declare_pwd =", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotEqualTo(String value) {
+			addCriterion("declare_pwd <>", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdGreaterThan(String value) {
+			addCriterion("declare_pwd >", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdGreaterThanOrEqualTo(String value) {
+			addCriterion("declare_pwd >=", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLessThan(String value) {
+			addCriterion("declare_pwd <", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLessThanOrEqualTo(String value) {
+			addCriterion("declare_pwd <=", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLike(String value) {
+			addCriterion("declare_pwd like", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotLike(String value) {
+			addCriterion("declare_pwd not like", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIn(List<String> values) {
+			addCriterion("declare_pwd in", values, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotIn(List<String> values) {
+			addCriterion("declare_pwd not in", values, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdBetween(String value1, String value2) {
+			addCriterion("declare_pwd between", value1, value2, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotBetween(String value1, String value2) {
+			addCriterion("declare_pwd not between", value1, value2, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundIsNull() {
+			addCriterion("task_refund is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundIsNotNull() {
+			addCriterion("task_refund is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundEqualTo(Integer value) {
+			addCriterion("task_refund =", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundNotEqualTo(Integer value) {
+			addCriterion("task_refund <>", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundGreaterThan(Integer value) {
+			addCriterion("task_refund >", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundGreaterThanOrEqualTo(Integer value) {
+			addCriterion("task_refund >=", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundLessThan(Integer value) {
+			addCriterion("task_refund <", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundLessThanOrEqualTo(Integer value) {
+			addCriterion("task_refund <=", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundIn(List<Integer> values) {
+			addCriterion("task_refund in", values, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundNotIn(List<Integer> values) {
+			addCriterion("task_refund not in", values, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundBetween(Integer value1, Integer value2) {
+			addCriterion("task_refund between", value1, value2, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundNotBetween(Integer value1, Integer value2) {
+			addCriterion("task_refund not between", value1, value2, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentIsNull() {
+			addCriterion("refund_content is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentIsNotNull() {
+			addCriterion("refund_content is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentEqualTo(String value) {
+			addCriterion("refund_content =", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentNotEqualTo(String value) {
+			addCriterion("refund_content <>", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentGreaterThan(String value) {
+			addCriterion("refund_content >", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentGreaterThanOrEqualTo(String value) {
+			addCriterion("refund_content >=", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentLessThan(String value) {
+			addCriterion("refund_content <", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentLessThanOrEqualTo(String value) {
+			addCriterion("refund_content <=", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentLike(String value) {
+			addCriterion("refund_content like", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentNotLike(String value) {
+			addCriterion("refund_content not like", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentIn(List<String> values) {
+			addCriterion("refund_content in", values, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentNotIn(List<String> values) {
+			addCriterion("refund_content not in", values, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentBetween(String value1, String value2) {
+			addCriterion("refund_content between", value1, value2, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentNotBetween(String value1, String value2) {
+			addCriterion("refund_content not between", value1, value2, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountIsNull() {
+			addCriterion("set_up_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountIsNotNull() {
+			addCriterion("set_up_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountEqualTo(BigDecimal value) {
+			addCriterion("set_up_amount =", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountNotEqualTo(BigDecimal value) {
+			addCriterion("set_up_amount <>", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountGreaterThan(BigDecimal value) {
+			addCriterion("set_up_amount >", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("set_up_amount >=", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountLessThan(BigDecimal value) {
+			addCriterion("set_up_amount <", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("set_up_amount <=", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountIn(List<BigDecimal> values) {
+			addCriterion("set_up_amount in", values, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountNotIn(List<BigDecimal> values) {
+			addCriterion("set_up_amount not in", values, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("set_up_amount between", value1, value2, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("set_up_amount not between", value1, value2, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyIsNull() {
+			addCriterion("arrival_money is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyIsNotNull() {
+			addCriterion("arrival_money is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyEqualTo(Integer value) {
+			addCriterion("arrival_money =", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyNotEqualTo(Integer value) {
+			addCriterion("arrival_money <>", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyGreaterThan(Integer value) {
+			addCriterion("arrival_money >", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyGreaterThanOrEqualTo(Integer value) {
+			addCriterion("arrival_money >=", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyLessThan(Integer value) {
+			addCriterion("arrival_money <", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyLessThanOrEqualTo(Integer value) {
+			addCriterion("arrival_money <=", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyIn(List<Integer> values) {
+			addCriterion("arrival_money in", values, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyNotIn(List<Integer> values) {
+			addCriterion("arrival_money not in", values, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyBetween(Integer value1, Integer value2) {
+			addCriterion("arrival_money between", value1, value2, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyNotBetween(Integer value1, Integer value2) {
+			addCriterion("arrival_money not between", value1, value2, "arrivalMoney");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 137 - 0
src/main/java/com/goafanti/common/model/TaskLog.java

@@ -0,0 +1,137 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class TaskLog {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_log.id
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_log.content
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    private String content;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_log.create_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_log.task_id
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    private Integer taskId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_log.id
+     *
+     * @return the value of task_log.id
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_log.id
+     *
+     * @param id the value for task_log.id
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_log.content
+     *
+     * @return the value of task_log.content
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_log.content
+     *
+     * @param content the value for task_log.content
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_log.create_time
+     *
+     * @return the value of task_log.create_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_log.create_time
+     *
+     * @param createTime the value for task_log.create_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_log.task_id
+     *
+     * @return the value of task_log.task_id
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public Integer getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_log.task_id
+     *
+     * @param taskId the value for task_log.task_id
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public void setTaskId(Integer taskId) {
+        this.taskId = taskId;
+    }
+}

+ 553 - 0
src/main/java/com/goafanti/common/model/TaskLogExample.java

@@ -0,0 +1,553 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TaskLogExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public TaskLogExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    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 task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    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 task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    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 andContentIsNull() {
+            addCriterion("content is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNotNull() {
+            addCriterion("content is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentEqualTo(String value) {
+            addCriterion("content =", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotEqualTo(String value) {
+            addCriterion("content <>", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThan(String value) {
+            addCriterion("content >", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThanOrEqualTo(String value) {
+            addCriterion("content >=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThan(String value) {
+            addCriterion("content <", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThanOrEqualTo(String value) {
+            addCriterion("content <=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLike(String value) {
+            addCriterion("content like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotLike(String value) {
+            addCriterion("content not like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIn(List<String> values) {
+            addCriterion("content in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotIn(List<String> values) {
+            addCriterion("content not in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentBetween(String value1, String value2) {
+            addCriterion("content between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotBetween(String value1, String value2) {
+            addCriterion("content not between", value1, value2, "content");
+            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;
+        }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(Integer value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(Integer value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(Integer value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(Integer value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(Integer value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<Integer> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<Integer> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(Integer value1, Integer value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_log
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Jun 03 11:03:37 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_log
+     *
+     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
+     */
+    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);
+        }
+    }
+}

+ 170 - 0
src/main/java/com/goafanti/common/model/TaskProgress.java

@@ -0,0 +1,170 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class TaskProgress {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_progress.id
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_progress.Number
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    private Integer number;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_progress.licence_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    private Date licenceTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_progress.task_id
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    private Integer taskId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_progress.create_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_progress.id
+     *
+     * @return the value of task_progress.id
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_progress.id
+     *
+     * @param id the value for task_progress.id
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_progress.Number
+     *
+     * @return the value of task_progress.Number
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public Integer getNumber() {
+        return number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_progress.Number
+     *
+     * @param number the value for task_progress.Number
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_progress.licence_time
+     *
+     * @return the value of task_progress.licence_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public Date getLicenceTime() {
+        return licenceTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_progress.licence_time
+     *
+     * @param licenceTime the value for task_progress.licence_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void setLicenceTime(Date licenceTime) {
+        this.licenceTime = licenceTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_progress.task_id
+     *
+     * @return the value of task_progress.task_id
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public Integer getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_progress.task_id
+     *
+     * @param taskId the value for task_progress.task_id
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void setTaskId(Integer taskId) {
+        this.taskId = taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_progress.create_time
+     *
+     * @return the value of task_progress.create_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_progress.create_time
+     *
+     * @param createTime the value for task_progress.create_time
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 603 - 0
src/main/java/com/goafanti/common/model/TaskProgressExample.java

@@ -0,0 +1,603 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TaskProgressExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public TaskProgressExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    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 task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    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 task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    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 andNumberIsNull() {
+            addCriterion("Number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNotNull() {
+            addCriterion("Number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberEqualTo(Integer value) {
+            addCriterion("Number =", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotEqualTo(Integer value) {
+            addCriterion("Number <>", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThan(Integer value) {
+            addCriterion("Number >", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThanOrEqualTo(Integer value) {
+            addCriterion("Number >=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThan(Integer value) {
+            addCriterion("Number <", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThanOrEqualTo(Integer value) {
+            addCriterion("Number <=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIn(List<Integer> values) {
+            addCriterion("Number in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotIn(List<Integer> values) {
+            addCriterion("Number not in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberBetween(Integer value1, Integer value2) {
+            addCriterion("Number between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotBetween(Integer value1, Integer value2) {
+            addCriterion("Number not between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeIsNull() {
+            addCriterion("licence_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeIsNotNull() {
+            addCriterion("licence_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeEqualTo(Date value) {
+            addCriterion("licence_time =", value, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeNotEqualTo(Date value) {
+            addCriterion("licence_time <>", value, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeGreaterThan(Date value) {
+            addCriterion("licence_time >", value, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("licence_time >=", value, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeLessThan(Date value) {
+            addCriterion("licence_time <", value, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeLessThanOrEqualTo(Date value) {
+            addCriterion("licence_time <=", value, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeIn(List<Date> values) {
+            addCriterion("licence_time in", values, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeNotIn(List<Date> values) {
+            addCriterion("licence_time not in", values, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeBetween(Date value1, Date value2) {
+            addCriterion("licence_time between", value1, value2, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andLicenceTimeNotBetween(Date value1, Date value2) {
+            addCriterion("licence_time not between", value1, value2, "licenceTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(Integer value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(Integer value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(Integer value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(Integer value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(Integer value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<Integer> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<Integer> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(Integer value1, Integer value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            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 task_progress
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Jun 03 11:03:50 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_progress
+     *
+     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
+     */
+    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);
+        }
+    }
+}

+ 88 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -24,8 +24,72 @@ public class TOrderTaskDetailBo {
 	private String legalPerson;
 	private String legalPersonTel;
 	private String certificateNumber;
+	private String contractNo;
+	private String depName;
+	private String setUpAmount;
+	private Integer arrivalMoney;
+	/**
+	 * 任务状态
+	 */
+	private Integer status;
+	/**
+	 * 满意度表格回收
+	 */
+	private Integer formRetrieve;
+	/**
+	 * 任务退单
+	 */
+	private Integer taskRefund;
+	/**
+	 * 退单详情
+	 */
+	private String refundContent;
+	/**
+	 * 申报账号
+	 */
+	private String declareUser;
+	/**
+	 * 申报密码
+	 */
+	private String declarePwd;
 	
 	
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getFormRetrieve() {
+		return formRetrieve;
+	}
+	public void setFormRetrieve(Integer formRetrieve) {
+		this.formRetrieve = formRetrieve;
+	}
+	public Integer getTaskRefund() {
+		return taskRefund;
+	}
+	public void setTaskRefund(Integer taskRefund) {
+		this.taskRefund = taskRefund;
+	}
+	public String getRefundContent() {
+		return refundContent;
+	}
+	public void setRefundContent(String refundContent) {
+		this.refundContent = refundContent;
+	}
+	public String getDeclareUser() {
+		return declareUser;
+	}
+	public void setDeclareUser(String declareUser) {
+		this.declareUser = declareUser;
+	}
+	public String getDeclarePwd() {
+		return declarePwd;
+	}
+	public void setDeclarePwd(String declarePwd) {
+		this.declarePwd = declarePwd;
+	}
 	public String getTaskComment() {
 		return taskComment;
 	}
@@ -165,5 +229,29 @@ public class TOrderTaskDetailBo {
 	public void setCertificateNumber(String certificateNumber) {
 		this.certificateNumber = certificateNumber;
 	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getSetUpAmount() {
+		return setUpAmount;
+	}
+	public void setSetUpAmount(String setUpAmount) {
+		this.setUpAmount = setUpAmount;
+	}
+	public Integer getArrivalMoney() {
+		return arrivalMoney;
+	}
+	public void setArrivalMoney(Integer arrivalMoney) {
+		this.arrivalMoney = arrivalMoney;
+	}
 	
 }

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

@@ -85,21 +85,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}else if (specially==0) {
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode());
 		}
-		if (specially==0&&t.getCommodityQuantity()>1) {
-			for (int i = 0; i < t.getCommodityQuantity(); i++) {
-				TOrderTask tOrderTask=new TOrderTask();
-				try {
-					ConvertUtils.register(new DateConverter(null), java.util.Date.class);
-					BeanUtils.copyProperties(tOrderTask, t);
-					tOrderTask.setId(null);
-					tOrderTask.setCommodityQuantity(1);
-					tOrderTask.setSuperId(t.getId().toString());
-					tOrderTaskMapper.insertSelective(tOrderTask);
-				} catch (IllegalAccessException | InvocationTargetException e) {
-					e.printStackTrace();
-				}
-			}
-		}
 		return 1;
 	}
 	public void addOrderLog(String orderNo, Integer code) {
@@ -172,6 +157,14 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setProjectStatus(t.getProjectStatus());
 		task.setTaskComment(t.getTaskComment());
 		task.setCertificateNumber(t.getCertificateNumber());
+		task.setStatus(t.getStatus());
+		task.setFormRetrieve(t.getFormRetrieve());
+		task.setTaskRefund(t.getTaskRefund());
+		task.setRefundContent(t.getRefundContent());
+		task.setDeclareUser(t.getDeclareUser());
+		task.setDeclarePwd(t.getDeclarePwd());
+		task.setArrivalMoney(t.getArrivalMoney());
+		task.setSetUpAmount(t.getSetUpAmount());
 		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo()); 
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());
 		if(StringUtils.isNotEmpty(t.getContacts()))	tn.setContactMobile(t.getContactMobile());

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.04
+static.host=//sb.jishutao.com/1.1.05
 avatar.host=//sb.jishutao.com
 
 #连生产
 #avatar.host=//static.kedexinxi.com
-#static.host=//s.kedexinxi.com/1.1.04
+#static.host=//s.kedexinxi.com/1.1.05
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload