Procházet zdrojové kódy

派单数据修复

wanghui před 8 roky
rodič
revize
06e09c41a9
22 změnil soubory, kde provedl 1492 přidání a 284 odebrání
  1. 1 1
      GeneratorConfig.xml
  2. 27 11
      src/main/java/com/goafanti/common/dao/ContractMapper.java
  3. 14 14
      src/main/java/com/goafanti/common/dao/TOrderMapper.java
  4. 98 0
      src/main/java/com/goafanti/common/dao/TmpTableMapper.java
  5. 49 22
      src/main/java/com/goafanti/common/mapper/ContractMapper.xml
  6. 20 20
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml
  7. 7 0
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  8. 260 0
      src/main/java/com/goafanti/common/mapper/TmpTableMapper.xml
  9. 77 54
      src/main/java/com/goafanti/common/model/Contract.java
  10. 76 16
      src/main/java/com/goafanti/common/model/ContractExample.java
  11. 111 111
      src/main/java/com/goafanti/common/model/TOrder.java
  12. 16 16
      src/main/java/com/goafanti/common/model/TOrderExample.java
  13. 102 0
      src/main/java/com/goafanti/common/model/TmpTable.java
  14. 492 0
      src/main/java/com/goafanti/common/model/TmpTableExample.java
  15. 11 0
      src/main/java/com/goafanti/order/controller/AdminOrderApiController.java
  16. 51 0
      src/main/java/com/goafanti/order/enums/TaskDistributionState.java
  17. 6 0
      src/main/java/com/goafanti/order/service/OrderService.java
  18. 21 0
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  19. 8 0
      src/main/java/com/goafanti/techproject/bo/ProjectListBo.java
  20. 1 17
      src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java
  21. 8 0
      src/main/java/com/goafanti/techproject/service/TechProjectService.java
  22. 36 2
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

+ 1 - 1
GeneratorConfig.xml

@@ -10,6 +10,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="t_order_change"/> 
+    <table schema="aft" tableName="contract"/> 
   </context>
 </generatorConfiguration>

+ 27 - 11
src/main/java/com/goafanti/common/dao/ContractMapper.java

@@ -8,71 +8,72 @@ import com.goafanti.common.model.Contract;
 import com.goafanti.contract.bo.ContractSerialNumber;
 import com.goafanti.common.model.ContractExample;
 import com.goafanti.common.model.ContractTask;
