Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 anni fa
parent
commit
ebea808bbe

+ 2 - 1
GeneratorConfig.xml

@@ -10,6 +10,7 @@
     <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="contract_task"/> 
+    <table schema="aft" tableName="t_order"/> 
+    <table schema="aft" tableName="contract"/> 
   </context>
 </generatorConfiguration>

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

@@ -12,67 +12,67 @@ import com.goafanti.common.model.ContractTask;
 public interface ContractMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKey(Contract record);
 

+ 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	long countByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int deleteByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int deleteByPrimaryKey(String orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int insert(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int insertSelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	TOrder selectByPrimaryKey(String orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKeySelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKey(TOrder record);
 

+ 22 - 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 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
@@ -13,7 +13,7 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="creater" jdbcType="VARCHAR" property="creater" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="principal" jdbcType="VARCHAR" property="principal" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
     <result column="sign_date" jdbcType="TIMESTAMP" property="signDate" />
@@ -30,7 +30,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -64,7 +64,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -98,7 +98,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 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, 
@@ -108,7 +108,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select
     <if test="distinct">
@@ -127,7 +127,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -138,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     delete from contract
     where id = #{id,jdbcType=VARCHAR}
@@ -147,7 +147,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     delete from contract
     <if test="_parameter != null">
@@ -158,7 +158,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     insert into contract (id, serial_number, create_time, 
       update_time, creater, name, 
@@ -169,7 +169,7 @@
       )
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{creater,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{type,jdbcType=INTEGER}, #{principal,jdbcType=VARCHAR}, #{uid,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}
@@ -179,7 +179,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     insert into contract
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -258,7 +258,7 @@
         #{name,jdbcType=VARCHAR},
       </if>
       <if test="type != null">
-        #{type,jdbcType=INTEGER},
+        #{type,jdbcType=VARCHAR},
       </if>
       <if test="principal != null">
         #{principal,jdbcType=VARCHAR},
@@ -299,7 +299,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select count(*) from contract
     <if test="_parameter != null">
@@ -310,7 +310,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update contract
     <set>
@@ -333,7 +333,7 @@
         name = #{record.name,jdbcType=VARCHAR},
       </if>
       <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
+        type = #{record.type,jdbcType=VARCHAR},
       </if>
       <if test="record.principal != null">
         principal = #{record.principal,jdbcType=VARCHAR},
@@ -377,7 +377,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update contract
     set id = #{record.id,jdbcType=VARCHAR},
@@ -386,7 +386,7 @@
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       creater = #{record.creater,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
-      type = #{record.type,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
       principal = #{record.principal,jdbcType=VARCHAR},
       uid = #{record.uid,jdbcType=VARCHAR},
       sign_date = #{record.signDate,jdbcType=TIMESTAMP},
@@ -406,7 +406,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update contract
     <set>
@@ -426,7 +426,7 @@
         name = #{name,jdbcType=VARCHAR},
       </if>
       <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+        type = #{type,jdbcType=VARCHAR},
       </if>
       <if test="principal != null">
         principal = #{principal,jdbcType=VARCHAR},
@@ -468,7 +468,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update contract
     set serial_number = #{serialNumber,jdbcType=INTEGER},
@@ -476,7 +476,7 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       creater = #{creater,jdbcType=VARCHAR},
       name = #{name,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
       principal = #{principal,jdbcType=VARCHAR},
       uid = #{uid,jdbcType=VARCHAR},
       sign_date = #{signDate,jdbcType=TIMESTAMP},

+ 54 - 32
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 Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_type" jdbcType="INTEGER" property="orderType" />
@@ -41,12 +41,13 @@
     <result column="set_up_time" jdbcType="TIMESTAMP" property="setUpTime" />
     <result column="settlement_time" jdbcType="TIMESTAMP" property="settlementTime" />
     <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
+    <result column="contract_type" jdbcType="VARCHAR" property="contractType" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrder">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
   </resultMap>
@@ -54,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -88,7 +89,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -122,20 +123,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 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, 
     actually_total_amount, sign_brokerage_amount, actually_brokerage_amount, sign_withdraw_amount, 
     actually_withdraw_amount, order_stage, project_stage, order_status, liquidation_status, 
     order_channel, approval, order_remarks, delete_sign, salesman_id, finance_id, technician_id, 
-    confirm_time, sign_time, set_up_time, settlement_time, contract_no
+    confirm_time, sign_time, set_up_time, settlement_time, contract_no, contract_type
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     contract_picture_url
   </sql>
@@ -143,7 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select
     <if test="distinct">
@@ -164,7 +165,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select
     <if test="distinct">
@@ -183,7 +184,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -196,7 +197,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     delete from t_order
     where order_no = #{orderNo,jdbcType=VARCHAR}
@@ -205,7 +206,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     delete from t_order
     <if test="_parameter != null">
@@ -216,7 +217,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     insert into t_order (order_no, order_type, creater, 
       create_time, update_time, buyer_id, 
@@ -229,8 +230,8 @@
       approval, order_remarks, delete_sign, 
       salesman_id, finance_id, technician_id, 
       confirm_time, sign_time, set_up_time, 
-      settlement_time, contract_no, contract_picture_url
-      )
+      settlement_time, contract_no, contract_type, 
+      contract_picture_url)
     values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, 
       #{sellerId,jdbcType=VARCHAR}, #{firstPayment,jdbcType=DECIMAL}, #{orderAmount,jdbcType=DECIMAL}, 
@@ -242,14 +243,14 @@
       #{approval,jdbcType=INTEGER}, #{orderRemarks,jdbcType=VARCHAR}, #{deleteSign,jdbcType=INTEGER}, 
       #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR}, #{technicianId,jdbcType=VARCHAR}, 
       #{confirmTime,jdbcType=TIMESTAMP}, #{signTime,jdbcType=TIMESTAMP}, #{setUpTime,jdbcType=TIMESTAMP}, 
-      #{settlementTime,jdbcType=TIMESTAMP}, #{contractNo,jdbcType=VARCHAR}, #{contractPictureUrl,jdbcType=LONGVARCHAR}
-      )
+      #{settlementTime,jdbcType=TIMESTAMP}, #{contractNo,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR}, 
+      #{contractPictureUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrder">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     insert into t_order
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -355,6 +356,9 @@
       <if test="contractNo != null">
         contract_no,
       </if>
+      <if test="contractType != null">
+        contract_type,
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url,
       </if>
@@ -462,6 +466,9 @@
       <if test="contractNo != null">
         #{contractNo,jdbcType=VARCHAR},
       </if>
+      <if test="contractType != null">
+        #{contractType,jdbcType=VARCHAR},
+      </if>
       <if test="contractPictureUrl != null">
         #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -471,7 +478,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select count(*) from t_order
     <if test="_parameter != null">
@@ -482,7 +489,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     <set>
@@ -588,6 +595,9 @@
       <if test="record.contractNo != null">
         contract_no = #{record.contractNo,jdbcType=VARCHAR},
       </if>
+      <if test="record.contractType != null">
+        contract_type = #{record.contractType,jdbcType=VARCHAR},
+      </if>
       <if test="record.contractPictureUrl != null">
         contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -600,7 +610,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -637,6 +647,7 @@
       set_up_time = #{record.setUpTime,jdbcType=TIMESTAMP},
       settlement_time = #{record.settlementTime,jdbcType=TIMESTAMP},
       contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      contract_type = #{record.contractType,jdbcType=VARCHAR},
       contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -646,7 +657,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -682,7 +693,8 @@
       sign_time = #{record.signTime,jdbcType=TIMESTAMP},
       set_up_time = #{record.setUpTime,jdbcType=TIMESTAMP},
       settlement_time = #{record.settlementTime,jdbcType=TIMESTAMP},
-      contract_no = #{record.contractNo,jdbcType=VARCHAR}
+      contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      contract_type = #{record.contractType,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -691,7 +703,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     <set>
@@ -794,6 +806,9 @@
       <if test="contractNo != null">
         contract_no = #{contractNo,jdbcType=VARCHAR},
       </if>
+      <if test="contractType != null">
+        contract_type = #{contractType,jdbcType=VARCHAR},
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -804,7 +819,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -840,6 +855,7 @@
       set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
       settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
       contract_no = #{contractNo,jdbcType=VARCHAR},
+      contract_type = #{contractType,jdbcType=VARCHAR},
       contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -847,7 +863,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 14:48:59 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -882,7 +898,8 @@
       sign_time = #{signTime,jdbcType=TIMESTAMP},
       set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
       settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
-      contract_no = #{contractNo,jdbcType=VARCHAR}
+      contract_no = #{contractNo,jdbcType=VARCHAR},
+      contract_type = #{contractType,jdbcType=VARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
   
@@ -1188,13 +1205,15 @@
 			a.technician_id as technicianId,
 			e.name as technicianName,
 			a.delete_sign as deleteSign,
-			a.contract_no as contractNo
+			a.contract_no as contractNo,
+			f.cname as projectType
 		from
 			t_order a left join user b on
 			a.buyer_id = b.id left join admin c on
 			a.salesman_id = c.id left join admin d on
 			a.finance_id = d.id left join admin e on
-			a.technician_id = e.id
+			a.technician_id = e.id left join business_varieties f on
+			a.contract_type = f.id
 		where a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
   
@@ -1544,14 +1563,16 @@
 			c.name as salesmanName,
 			d.name as financeName,
 			e.name as technicianName,
-			f.name as departmentName
+			f.name as departmentName,
+			g.cname as projectName
 		from
 			t_order a left join user b on
 			a.buyer_id = b.id left join admin c on
 			a.salesman_id = c.id left join admin d on
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department_management f on 
-			d.department_id = f.id
+			d.department_id = f.id left join business_varieties g on
+			a.contract_type = g.id
 		where a.order_type = 0 and a.order_status = 3 
 			and (a.liquidation_status = 1 or a.liquidation_status = 2 or a.approval = 2) <!-- 已首付 or 已付清 or 已特批 -->
 		<if test="salesmanId != null">
@@ -1598,7 +1619,8 @@
 			a.salesman_id = c.id left join admin d on
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department_management f on 
-			d.department_id = f.id
+			d.department_id = f.id left join business_varieties g on
+			a.contract_type = g.id
 		where a.order_type = 0 and a.order_status = 3 
 			and (a.liquidation_status = 1 or a.liquidation_status = 2 or a.approval = 2) <!-- 已首付 or 已付清 or 已特批 -->
 		<if test="salesmanId != null">

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

@@ -575,7 +575,7 @@
 		a.order_no as orderNo,
 		a.type as projectType,
 		b.nickname as buyerName,
-		b.type as buyerType,
+		f.cname as buyerType,
 		c.create_time as orderTime,
 		c.order_status as orderStatus,
 		c.liquidation_status as liquidationStatus,
@@ -587,7 +587,8 @@
 		a.uid = b.id left join t_order c on
 		a.order_no = c.order_no left join admin d on
 		c.salesman_id = d.id left join department_management e on
-		d.department_id = e.id
+		d.department_id = e.id left join business_varieties f on
+		a.type = f.id
 	where 1=1
 	<if test="deleteSign != null">
 		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
@@ -630,7 +631,9 @@
 		contract a left join user b on
 		a.uid = b.id left join t_order c on
 		a.order_no = c.order_no left join admin d on
-		c.salesman_id = d.id
+		c.salesman_id = d.id left join department_management e on
+		d.department_id = e.id left join business_varieties f on
+		a.type = f.id
 	where 1=1
 	<if test="deleteSign != null">
 		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
@@ -682,14 +685,16 @@
 				b.nickname as buyerName,
 				c.name as technicianName,
 				d.name as principalName,
-				f.name as buyerProvince
+				f.name as buyerProvince,
+				g.cname as projectType
 			from
 				contract a left join user b on
 				a.uid = b.id left join admin c on
 				a.uid = c.id left join admin d on
 				a.principal = d.id left join user_identity e on
 				a.uid = e.uid left join district_glossory f on
-				e.province  = f.id
+				e.province  = f.id left join business_varieties g on
+				a.type = g.id
 			where a.id = #{contractId,jdbcType=VARCHAR}
 	  	</when>
 	  		<when test="buyerType == 1">
@@ -708,14 +713,16 @@
 				b.nickname as buyerName,
 				c.name as technicianName,
 				d.name as principalName,
-				f.name as buyerProvince
+				f.name as buyerProvince,
+				g.cname as projectType
 			from
 				contract a left join user b on
 				a.uid = b.id left join admin c on
 				a.uid = c.id left join admin d on
 				a.principal = d.id left join organization_identity e on
 				a.uid = e.uid left join district_glossory f on
-				e.location_province  = f.id
+				e.location_province  = f.id left join business_varieties g on
+				a.type = g.id
 			where a.id = #{contractId,jdbcType=VARCHAR}
 	  	</when>
 	  </choose>

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

@@ -6,99 +6,99 @@ public class Contract {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.id
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
-	private Integer type;
+	private String type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.principal
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String contactMobile;
 
 	/**
 	 * 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -107,7 +107,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -116,7 +116,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getSerialNumber() {
 		return serialNumber;
@@ -125,7 +125,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
@@ -134,7 +134,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -143,7 +143,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -152,7 +152,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -161,7 +161,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -170,7 +170,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getCreater() {
 		return creater;
@@ -179,7 +179,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -188,7 +188,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getName() {
 		return name;
@@ -197,7 +197,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -206,25 +206,25 @@ 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
-	public Integer getType() {
+	public String getType() {
 		return type;
 	}
 
 	/**
 	 * 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
-	public void setType(Integer type) {
+	public void setType(String type) {
 		this.type = type;
 	}
 
 	/**
 	 * 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getPrincipal() {
 		return principal;
@@ -233,7 +233,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setPrincipal(String principal) {
 		this.principal = principal;
@@ -242,7 +242,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getUid() {
 		return uid;
@@ -251,7 +251,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -260,7 +260,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getSignDate() {
 		return signDate;
@@ -269,7 +269,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignDate(Date signDate) {
 		this.signDate = signDate;
@@ -278,7 +278,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getSignComment() {
 		return signComment;
@@ -287,7 +287,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignComment(String signComment) {
 		this.signComment = signComment;
@@ -296,7 +296,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getCompleteDate() {
 		return completeDate;
@@ -305,7 +305,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCompleteDate(Date completeDate) {
 		this.completeDate = completeDate;
@@ -314,7 +314,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getCompleteComment() {
 		return completeComment;
@@ -323,7 +323,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCompleteComment(String completeComment) {
 		this.completeComment = completeComment;
@@ -332,7 +332,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getDeletedSign() {
 		return deletedSign;
@@ -341,7 +341,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setDeletedSign(Integer deletedSign) {
 		this.deletedSign = deletedSign;
@@ -350,7 +350,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -359,7 +359,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -368,7 +368,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getStatus() {
 		return status;
@@ -377,7 +377,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -386,7 +386,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getContacts() {
 		return contacts;
@@ -395,7 +395,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -404,7 +404,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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -413,7 +413,7 @@ 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;

+ 36 - 26
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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -563,52 +563,62 @@ public class ContractExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeEqualTo(Integer value) {
+		public Criteria andTypeEqualTo(String value) {
 			addCriterion("type =", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotEqualTo(Integer value) {
+		public Criteria andTypeNotEqualTo(String value) {
 			addCriterion("type <>", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThan(Integer value) {
+		public Criteria andTypeGreaterThan(String value) {
 			addCriterion("type >", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+		public Criteria andTypeGreaterThanOrEqualTo(String value) {
 			addCriterion("type >=", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThan(Integer value) {
+		public Criteria andTypeLessThan(String value) {
 			addCriterion("type <", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThanOrEqualTo(Integer value) {
+		public Criteria andTypeLessThanOrEqualTo(String value) {
 			addCriterion("type <=", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIn(List<Integer> values) {
+		public Criteria andTypeLike(String value) {
+			addCriterion("type like", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotLike(String value) {
+			addCriterion("type not like", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeIn(List<String> values) {
 			addCriterion("type in", values, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotIn(List<Integer> values) {
+		public Criteria andTypeNotIn(List<String> values) {
 			addCriterion("type not in", values, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeBetween(Integer value1, Integer value2) {
+		public Criteria andTypeBetween(String value1, String value2) {
 			addCriterion("type between", value1, value2, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+		public Criteria andTypeNotBetween(String value1, String value2) {
 			addCriterion("type not between", value1, value2, "type");
 			return (Criteria) this;
 		}
@@ -1346,7 +1356,7 @@ public class ContractExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -7,184 +7,189 @@ public class TOrder {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_no
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer orderType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.creater
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer orderChannel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.approval
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 16:57:09 CST 2018
+	 */
+	private String contractType;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_picture_url
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -193,7 +198,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -202,7 +207,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getOrderType() {
 		return orderType;
@@ -211,7 +216,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
@@ -220,7 +225,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getCreater() {
 		return creater;
@@ -229,7 +234,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -238,7 +243,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -247,7 +252,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -256,7 +261,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -265,7 +270,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -274,7 +279,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -283,7 +288,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -292,7 +297,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getSellerId() {
 		return sellerId;
@@ -301,7 +306,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSellerId(String sellerId) {
 		this.sellerId = sellerId;
@@ -310,7 +315,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getFirstPayment() {
 		return firstPayment;
@@ -319,7 +324,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setFirstPayment(BigDecimal firstPayment) {
 		this.firstPayment = firstPayment;
@@ -328,7 +333,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getOrderAmount() {
 		return orderAmount;
@@ -337,7 +342,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderAmount(BigDecimal orderAmount) {
 		this.orderAmount = orderAmount;
@@ -346,7 +351,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getBrokerageAmount() {
 		return brokerageAmount;
@@ -355,7 +360,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setBrokerageAmount(BigDecimal brokerageAmount) {
 		this.brokerageAmount = brokerageAmount;
@@ -364,7 +369,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getSignFirstPayment() {
 		return signFirstPayment;
@@ -373,7 +378,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignFirstPayment(BigDecimal signFirstPayment) {
 		this.signFirstPayment = signFirstPayment;
@@ -382,7 +387,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getActuallyFirstPayment() {
 		return actuallyFirstPayment;
@@ -391,7 +396,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setActuallyFirstPayment(BigDecimal actuallyFirstPayment) {
 		this.actuallyFirstPayment = actuallyFirstPayment;
@@ -400,7 +405,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getSignTotalAmount() {
 		return signTotalAmount;
@@ -409,7 +414,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignTotalAmount(BigDecimal signTotalAmount) {
 		this.signTotalAmount = signTotalAmount;
@@ -418,7 +423,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getActuallyTotalAmount() {
 		return actuallyTotalAmount;
@@ -427,7 +432,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setActuallyTotalAmount(BigDecimal actuallyTotalAmount) {
 		this.actuallyTotalAmount = actuallyTotalAmount;
@@ -436,7 +441,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getSignBrokerageAmount() {
 		return signBrokerageAmount;
@@ -445,7 +450,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignBrokerageAmount(BigDecimal signBrokerageAmount) {
 		this.signBrokerageAmount = signBrokerageAmount;
@@ -454,7 +459,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getActuallyBrokerageAmount() {
 		return actuallyBrokerageAmount;
@@ -463,7 +468,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setActuallyBrokerageAmount(BigDecimal actuallyBrokerageAmount) {
 		this.actuallyBrokerageAmount = actuallyBrokerageAmount;
@@ -472,7 +477,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getSignWithdrawAmount() {
 		return signWithdrawAmount;
@@ -481,7 +486,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignWithdrawAmount(BigDecimal signWithdrawAmount) {
 		this.signWithdrawAmount = signWithdrawAmount;
@@ -490,7 +495,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getActuallyWithdrawAmount() {
 		return actuallyWithdrawAmount;
@@ -499,7 +504,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setActuallyWithdrawAmount(BigDecimal actuallyWithdrawAmount) {
 		this.actuallyWithdrawAmount = actuallyWithdrawAmount;
@@ -508,7 +513,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getOrderStage() {
 		return orderStage;
@@ -517,7 +522,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderStage(Integer orderStage) {
 		this.orderStage = orderStage;
@@ -526,7 +531,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getProjectStage() {
 		return projectStage;
@@ -535,7 +540,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setProjectStage(Integer projectStage) {
 		this.projectStage = projectStage;
@@ -544,7 +549,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -553,7 +558,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -562,7 +567,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -571,7 +576,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
@@ -580,7 +585,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getOrderChannel() {
 		return orderChannel;
@@ -589,7 +594,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderChannel(Integer orderChannel) {
 		this.orderChannel = orderChannel;
@@ -598,7 +603,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getApproval() {
 		return approval;
@@ -607,7 +612,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setApproval(Integer approval) {
 		this.approval = approval;
@@ -616,7 +621,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getOrderRemarks() {
 		return orderRemarks;
@@ -625,7 +630,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
@@ -634,7 +639,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -643,7 +648,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -652,7 +657,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -661,7 +666,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -670,7 +675,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -679,7 +684,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -688,7 +693,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getTechnicianId() {
 		return technicianId;
@@ -697,7 +702,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setTechnicianId(String technicianId) {
 		this.technicianId = technicianId;
@@ -706,7 +711,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getConfirmTime() {
 		return confirmTime;
@@ -715,7 +720,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setConfirmTime(Date confirmTime) {
 		this.confirmTime = confirmTime;
@@ -724,7 +729,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getSignTime() {
 		return signTime;
@@ -733,7 +738,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignTime(Date signTime) {
 		this.signTime = signTime;
@@ -742,7 +747,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getSetUpTime() {
 		return setUpTime;
@@ -751,7 +756,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSetUpTime(Date setUpTime) {
 		this.setUpTime = setUpTime;
@@ -760,7 +765,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getSettlementTime() {
 		return settlementTime;
@@ -769,7 +774,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSettlementTime(Date settlementTime) {
 		this.settlementTime = settlementTime;
@@ -778,7 +783,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getContractNo() {
 		return contractNo;
@@ -787,16 +792,34 @@ 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
 	}
 
 	/**
+	 * 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  Fri Mar 02 16:57:09 CST 2018
+	 */
+	public String getContractType() {
+		return contractType;
+	}
+
+	/**
+	 * 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  Fri Mar 02 16:57:09 CST 2018
+	 */
+	public void setContractType(String contractType) {
+		this.contractType = contractType;
+	}
+
+	/**
 	 * 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getContractPictureUrl() {
 		return contractPictureUrl;
@@ -805,7 +828,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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setContractPictureUrl(String contractPictureUrl) {
 		this.contractPictureUrl = contractPictureUrl;

+ 86 - 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 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  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2293,11 +2293,81 @@ public class TOrderExample {
 			addCriterion("contract_no not between", value1, value2, "contractNo");
 			return (Criteria) this;
 		}
+
+		public Criteria andContractTypeIsNull() {
+			addCriterion("contract_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeIsNotNull() {
+			addCriterion("contract_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeEqualTo(String value) {
+			addCriterion("contract_type =", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeNotEqualTo(String value) {
+			addCriterion("contract_type <>", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeGreaterThan(String value) {
+			addCriterion("contract_type >", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeGreaterThanOrEqualTo(String value) {
+			addCriterion("contract_type >=", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeLessThan(String value) {
+			addCriterion("contract_type <", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeLessThanOrEqualTo(String value) {
+			addCriterion("contract_type <=", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeLike(String value) {
+			addCriterion("contract_type like", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeNotLike(String value) {
+			addCriterion("contract_type not like", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeIn(List<String> values) {
+			addCriterion("contract_type in", values, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeNotIn(List<String> values) {
+			addCriterion("contract_type not in", values, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeBetween(String value1, String value2) {
+			addCriterion("contract_type between", value1, value2, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeNotBetween(String value1, String value2) {
+			addCriterion("contract_type not between", value1, value2, "contractType");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 14:48:59 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 8 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -10,6 +10,8 @@ public class OrderListBo {
 	private String orderNo;
 	/** 订单类型 **/
 	private Integer orderType;
+	/** 业务品类 **/
+	private String projectType;
 	/** 订单创建时间 **/
 	private String createTime;
 	/** 合同首付金额 **/
@@ -62,6 +64,12 @@ public class OrderListBo {
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
 	}
+	public String getProjectType() {
+		return projectType;
+	}
+	public void setProjectType(String projectType) {
+		this.projectType = projectType;
+	}
 	public String getCreateTime() {
 		return createTime;
 	}

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

@@ -330,7 +330,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/createOrder",method = RequestMethod.POST)
-	public Result createOrder(String uid,Integer orderType){
+	public Result createOrder(String uid,Integer orderType,String contractType){
 		Result res = new Result();
 		if(StringUtils.isBlank(uid)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","客户编号"));
@@ -343,8 +343,13 @@ public class AdminOrderApiController extends CertifyApiController {
 		if(orderType != CommodityType.SERVICE.getTypeCode()){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","暂不支持创建该类型订单"));
 			return res;
+		}else {
+			if(StringUtils.isBlank(contractType)) {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","业务品类"));
+				return res;
+			}
 		}
-		orderServiceImpl.createServiceOrder(uid,orderType);
+		orderServiceImpl.createServiceOrder(uid,orderType,contractType);
 		return res;
 	}
 	

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

@@ -229,9 +229,10 @@ public interface OrderService {
 	 * 创建订单
 	 * @param uid
 	 * @param orderType
+	 * @param contractType 合同类型
 	 * @return
 	 */
-	int createServiceOrder(String uid, Integer orderType);
+	int createServiceOrder(String uid, Integer orderType,String contractType);
 
 	/**
 	 * 查询公共订单

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

@@ -1113,7 +1113,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
-	public int createServiceOrder(String uid, Integer orderType) {
+	public int createServiceOrder(String uid, Integer orderType,String contractType) {
 		BigDecimal initial = new BigDecimal(0);
 		TOrder tOrder = new TOrder();
 		tOrder.setOrderType(orderType);
@@ -1133,6 +1133,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setOrderChannel(OrderChannel.PORTAL.getCode());	
 		tOrder.setDeleteSign(ActiveState.NORMAL.getCode());
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
+		tOrder.setContractType(contractType);
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		return tOrderMapper.insert(tOrder);
 	}
@@ -1381,7 +1382,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		String contractId = UUID.randomUUID().toString().replace("-", "");
 		contract.setId(contractId);
 		contract.setCreateTime(createTime);
-		contract.setType(tOrder.getOrderType());
+		contract.setType(tOrder.getContractType());
 		contract.setSignDate(createTime);
 		contract.setOrderNo(orderNo);
 		contract.setStatus(ProjectStage.ALREADY_SET_UP.getCode());

+ 36 - 3
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -624,13 +624,13 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/createProject",method = RequestMethod.POST)
-	public Result createProject(String uid,String aid,Integer projectType,String signComment){
+	public Result createProject(String uid,String aid,String contractType,String signComment){
 		Result res = new Result();
-		if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid) || projectType==null){
+		if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid) || contractType == null){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "客户和项目负责人"));
 			return res;
 		} 
-		techProjectService.createProject(uid, aid, signComment);
+		techProjectService.createProject(uid, aid, signComment,contractType);
 		return res;
 	}
 	
@@ -841,6 +841,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 				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.setTaskStatus(TaskState.STARTED.getCode());
 			techProjectService.updateProjectTask(task);
 		}
@@ -865,6 +869,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 				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.setTaskStatus(TaskState.COMPLETE.getCode());
 			techProjectService.updateProjectTask(task);
 		}
@@ -907,4 +915,29 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateRevokeOrComplete(contractId,operatorType,completeComment);
 		return res;
 	}
+	
+	/**
+	 * 锁定、解锁、废除任务
+	 * @param taskId
+	 * @param operatorType
+	 * @return
+	 */
+	@RequestMapping(value = "/lockOrRevokeOrder", method = RequestMethod.GET)
+	public Result lockOrRevokeOrder(String taskId,Integer operatorType){
+		Result res = new Result();
+		if(StringUtils.isBlank(taskId) || operatorType == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号和操作类型"));
+			return res;
+		}
+		ContractTask task = techProjectService.selectTaskById(taskId);
+		if(task.getDeletedSign() == DeleteStatus.UNDELETE.getCode() && operatorType == 2){ //锁定
+			task.setDeletedSign(DeleteStatus.LOCKING.getCode());
+		}else if(task.getDeletedSign() == DeleteStatus.LOCKING.getCode() && operatorType == 0){ //解锁
+			task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+		}else if(task.getDeletedSign() == DeleteStatus.UNDELETE.getCode() && operatorType == 1){ //废除
+			task.setDeletedSign(DeleteStatus.DELETED.getCode());
+		}
+		techProjectService.updateProjectTask(task);
+		return res;
+	}
 }

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

@@ -63,7 +63,7 @@ public interface TechProjectService {
 	 * @param signComment
 	 * @return
 	 */
-	int createProject(String uid,String aid,String signComment) ;
+	int createProject(String uid,String aid,String signComment,String contractType) ;
 
 	/**
 	 * 查询项目详情

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

@@ -329,7 +329,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	}
 
 	@Override
-	public int createProject(String uid, String aid, String signComment) {
+	public int createProject(String uid, String aid, String signComment,String contractType) {
 		Contract contract = new Contract();
 		Date signDate = new Date();
 		contract.setId(UUID.randomUUID().toString());
@@ -337,7 +337,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		contract.setSignComment(signComment);
 		contract.setCreateTime(signDate);
 		contract.setSignDate(signDate);
-		contract.setType(CommodityType.SERVICE.getTypeCode());
+		contract.setType(contractType);
 		contract.setUid(uid);
 		contract.setCreater(TokenManager.getAdminId());
 		contract.setPrincipal(aid);