+import com.goafanti.common.model.TmpTable;
 
 public interface ContractMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	long countByExample(ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	int deleteByExample(ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	int insert(Contract record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	int insertSelective(Contract record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	List<Contract> selectByExample(ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	Contract selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") Contract record, @Param("example") ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	int updateByExample(@Param("record") Contract record, @Param("example") ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	int updateByPrimaryKeySelective(Contract record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	int updateByPrimaryKey(Contract record);
 
@@ -98,4 +99,19 @@ public interface ContractMapper {
 	 * @return
 	 */
 	int deleteProjectTask(String taskId);
+
+	/**
+	 * 修复派单数据
+	 * @param orderNo
+	 * @param taskDistribution
+	 * @return
+	 */
+	int updateRepairData(@Param("orderNo")String orderNo,@Param("taskDistribution") int taskDistribution);
+	
+	/**
+	 * 判断项目单分配情况
+	 * @param orderNo
+	 * @return
+	 */
+	TmpTable selectTaskDistribution(@Param("orderNo") String orderNo);
 }

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

@@ -15,85 +15,85 @@ public interface TOrderMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	long countByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int deleteByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int deleteByPrimaryKey(String orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int insert(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int insertSelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	List<TOrder> selectByExampleWithBLOBs(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	List<TOrder> selectByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	TOrder selectByPrimaryKey(String orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") TOrder record, @Param("example") TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrder record, @Param("example") TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int updateByExample(@Param("record") TOrder record, @Param("example") TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int updateByPrimaryKeySelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	int updateByPrimaryKey(TOrder record);
 

+ 98 - 0
src/main/java/com/goafanti/common/dao/TmpTableMapper.java

@@ -0,0 +1,98 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TmpTable;
+import com.goafanti.common.model.TmpTableExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TmpTableMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    long countByExample(TmpTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    int deleteByExample(TmpTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    int deleteByPrimaryKey(String orderNo);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    int insert(TmpTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    int insertSelective(TmpTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    List<TmpTable> selectByExample(TmpTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    TmpTable selectByPrimaryKey(String orderNo);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") TmpTable record, @Param("example") TmpTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    int updateByExample(@Param("record") TmpTable record, @Param("example") TmpTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    int updateByPrimaryKeySelective(TmpTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    int updateByPrimaryKey(TmpTable record);
+
+	List<TmpTable> selectAll();
+}

+ 49 - 22
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
@@ -25,12 +25,13 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="contacts" jdbcType="VARCHAR" property="contacts" />
     <result column="contact_mobile" jdbcType="VARCHAR" property="contactMobile" />
+    <result column="task_distribution" jdbcType="INTEGER" property="taskDistribution" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -64,7 +65,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -98,17 +99,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     id, serial_number, create_time, update_time, creater, name, type, principal, uid, 
     sign_date, sign_comment, complete_date, complete_comment, deleted_sign, order_no, 
-    status, contacts, contact_mobile
+    status, contacts, contact_mobile, task_distribution
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.ContractExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     select
     <if test="distinct">
@@ -127,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -138,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     delete from contract
     where id = #{id,jdbcType=VARCHAR}
@@ -147,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     delete from contract
     <if test="_parameter != null">
@@ -158,28 +159,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     insert into contract (id, serial_number, create_time, 
       update_time, creater, name, 
       type, principal, uid, 
       sign_date, sign_comment, complete_date, 
       complete_comment, deleted_sign, order_no, 
-      status, contacts, contact_mobile
-      )
+      status, contacts, contact_mobile, 
+      task_distribution)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{creater,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{type,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, 
       #{signDate,jdbcType=TIMESTAMP}, #{signComment,jdbcType=VARCHAR}, #{completeDate,jdbcType=TIMESTAMP}, 
       #{completeComment,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{contacts,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}
-      )
+      #{status,jdbcType=INTEGER}, #{contacts,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, 
+      #{taskDistribution,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Contract">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     insert into contract
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -237,6 +238,9 @@
       <if test="contactMobile != null">
         contact_mobile,
       </if>
+      <if test="taskDistribution != null">
+        task_distribution,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -293,13 +297,16 @@
       <if test="contactMobile != null">
         #{contactMobile,jdbcType=VARCHAR},
       </if>
+      <if test="taskDistribution != null">
+        #{taskDistribution,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.ContractExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     select count(*) from contract
     <if test="_parameter != null">
@@ -310,7 +317,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     update contract
     <set>
@@ -368,6 +375,9 @@
       <if test="record.contactMobile != null">
         contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
       </if>
+      <if test="record.taskDistribution != null">
+        task_distribution = #{record.taskDistribution,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -377,7 +387,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     update contract
     set id = #{record.id,jdbcType=VARCHAR},
@@ -397,7 +407,8 @@
       order_no = #{record.orderNo,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
       contacts = #{record.contacts,jdbcType=VARCHAR},
-      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR}
+      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      task_distribution = #{record.taskDistribution,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -406,7 +417,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     update contract
     <set>
@@ -461,6 +472,9 @@
       <if test="contactMobile != null">
         contact_mobile = #{contactMobile,jdbcType=VARCHAR},
       </if>
+      <if test="taskDistribution != null">
+        task_distribution = #{taskDistribution,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -468,7 +482,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Wed Apr 11 14:31:13 CST 2018.
     -->
     update contract
     set serial_number = #{serialNumber,jdbcType=INTEGER},
@@ -487,7 +501,8 @@
       order_no = #{orderNo,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       contacts = #{contacts,jdbcType=VARCHAR},
-      contact_mobile = #{contactMobile,jdbcType=VARCHAR}
+      contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      task_distribution = #{taskDistribution,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  
@@ -747,4 +762,16 @@
 	  )
     </foreach>
    </insert>
+   
+   <update id="updateRepairData">
+		update contract set task_distribution = #{taskDistribution,jdbcType=VARCHAR} where order_no = #{orderNo,jdbcType=VARCHAR} 
+   </update>
+   
+   <select id="selectTaskDistribution" parameterType="java.lang.String" resultType="com.goafanti.common.model.TmpTable">
+		select x.order_no as orderNO,x.all_count as allCount,y.dis_count as disCount from (
+			select b.order_no,count(0) as all_count from contract_task a left join contract b on a.contract_id = b.id where a.deleted_sign <![CDATA[ <> ]]> 1 group by b.order_no) x 
+		inner join (
+			select b.order_no,count(0) as dis_count from contract_task a left join contract b on a.contract_id = b.id where a.deleted_sign <![CDATA[ <> ]]> 1 and a.task_status = 1 group by b.order_no)y
+		on x.order_no = y.order_no and x.order_no = #{orderNo,jdbcType=VARCHAR}
+   </select>
 </mapper>

+ 20 - 20
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_type" jdbcType="INTEGER" property="orderType" />
@@ -48,7 +48,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     <result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
   </resultMap>
@@ -56,7 +56,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -90,7 +90,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -124,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     order_no, order_type, creater, create_time, update_time, buyer_id, seller_id, first_payment, 
     order_amount, brokerage_amount, sign_first_payment, actually_first_payment, sign_total_amount, 
@@ -138,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     contract_picture_url
   </sql>
@@ -146,7 +146,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     select
     <if test="distinct">
@@ -167,7 +167,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     select
     <if test="distinct">
@@ -186,7 +186,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -199,7 +199,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     delete from t_order
     where order_no = #{orderNo,jdbcType=VARCHAR}
@@ -208,7 +208,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     delete from t_order
     <if test="_parameter != null">
@@ -219,7 +219,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     insert into t_order (order_no, order_type, creater, 
       create_time, update_time, buyer_id, 
@@ -252,7 +252,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     insert into t_order
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -486,7 +486,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     select count(*) from t_order
     <if test="_parameter != null">
@@ -497,7 +497,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     update t_order
     <set>
@@ -621,7 +621,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -669,7 +669,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -716,7 +716,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     update t_order
     <set>
@@ -835,7 +835,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     update t_order
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -880,7 +880,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 02 16:45:39 CST 2018.
+      This element was generated on Wed Apr 11 14:30:55 CST 2018.
     -->
     update t_order
     set order_type = #{orderType,jdbcType=INTEGER},

+ 7 - 0
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -571,6 +571,7 @@
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as projectTime,
 		a.uid,
 		a.status as projectStatus,
+		a.task_distribution as taskDistribution,
 		a.deleted_sign as deletedSign,
 		a.order_no as orderNo,
 		b.nickname as buyerName,
@@ -607,6 +608,9 @@
 	<if test="setUpEndDate != null and setUpEndDate != ''">
 		and a.create_time &lt; #{setUpEndDate,jdbcType=TIMESTAMP}
 	</if>
+	<if test="taskDistribution != null">
+		and a.task_distribution = #{taskDistribution,jdbcType=INTEGER}
+	</if>
 	<if test="buyerName != null and buyerName != ''">
 		and b.nickname like concat('%',#{buyerName,jdbcType=VARCHAR},'%')
 	</if>
@@ -657,6 +661,9 @@
 	<if test="setUpEndDate != null and setUpEndDate != ''">
 		and a.create_time &lt; #{setUpEndDate,jdbcType=TIMESTAMP}
 	</if>
+	<if test="taskDistribution != null">
+		and a.task_distribution = #{taskDistribution,jdbcType=INTEGER}
+	</if>
 	<if test="buyerName != null and buyerName != ''">
 		and b.nickname like concat('%',#{buyerName,jdbcType=VARCHAR},'%')
 	</if>

+ 260 - 0
src/main/java/com/goafanti/common/mapper/TmpTableMapper.xml

@@ -0,0 +1,260 @@
+<?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.TmpTableMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TmpTable">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="all_count" jdbcType="INTEGER" property="allCount" />
+    <result column="dis_count" jdbcType="INTEGER" property="disCount" />
+  </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 Wed Apr 11 14:10:27 CST 2018.
+    -->
+    <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 Wed Apr 11 14:10:27 CST 2018.
+    -->
+    <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 Wed Apr 11 14:10:27 CST 2018.
+    -->
+    order_no, all_count, dis_count
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TmpTableExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tmp_table
+    <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.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from tmp_table
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    delete from tmp_table
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TmpTableExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    delete from tmp_table
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TmpTable">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    insert into tmp_table (order_no, all_count, dis_count
+      )
+    values (#{orderNo,jdbcType=VARCHAR}, #{allCount,jdbcType=INTEGER}, #{disCount,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TmpTable">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    insert into tmp_table
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="allCount != null">
+        all_count,
+      </if>
+      <if test="disCount != null">
+        dis_count,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="allCount != null">
+        #{allCount,jdbcType=INTEGER},
+      </if>
+      <if test="disCount != null">
+        #{disCount,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TmpTableExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    select count(*) from tmp_table
+    <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 Wed Apr 11 14:10:27 CST 2018.
+    -->
+    update tmp_table
+    <set>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.allCount != null">
+        all_count = #{record.allCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.disCount != null">
+        dis_count = #{record.disCount,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 Wed Apr 11 14:10:27 CST 2018.
+    -->
+    update tmp_table
+    set order_no = #{record.orderNo,jdbcType=VARCHAR},
+      all_count = #{record.allCount,jdbcType=INTEGER},
+      dis_count = #{record.disCount,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TmpTable">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    update tmp_table
+    <set>
+      <if test="allCount != null">
+        all_count = #{allCount,jdbcType=INTEGER},
+      </if>
+      <if test="disCount != null">
+        dis_count = #{disCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TmpTable">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Apr 11 14:10:27 CST 2018.
+    -->
+    update tmp_table
+    set all_count = #{allCount,jdbcType=INTEGER},
+      dis_count = #{disCount,jdbcType=INTEGER}
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectAll" resultMap="BaseResultMap">
+  	select order_no,all_count,dis_count from tmp_table
+  </select>
+</mapper>

+ 77 - 54
src/main/java/com/goafanti/common/model/Contract.java

@@ -6,99 +6,104 @@ public class Contract {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.serial_number
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private Integer serialNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.create_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.update_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.creater
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.name
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.principal
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String principal;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.uid
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.sign_date
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private Date signDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.sign_comment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String signComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.complete_date
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private Date completeDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.complete_comment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String completeComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.deleted_sign
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private Integer deletedSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.order_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.contacts
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String contacts;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.contact_mobile
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	private String contactMobile;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.task_distribution
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
+	 */
+	private Integer taskDistribution;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.id
 	 * @return  the value of contract.id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -107,7 +112,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.id
 	 * @param id  the value for contract.id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -116,7 +121,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.serial_number
 	 * @return  the value of contract.serial_number
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Integer getSerialNumber() {
 		return serialNumber;
@@ -125,7 +130,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.serial_number
 	 * @param serialNumber  the value for contract.serial_number
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
@@ -134,7 +139,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.create_time
 	 * @return  the value of contract.create_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -143,7 +148,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.create_time
 	 * @param createTime  the value for contract.create_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -152,7 +157,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.update_time
 	 * @return  the value of contract.update_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -161,7 +166,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.update_time
 	 * @param updateTime  the value for contract.update_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -170,7 +175,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.creater
 	 * @return  the value of contract.creater
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getCreater() {
 		return creater;
@@ -179,7 +184,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.creater
 	 * @param creater  the value for contract.creater
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -188,7 +193,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.name
 	 * @return  the value of contract.name
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getName() {
 		return name;
@@ -197,7 +202,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.name
 	 * @param name  the value for contract.name
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -206,7 +211,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.type
 	 * @return  the value of contract.type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getType() {
 		return type;
@@ -215,7 +220,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.type
 	 * @param type  the value for contract.type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setType(String type) {
 		this.type = type;
@@ -224,7 +229,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.principal
 	 * @return  the value of contract.principal
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getPrincipal() {
 		return principal;
@@ -233,7 +238,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.principal
 	 * @param principal  the value for contract.principal
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setPrincipal(String principal) {
 		this.principal = principal;
@@ -242,7 +247,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.uid
 	 * @return  the value of contract.uid
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getUid() {
 		return uid;
@@ -251,7 +256,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.uid
 	 * @param uid  the value for contract.uid
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -260,7 +265,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.sign_date
 	 * @return  the value of contract.sign_date
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Date getSignDate() {
 		return signDate;
@@ -269,7 +274,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.sign_date
 	 * @param signDate  the value for contract.sign_date
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setSignDate(Date signDate) {
 		this.signDate = signDate;
@@ -278,7 +283,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.sign_comment
 	 * @return  the value of contract.sign_comment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getSignComment() {
 		return signComment;
@@ -287,7 +292,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.sign_comment
 	 * @param signComment  the value for contract.sign_comment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setSignComment(String signComment) {
 		this.signComment = signComment;
@@ -296,7 +301,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.complete_date
 	 * @return  the value of contract.complete_date
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Date getCompleteDate() {
 		return completeDate;
@@ -305,7 +310,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.complete_date
 	 * @param completeDate  the value for contract.complete_date
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setCompleteDate(Date completeDate) {
 		this.completeDate = completeDate;
@@ -314,7 +319,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.complete_comment
 	 * @return  the value of contract.complete_comment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getCompleteComment() {
 		return completeComment;
@@ -323,7 +328,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.complete_comment
 	 * @param completeComment  the value for contract.complete_comment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setCompleteComment(String completeComment) {
 		this.completeComment = completeComment;
@@ -332,7 +337,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.deleted_sign
 	 * @return  the value of contract.deleted_sign
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Integer getDeletedSign() {
 		return deletedSign;
@@ -341,7 +346,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.deleted_sign
 	 * @param deletedSign  the value for contract.deleted_sign
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setDeletedSign(Integer deletedSign) {
 		this.deletedSign = deletedSign;
@@ -350,7 +355,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.order_no
 	 * @return  the value of contract.order_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -359,7 +364,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.order_no
 	 * @param orderNo  the value for contract.order_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -368,7 +373,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.status
 	 * @return  the value of contract.status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Integer getStatus() {
 		return status;
@@ -377,7 +382,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.status
 	 * @param status  the value for contract.status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -386,7 +391,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.contacts
 	 * @return  the value of contract.contacts
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getContacts() {
 		return contacts;
@@ -395,7 +400,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.contacts
 	 * @param contacts  the value for contract.contacts
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -404,7 +409,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.contact_mobile
 	 * @return  the value of contract.contact_mobile
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -413,9 +418,27 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.contact_mobile
 	 * @param contactMobile  the value for contract.contact_mobile
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.task_distribution
+	 * @return  the value of contract.task_distribution
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
+	 */
+	public Integer getTaskDistribution() {
+		return taskDistribution;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.task_distribution
+	 * @param taskDistribution  the value for contract.task_distribution
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
+	 */
+	public void setTaskDistribution(Integer taskDistribution) {
+		this.taskDistribution = taskDistribution;
+	}
 }

+ 76 - 16
src/main/java/com/goafanti/common/model/ContractExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class ContractExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public ContractExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class ContractExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1352,11 +1352,71 @@ public class ContractExample {
 			addCriterion("contact_mobile not between", value1, value2, "contactMobile");
 			return (Criteria) this;
 		}
+
+		public Criteria andTaskDistributionIsNull() {
+			addCriterion("task_distribution is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionIsNotNull() {
+			addCriterion("task_distribution is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionEqualTo(Integer value) {
+			addCriterion("task_distribution =", value, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionNotEqualTo(Integer value) {
+			addCriterion("task_distribution <>", value, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionGreaterThan(Integer value) {
+			addCriterion("task_distribution >", value, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionGreaterThanOrEqualTo(Integer value) {
+			addCriterion("task_distribution >=", value, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionLessThan(Integer value) {
+			addCriterion("task_distribution <", value, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionLessThanOrEqualTo(Integer value) {
+			addCriterion("task_distribution <=", value, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionIn(List<Integer> values) {
+			addCriterion("task_distribution in", values, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionNotIn(List<Integer> values) {
+			addCriterion("task_distribution not in", values, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionBetween(Integer value1, Integer value2) {
+			addCriterion("task_distribution between", value1, value2, "taskDistribution");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskDistributionNotBetween(Integer value1, Integer value2) {
+			addCriterion("task_distribution not between", value1, value2, "taskDistribution");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:31:13 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 111 - 111
src/main/java/com/goafanti/common/model/TOrder.java

@@ -7,194 +7,194 @@ public class TOrder {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_no
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_type
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer orderType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.creater
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.create_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.update_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.buyer_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String buyerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.seller_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String sellerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal firstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal orderAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal brokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal signFirstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal actuallyFirstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_total_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal signTotalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_total_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal actuallyTotalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal signBrokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal actuallyBrokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_withdraw_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal signWithdrawAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_withdraw_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private BigDecimal actuallyWithdrawAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_stage
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer orderStage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.project_stage
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer projectStage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer orderStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.liquidation_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer liquidationStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_channel
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer orderChannel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.approval
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer approval;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_remarks
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String orderRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.delete_sign
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.salesman_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String salesmanId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.finance_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String financeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.technician_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String technicianId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.confirm_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Date confirmTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Date signTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.set_up_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Date setUpTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.settlement_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Date settlementTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_no
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String contractNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_type
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String contractType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.change_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private Integer changeStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_picture_url
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	private String contractPictureUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_no
 	 * @return  the value of t_order.order_no
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -203,7 +203,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_no
 	 * @param orderNo  the value for t_order.order_no
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -212,7 +212,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_type
 	 * @return  the value of t_order.order_type
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getOrderType() {
 		return orderType;
@@ -221,7 +221,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_type
 	 * @param orderType  the value for t_order.order_type
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
@@ -230,7 +230,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.creater
 	 * @return  the value of t_order.creater
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getCreater() {
 		return creater;
@@ -239,7 +239,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.creater
 	 * @param creater  the value for t_order.creater
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -248,7 +248,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.create_time
 	 * @return  the value of t_order.create_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -257,7 +257,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.create_time
 	 * @param createTime  the value for t_order.create_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -266,7 +266,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.update_time
 	 * @return  the value of t_order.update_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -275,7 +275,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.update_time
 	 * @param updateTime  the value for t_order.update_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -284,7 +284,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.buyer_id
 	 * @return  the value of t_order.buyer_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -293,7 +293,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.buyer_id
 	 * @param buyerId  the value for t_order.buyer_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -302,7 +302,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.seller_id
 	 * @return  the value of t_order.seller_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getSellerId() {
 		return sellerId;
@@ -311,7 +311,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.seller_id
 	 * @param sellerId  the value for t_order.seller_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSellerId(String sellerId) {
 		this.sellerId = sellerId;
@@ -320,7 +320,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.first_payment
 	 * @return  the value of t_order.first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getFirstPayment() {
 		return firstPayment;
@@ -329,7 +329,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.first_payment
 	 * @param firstPayment  the value for t_order.first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setFirstPayment(BigDecimal firstPayment) {
 		this.firstPayment = firstPayment;
@@ -338,7 +338,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_amount
 	 * @return  the value of t_order.order_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getOrderAmount() {
 		return orderAmount;
@@ -347,7 +347,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_amount
 	 * @param orderAmount  the value for t_order.order_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setOrderAmount(BigDecimal orderAmount) {
 		this.orderAmount = orderAmount;
@@ -356,7 +356,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.brokerage_amount
 	 * @return  the value of t_order.brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getBrokerageAmount() {
 		return brokerageAmount;
@@ -365,7 +365,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.brokerage_amount
 	 * @param brokerageAmount  the value for t_order.brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setBrokerageAmount(BigDecimal brokerageAmount) {
 		this.brokerageAmount = brokerageAmount;
@@ -374,7 +374,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_first_payment
 	 * @return  the value of t_order.sign_first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getSignFirstPayment() {
 		return signFirstPayment;
@@ -383,7 +383,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_first_payment
 	 * @param signFirstPayment  the value for t_order.sign_first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSignFirstPayment(BigDecimal signFirstPayment) {
 		this.signFirstPayment = signFirstPayment;
@@ -392,7 +392,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_first_payment
 	 * @return  the value of t_order.actually_first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getActuallyFirstPayment() {
 		return actuallyFirstPayment;
@@ -401,7 +401,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_first_payment
 	 * @param actuallyFirstPayment  the value for t_order.actually_first_payment
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setActuallyFirstPayment(BigDecimal actuallyFirstPayment) {
 		this.actuallyFirstPayment = actuallyFirstPayment;
@@ -410,7 +410,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_total_amount
 	 * @return  the value of t_order.sign_total_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getSignTotalAmount() {
 		return signTotalAmount;
@@ -419,7 +419,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_total_amount
 	 * @param signTotalAmount  the value for t_order.sign_total_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSignTotalAmount(BigDecimal signTotalAmount) {
 		this.signTotalAmount = signTotalAmount;
@@ -428,7 +428,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_total_amount
 	 * @return  the value of t_order.actually_total_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getActuallyTotalAmount() {
 		return actuallyTotalAmount;
@@ -437,7 +437,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_total_amount
 	 * @param actuallyTotalAmount  the value for t_order.actually_total_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setActuallyTotalAmount(BigDecimal actuallyTotalAmount) {
 		this.actuallyTotalAmount = actuallyTotalAmount;
@@ -446,7 +446,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_brokerage_amount
 	 * @return  the value of t_order.sign_brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getSignBrokerageAmount() {
 		return signBrokerageAmount;
@@ -455,7 +455,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_brokerage_amount
 	 * @param signBrokerageAmount  the value for t_order.sign_brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSignBrokerageAmount(BigDecimal signBrokerageAmount) {
 		this.signBrokerageAmount = signBrokerageAmount;
@@ -464,7 +464,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_brokerage_amount
 	 * @return  the value of t_order.actually_brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getActuallyBrokerageAmount() {
 		return actuallyBrokerageAmount;
@@ -473,7 +473,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_brokerage_amount
 	 * @param actuallyBrokerageAmount  the value for t_order.actually_brokerage_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setActuallyBrokerageAmount(BigDecimal actuallyBrokerageAmount) {
 		this.actuallyBrokerageAmount = actuallyBrokerageAmount;
@@ -482,7 +482,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_withdraw_amount
 	 * @return  the value of t_order.sign_withdraw_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getSignWithdrawAmount() {
 		return signWithdrawAmount;
@@ -491,7 +491,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_withdraw_amount
 	 * @param signWithdrawAmount  the value for t_order.sign_withdraw_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSignWithdrawAmount(BigDecimal signWithdrawAmount) {
 		this.signWithdrawAmount = signWithdrawAmount;
@@ -500,7 +500,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_withdraw_amount
 	 * @return  the value of t_order.actually_withdraw_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public BigDecimal getActuallyWithdrawAmount() {
 		return actuallyWithdrawAmount;
@@ -509,7 +509,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_withdraw_amount
 	 * @param actuallyWithdrawAmount  the value for t_order.actually_withdraw_amount
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setActuallyWithdrawAmount(BigDecimal actuallyWithdrawAmount) {
 		this.actuallyWithdrawAmount = actuallyWithdrawAmount;
@@ -518,7 +518,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_stage
 	 * @return  the value of t_order.order_stage
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getOrderStage() {
 		return orderStage;
@@ -527,7 +527,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_stage
 	 * @param orderStage  the value for t_order.order_stage
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setOrderStage(Integer orderStage) {
 		this.orderStage = orderStage;
@@ -536,7 +536,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.project_stage
 	 * @return  the value of t_order.project_stage
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getProjectStage() {
 		return projectStage;
@@ -545,7 +545,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.project_stage
 	 * @param projectStage  the value for t_order.project_stage
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setProjectStage(Integer projectStage) {
 		this.projectStage = projectStage;
@@ -554,7 +554,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_status
 	 * @return  the value of t_order.order_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -563,7 +563,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_status
 	 * @param orderStatus  the value for t_order.order_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -572,7 +572,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.liquidation_status
 	 * @return  the value of t_order.liquidation_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -581,7 +581,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.liquidation_status
 	 * @param liquidationStatus  the value for t_order.liquidation_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
@@ -590,7 +590,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_channel
 	 * @return  the value of t_order.order_channel
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getOrderChannel() {
 		return orderChannel;
@@ -599,7 +599,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_channel
 	 * @param orderChannel  the value for t_order.order_channel
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setOrderChannel(Integer orderChannel) {
 		this.orderChannel = orderChannel;
@@ -608,7 +608,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.approval
 	 * @return  the value of t_order.approval
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getApproval() {
 		return approval;
@@ -617,7 +617,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.approval
 	 * @param approval  the value for t_order.approval
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setApproval(Integer approval) {
 		this.approval = approval;
@@ -626,7 +626,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_remarks
 	 * @return  the value of t_order.order_remarks
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getOrderRemarks() {
 		return orderRemarks;
@@ -635,7 +635,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_remarks
 	 * @param orderRemarks  the value for t_order.order_remarks
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
@@ -644,7 +644,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.delete_sign
 	 * @return  the value of t_order.delete_sign
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -653,7 +653,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.delete_sign
 	 * @param deleteSign  the value for t_order.delete_sign
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -662,7 +662,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.salesman_id
 	 * @return  the value of t_order.salesman_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -671,7 +671,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.salesman_id
 	 * @param salesmanId  the value for t_order.salesman_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -680,7 +680,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.finance_id
 	 * @return  the value of t_order.finance_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -689,7 +689,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.finance_id
 	 * @param financeId  the value for t_order.finance_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -698,7 +698,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.technician_id
 	 * @return  the value of t_order.technician_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getTechnicianId() {
 		return technicianId;
@@ -707,7 +707,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.technician_id
 	 * @param technicianId  the value for t_order.technician_id
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setTechnicianId(String technicianId) {
 		this.technicianId = technicianId;
@@ -716,7 +716,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.confirm_time
 	 * @return  the value of t_order.confirm_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Date getConfirmTime() {
 		return confirmTime;
@@ -725,7 +725,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.confirm_time
 	 * @param confirmTime  the value for t_order.confirm_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setConfirmTime(Date confirmTime) {
 		this.confirmTime = confirmTime;
@@ -734,7 +734,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_time
 	 * @return  the value of t_order.sign_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Date getSignTime() {
 		return signTime;
@@ -743,7 +743,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_time
 	 * @param signTime  the value for t_order.sign_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSignTime(Date signTime) {
 		this.signTime = signTime;
@@ -752,7 +752,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.set_up_time
 	 * @return  the value of t_order.set_up_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Date getSetUpTime() {
 		return setUpTime;
@@ -761,7 +761,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.set_up_time
 	 * @param setUpTime  the value for t_order.set_up_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSetUpTime(Date setUpTime) {
 		this.setUpTime = setUpTime;
@@ -770,7 +770,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.settlement_time
 	 * @return  the value of t_order.settlement_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Date getSettlementTime() {
 		return settlementTime;
@@ -779,7 +779,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.settlement_time
 	 * @param settlementTime  the value for t_order.settlement_time
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setSettlementTime(Date settlementTime) {
 		this.settlementTime = settlementTime;
@@ -788,7 +788,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_no
 	 * @return  the value of t_order.contract_no
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getContractNo() {
 		return contractNo;
@@ -797,7 +797,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_no
 	 * @param contractNo  the value for t_order.contract_no
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
@@ -806,7 +806,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_type
 	 * @return  the value of t_order.contract_type
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getContractType() {
 		return contractType;
@@ -815,7 +815,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_type
 	 * @param contractType  the value for t_order.contract_type
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setContractType(String contractType) {
 		this.contractType = contractType;
@@ -824,7 +824,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.change_status
 	 * @return  the value of t_order.change_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Integer getChangeStatus() {
 		return changeStatus;
@@ -833,7 +833,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.change_status
 	 * @param changeStatus  the value for t_order.change_status
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setChangeStatus(Integer changeStatus) {
 		this.changeStatus = changeStatus;
@@ -842,7 +842,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_picture_url
 	 * @return  the value of t_order.contract_picture_url
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getContractPictureUrl() {
 		return contractPictureUrl;
@@ -851,7 +851,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_picture_url
 	 * @param contractPictureUrl  the value for t_order.contract_picture_url
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setContractPictureUrl(String contractPictureUrl) {
 		this.contractPictureUrl = contractPictureUrl;

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public TOrderExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2427,7 +2427,7 @@ public class TOrderExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 * @mbg.generated  Wed Apr 11 14:30:55 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 102 - 0
src/main/java/com/goafanti/common/model/TmpTable.java

@@ -0,0 +1,102 @@
+package com.goafanti.common.model;
+
+public class TmpTable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tmp_table.order_no
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    private String orderNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tmp_table.all_count
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    private Integer allCount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tmp_table.dis_count
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    private Integer disCount;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tmp_table.order_no
+     *
+     * @return the value of tmp_table.order_no
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tmp_table.order_no
+     *
+     * @param orderNo the value for tmp_table.order_no
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tmp_table.all_count
+     *
+     * @return the value of tmp_table.all_count
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public Integer getAllCount() {
+        return allCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tmp_table.all_count
+     *
+     * @param allCount the value for tmp_table.all_count
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public void setAllCount(Integer allCount) {
+        this.allCount = allCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tmp_table.dis_count
+     *
+     * @return the value of tmp_table.dis_count
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public Integer getDisCount() {
+        return disCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tmp_table.dis_count
+     *
+     * @param disCount the value for tmp_table.dis_count
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public void setDisCount(Integer disCount) {
+        this.disCount = disCount;
+    }
+}

+ 492 - 0
src/main/java/com/goafanti/common/model/TmpTableExample.java

@@ -0,0 +1,492 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TmpTableExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public TmpTableExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    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 tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    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 tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    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 andOrderNoIsNull() {
+            addCriterion("order_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNotNull() {
+            addCriterion("order_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoEqualTo(String value) {
+            addCriterion("order_no =", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotEqualTo(String value) {
+            addCriterion("order_no <>", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThan(String value) {
+            addCriterion("order_no >", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+            addCriterion("order_no >=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThan(String value) {
+            addCriterion("order_no <", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThanOrEqualTo(String value) {
+            addCriterion("order_no <=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLike(String value) {
+            addCriterion("order_no like", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotLike(String value) {
+            addCriterion("order_no not like", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIn(List<String> values) {
+            addCriterion("order_no in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotIn(List<String> values) {
+            addCriterion("order_no not in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoBetween(String value1, String value2) {
+            addCriterion("order_no between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotBetween(String value1, String value2) {
+            addCriterion("order_no not between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountIsNull() {
+            addCriterion("all_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountIsNotNull() {
+            addCriterion("all_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountEqualTo(Integer value) {
+            addCriterion("all_count =", value, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountNotEqualTo(Integer value) {
+            addCriterion("all_count <>", value, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountGreaterThan(Integer value) {
+            addCriterion("all_count >", value, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("all_count >=", value, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountLessThan(Integer value) {
+            addCriterion("all_count <", value, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountLessThanOrEqualTo(Integer value) {
+            addCriterion("all_count <=", value, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountIn(List<Integer> values) {
+            addCriterion("all_count in", values, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountNotIn(List<Integer> values) {
+            addCriterion("all_count not in", values, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountBetween(Integer value1, Integer value2) {
+            addCriterion("all_count between", value1, value2, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("all_count not between", value1, value2, "allCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountIsNull() {
+            addCriterion("dis_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountIsNotNull() {
+            addCriterion("dis_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountEqualTo(Integer value) {
+            addCriterion("dis_count =", value, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountNotEqualTo(Integer value) {
+            addCriterion("dis_count <>", value, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountGreaterThan(Integer value) {
+            addCriterion("dis_count >", value, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("dis_count >=", value, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountLessThan(Integer value) {
+            addCriterion("dis_count <", value, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountLessThanOrEqualTo(Integer value) {
+            addCriterion("dis_count <=", value, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountIn(List<Integer> values) {
+            addCriterion("dis_count in", values, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountNotIn(List<Integer> values) {
+            addCriterion("dis_count not in", values, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountBetween(Integer value1, Integer value2) {
+            addCriterion("dis_count between", value1, value2, "disCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("dis_count not between", value1, value2, "disCount");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table tmp_table
+     *
+     * @mbg.generated do_not_delete_during_merge Wed Apr 11 14:10:27 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table tmp_table
+     *
+     * @mbg.generated Wed Apr 11 14:10:27 CST 2018
+     */
+    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);
+        }
+    }
+}

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

@@ -702,4 +702,15 @@ public class AdminOrderApiController extends CertifyApiController {
 		orderServiceImpl.updateOrderChange(changeId,changeComment,changeStatus);
 		return res;
 	}
+
+	/**
+	 * 修复订单数据
+	 * @return
+	 */
+	@RequestMapping(value="/repairData",method = RequestMethod.GET)
+	public Result repairData(){
+		Result res = new Result();
+		orderServiceImpl.updateRepairData();
+		return res;
+	}
 }

+ 51 - 0
src/main/java/com/goafanti/order/enums/TaskDistributionState.java

@@ -0,0 +1,51 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum TaskDistributionState {
+	/** 未分配 **/
+	 NOT_DISTRIBUTION(0,"未分配"),
+	/** 部分分配 **/
+	 PART_DISTRIBUTION(1,"部分分配"),
+	 /** 全部分配 **/
+	 ALL_DISTRIBUTION(2,"全部分配"),
+	/** 无效 **/
+	INVALID(10, "无效");
+	
+	private TaskDistributionState(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, TaskDistributionState> status = new HashMap<Integer, TaskDistributionState>();
+
+	static {
+		for (TaskDistributionState value : TaskDistributionState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static TaskDistributionState getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 6 - 0
src/main/java/com/goafanti/order/service/OrderService.java

@@ -478,5 +478,11 @@ public interface OrderService {
 	 */
 	int updateOrderChange(String changeId, String changeComment, Integer changeStatus);
 
+	/**
+	 * 修复订单数据
+	 * @return
+	 */
+	int updateRepairData();
+
 	
 }

+ 21 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -25,6 +25,7 @@ import com.goafanti.common.dao.TOrderBillMapper;
 import com.goafanti.common.dao.TOrderChangeMapper;
 import com.goafanti.common.dao.TOrderDetailMapper;
 import com.goafanti.common.dao.TOrderMapper;
+import com.goafanti.common.dao.TmpTableMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.error.BusinessException;
@@ -36,6 +37,7 @@ import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TOrderBill;
 import com.goafanti.common.model.TOrderChange;
 import com.goafanti.common.model.TOrderDetail;
+import com.goafanti.common.model.TmpTable;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.BeanUtilsExt;
 import com.goafanti.common.utils.DateUtils;
@@ -64,6 +66,7 @@ import com.goafanti.order.enums.OrderStage;
 import com.goafanti.order.enums.OrderState;
 import com.goafanti.order.enums.PayChannel;
 import com.goafanti.order.enums.ProjectStage;
+import com.goafanti.order.enums.TaskDistributionState;
 import com.goafanti.order.enums.TransactionMode;
 import com.goafanti.order.enums.TransactionSubject;
 import com.goafanti.order.service.OrderService;
@@ -87,6 +90,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private ContractMapper contractMapper;
 	@Autowired
 	private TOrderChangeMapper tOrderChangeMapper;
+	@Autowired
+	private TmpTableMapper tmpTableMapper;
 	
 	private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);//默认首付价格
 	private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);//默认单价
@@ -1456,6 +1461,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		contract.setCreater(TokenManager.getAdminId());
 		contract.setPrincipal(tOrder.getTechnicianId()); //暂不确定
 		contract.setSignComment(signComment);
+		contract.setTaskDistribution(TaskDistributionState.NOT_DISTRIBUTION.getCode());
 		contractMapper.insert(contract);
 		for(TOrderDetail orderDetail: detailList){
 			for(int i=0; i<orderDetail.getCommodityQuantity();i++){
@@ -1736,4 +1742,19 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		return updateOrderSatusByChange(change.getOrderNo());
 	}
 
+	@Override
+	public int updateRepairData() {
+		List<TmpTable> tmpData = tmpTableMapper.selectAll();
+		int taskDistribution = TaskDistributionState.NOT_DISTRIBUTION.getCode();
+		for(TmpTable tt: tmpData){
+			if(tt.getAllCount() == tt.getDisCount()) 
+				taskDistribution = TaskDistributionState.ALL_DISTRIBUTION.getCode();
+			else if(tt.getAllCount() > tt.getDisCount() && tt.getDisCount() != 0)
+				taskDistribution = TaskDistributionState.PART_DISTRIBUTION.getCode();
+			else if(tt.getAllCount() > tt.getDisCount() && tt.getDisCount() == 0)
+				taskDistribution = TaskDistributionState.NOT_DISTRIBUTION.getCode();
+			contractMapper.updateRepairData(tt.getOrderNo(),taskDistribution);
+		}
+		return 1;
+	}
 }

+ 8 - 0
src/main/java/com/goafanti/techproject/bo/ProjectListBo.java

@@ -38,6 +38,8 @@ public class ProjectListBo {
 	private String signDate;
 	/** 结项时间 **/
 	private String completeDate;
+	/** 任务分配情况 **/
+	private Integer taskDistribution;
 	public String getId() {
 		return id;
 	}
@@ -152,4 +154,10 @@ public class ProjectListBo {
 	public void setCompleteDate(String completeDate) {
 		this.completeDate = completeDate;
 	}
+	public Integer getTaskDistribution() {
+		return taskDistribution;
+	}
+	public void setTaskDistribution(Integer taskDistribution) {
+		this.taskDistribution = taskDistribution;
+	}
 }

+ 1 - 17
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -761,23 +761,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号和制定派单人"));
 			return res;
 		}
-		ContractTask task = techProjectService.selectTaskById(taskId);
-		if(task != null){
-			if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode()){ //未派单
-				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
-				return res;
-			} 
-			if(task.getDeletedSign() != DeleteStatus.UNDELETE.getCode()){ //政策
-				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
-				return res;
-			}
-			task.setId(taskId);
-			task.setTaskReceiver(taskReceiverId);
-			task.setTaskAllocator(TokenManager.getAdminId());
-			task.setTaskDistributionTime(new Date());
-			task.setTaskStatus(TaskState.DISTRIBUTION.getCode());
-			techProjectService.updateProjectTask(task);
-		}
+		techProjectService.updateDistributionTask(taskId,taskReceiverId);
 		return res;
 	}
 	

+ 8 - 0
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -164,4 +164,12 @@ public interface TechProjectService {
 	int updateProjectTask(String contractId, String signDate, String signComment, String completeDate,
 			String completeComment);
 
+	/**
+	 * 派任务单
+	 * @param taskId
+	 * @param taskReceiverId
+	 * @return
+	 */
+	int updateDistributionTask(String taskId, String taskReceiverId);
+
 }

+ 36 - 2
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -32,6 +32,7 @@ import com.goafanti.common.model.ContractTask;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.TechProject;
 import com.goafanti.common.model.TechProjectLog;
+import com.goafanti.common.model.TmpTable;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -39,6 +40,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.enums.ProjectStage;
+import com.goafanti.order.enums.TaskDistributionState;
 import com.goafanti.techproject.bo.ProjectDetailBo;
 import com.goafanti.techproject.bo.ProjectListBo;
 import com.goafanti.techproject.bo.TaskDetailBo;
@@ -309,6 +311,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		Map<String, Object> params = new HashMap<>();
 		if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
 		if(bo.getDeletedSign() != null) params.put("deletedSign", bo.getDeletedSign());
+		if(bo.getTaskDistribution() != null) params.put("taskDistribution", bo.getTaskDistribution());
 		if(StringUtils.isNotBlank(bo.getOrderNo())) params.put("orderNo", bo.getOrderNo());
 		if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());
 		if(StringUtils.isNotBlank(bo.getPrincipalName())) params.put("principalName", bo.getPrincipalName());
@@ -342,6 +345,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		contract.setUid(uid);
 		contract.setCreater(TokenManager.getAdminId());
 		contract.setPrincipal(aid);
+		contract.setTaskDistribution(TaskDistributionState.NOT_DISTRIBUTION.getCode());
 		return	contractMapper.insert(contract);
 	}
 
@@ -375,7 +379,8 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			contractTaskMapper.insert(task);
 		}
-		return 1;
+		Contract contract = contractMapper.selectByPrimaryKey(contractId);
+		return setTaskDistribution(contract);
 	}
 
 	@Override
@@ -423,7 +428,9 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			if(task.getTaskStatus() == TaskState.STARTED.getCode() || task.getTaskStatus() == TaskState.COMPLETE.getCode())
 				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, taskId, ""));
 		}
-		return contractTaskMapper.deleteByPrimaryKey(taskId);
+		contractTaskMapper.deleteByPrimaryKey(taskId);
+		Contract contract = contractMapper.selectByPrimaryKey(task.getContractId());
+		return setTaskDistribution(contract);
 	}
 
 	@Override
@@ -476,4 +483,31 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		return contractMapper.updateByPrimaryKeySelective(contract);
 	}
 
+	private int setTaskDistribution(Contract contract){
+		TmpTable tt = contractMapper.selectTaskDistribution(contract.getOrderNo());
+		int taskDistribution = TaskDistributionState.NOT_DISTRIBUTION.getCode();
+		if (tt.getAllCount() == tt.getDisCount())
+			taskDistribution = TaskDistributionState.ALL_DISTRIBUTION.getCode();
+		else if (tt.getAllCount() > tt.getDisCount() && tt.getDisCount() != 0)
+			taskDistribution = TaskDistributionState.PART_DISTRIBUTION.getCode();
+		else if (tt.getAllCount() > tt.getDisCount() && tt.getDisCount() == 0)
+			taskDistribution = TaskDistributionState.NOT_DISTRIBUTION.getCode();
+		return contractMapper.updateRepairData(tt.getOrderNo(), taskDistribution);
+	}
+
+	@Override
+	public int updateDistributionTask(String taskId, String taskReceiverId) {
+		ContractTask task = contractTaskMapper.selectByPrimaryKey(taskId);
+		if(task != null){
+			task.setId(taskId);
+			task.setTaskReceiver(taskReceiverId);
+			task.setTaskAllocator(TokenManager.getAdminId());
+			task.setTaskDistributionTime(new Date());
+			task.setTaskStatus(TaskState.DISTRIBUTION.getCode());
+			contractTaskMapper.updateByPrimaryKeySelective(task);
+			Contract contract = contractMapper.selectByPrimaryKey(task.getContractId());
+			return setTaskDistribution(contract);
+		}
+		return 0;
+	}
 }