Browse Source

订单管理开发

anderx 7 years ago
parent
commit
57ab765ce3
23 changed files with 7836 additions and 6 deletions
  1. 2 2
      GeneratorConfig.xml
  2. 5 0
      src/main/java/com/goafanti/common/controller/WebpageController.java
  3. 120 0
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  4. 122 0
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  5. 2 0
      src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java
  6. 798 0
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  7. 644 0
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  8. 8 0
      src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml
  9. 996 0
      src/main/java/com/goafanti/common/model/TOrderNew.java
  10. 2211 0
      src/main/java/com/goafanti/common/model/TOrderNewExample.java
  11. 699 0
      src/main/java/com/goafanti/common/model/TOrderTask.java
  12. 1611 0
      src/main/java/com/goafanti/common/model/TOrderTaskExample.java
  13. 88 2
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  14. 49 0
      src/main/java/com/goafanti/order/enums/ApprovalNewState.java
  15. 55 0
      src/main/java/com/goafanti/order/enums/LiquidationNewState.java
  16. 57 0
      src/main/java/com/goafanti/order/enums/OrderNewState.java
  17. 58 0
      src/main/java/com/goafanti/order/enums/ProcessStatus.java
  18. 60 0
      src/main/java/com/goafanti/order/enums/ProjectNewStage.java
  19. 49 0
      src/main/java/com/goafanti/order/enums/TaskState.java
  20. 40 1
      src/main/java/com/goafanti/order/service/OrderNewService.java
  21. 144 0
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  22. 0 1
      src/main/resources/props/error.properties
  23. 18 0
      src/main/webapp/WEB-INF/views/admin/project.html

+ 2 - 2
GeneratorConfig.xml

@@ -4,11 +4,11 @@
   <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" />
    <!-- <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" /> -->
   <context id="context1">	
-    <jdbcConnection connectionURL="jdbc:mysql://192.168.1.213:3306/aft" 
+    <jdbcConnection connectionURL="jdbc:mysql://192.168.0.17:3306/aft" 
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
     <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="organization_annual_report"/> 
+    <table schema="aft" tableName="t_order_task"/> 
   </context>
 </generatorConfiguration>

+ 5 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -208,6 +208,11 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/admin/order");
 		return modelview;
 	}
+	@RequestMapping(value = "/admin/project", method = RequestMethod.GET)
+	public ModelAndView adminProject(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/admin/project");
+		return modelview;
+	}
 
 	@RequestMapping(value = "/admin/operate", method = RequestMethod.GET)
 	public ModelAndView adminOperate(HttpServletRequest request, ModelAndView modelview){

+ 120 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -0,0 +1,120 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderNewExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TOrderNewMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    long countByExample(TOrderNewExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int deleteByExample(TOrderNewExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int deleteByPrimaryKey(String orderNo);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int insert(TOrderNew record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int insertSelective(TOrderNew record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    List<TOrderNew> selectByExampleWithBLOBs(TOrderNewExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    List<TOrderNew> selectByExample(TOrderNewExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    TOrderNew selectByPrimaryKey(String orderNo);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int updateByExampleWithBLOBs(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int updateByExample(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int updateByPrimaryKeySelective(TOrderNew record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int updateByPrimaryKeyWithBLOBs(TOrderNew record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_new
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    int updateByPrimaryKey(TOrderNew record);
+}

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

@@ -0,0 +1,122 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TOrderTask;
+import com.goafanti.common.model.TOrderTaskExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TOrderTaskMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    long countByExample(TOrderTaskExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int deleteByExample(TOrderTaskExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int insert(TOrderTask record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int insertSelective(TOrderTask record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    List<TOrderTask> selectByExample(TOrderTaskExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    TOrderTask selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int updateByPrimaryKeySelective(TOrderTask record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int updateByPrimaryKeyWithBLOBs(TOrderTask record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_task
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    int updateByPrimaryKey(TOrderTask record);
+
+	List<TOrderTask> selectOrderTask(String orderNo);
+}

+ 2 - 0
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -98,4 +98,6 @@ public interface UserLockReleaseMapper {
 	List<LockingReleaseBo> selectPendinglockUserList();
 
 	void updateProject(@Param("uid")String uid, @Param("aid")String aid, @Param("businessProjectId")String businessProjectId);
+
+	List<LockingReleaseBo> checkTask(@Param("buyerId")String buyerId, @Param("commodityId")String commodityId);
 }

+ 798 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -0,0 +1,798 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.TOrderNewMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="order_type" jdbcType="INTEGER" property="orderType" />
+    <result column="creater" jdbcType="VARCHAR" property="creater" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="buyer_id" jdbcType="VARCHAR" property="buyerId" />
+    <result column="first_amount" jdbcType="DECIMAL" property="firstAmount" />
+    <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
+    <result column="settlement_amount" jdbcType="DECIMAL" property="settlementAmount" />
+    <result column="order_status" jdbcType="INTEGER" property="orderStatus" />
+    <result column="liquidation_status" jdbcType="INTEGER" property="liquidationStatus" />
+    <result column="process_status" jdbcType="INTEGER" property="processStatus" />
+    <result column="project_status" jdbcType="INTEGER" property="projectStatus" />
+    <result column="approval" jdbcType="INTEGER" property="approval" />
+    <result column="order_remarks" jdbcType="VARCHAR" property="orderRemarks" />
+    <result column="delete_sign" jdbcType="INTEGER" property="deleteSign" />
+    <result column="salesman_id" jdbcType="VARCHAR" property="salesmanId" />
+    <result column="finance_id" jdbcType="VARCHAR" property="financeId" />
+    <result column="technician_id" jdbcType="VARCHAR" property="technicianId" />
+    <result column="sign_time" jdbcType="DATE" property="signTime" />
+    <result column="settlement_time" jdbcType="DATE" property="settlementTime" />
+    <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
+    <result column="contract_type" jdbcType="VARCHAR" property="contractType" />
+    <result column="contacts" jdbcType="VARCHAR" property="contacts" />
+    <result column="contact_mobile" jdbcType="VARCHAR" property="contactMobile" />
+    <result column="legal_person" jdbcType="VARCHAR" property="legalPerson" />
+    <result column="legal_person_tel" jdbcType="VARCHAR" property="legalPersonTel" />
+    <result column="proof_count" jdbcType="REAL" property="proofCount" />
+    <result column="proof_aid" jdbcType="VARCHAR" property="proofAid" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    <result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    order_no, order_type, creater, create_time, update_time, buyer_id, first_amount, 
+    total_amount, settlement_amount, order_status, liquidation_status, process_status, 
+    project_status, approval, order_remarks, delete_sign, salesman_id, finance_id, technician_id, 
+    sign_time, settlement_time, contract_no, contract_type, contacts, contact_mobile, 
+    legal_person, legal_person_tel, proof_count, proof_aid
+  </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 Mon Nov 19 10:12:37 CST 2018.
+    -->
+    contract_picture_url
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.TOrderNewExample" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from t_order_new
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_order_new
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from t_order_new
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    delete from t_order_new
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderNewExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    delete from t_order_new
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TOrderNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    insert into t_order_new (order_no, order_type, creater, 
+      create_time, update_time, buyer_id, 
+      first_amount, total_amount, settlement_amount, 
+      order_status, liquidation_status, process_status, 
+      project_status, approval, order_remarks, 
+      delete_sign, salesman_id, finance_id, 
+      technician_id, sign_time, settlement_time, 
+      contract_no, contract_type, contacts, 
+      contact_mobile, legal_person, legal_person_tel, 
+      proof_count, proof_aid, contract_picture_url
+      )
+    values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, 
+      #{firstAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL}, 
+      #{orderStatus,jdbcType=INTEGER}, #{liquidationStatus,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER}, 
+      #{projectStatus,jdbcType=INTEGER}, #{approval,jdbcType=INTEGER}, #{orderRemarks,jdbcType=VARCHAR}, 
+      #{deleteSign,jdbcType=INTEGER}, #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR}, 
+      #{technicianId,jdbcType=VARCHAR}, #{signTime,jdbcType=DATE}, #{settlementTime,jdbcType=DATE}, 
+      #{contractNo,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
+      #{contactMobile,jdbcType=VARCHAR}, #{legalPerson,jdbcType=VARCHAR}, #{legalPersonTel,jdbcType=VARCHAR}, 
+      #{proofCount,jdbcType=REAL}, #{proofAid,jdbcType=VARCHAR}, #{contractPictureUrl,jdbcType=LONGVARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    insert into t_order_new
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="orderType != null">
+        order_type,
+      </if>
+      <if test="creater != null">
+        creater,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="buyerId != null">
+        buyer_id,
+      </if>
+      <if test="firstAmount != null">
+        first_amount,
+      </if>
+      <if test="totalAmount != null">
+        total_amount,
+      </if>
+      <if test="settlementAmount != null">
+        settlement_amount,
+      </if>
+      <if test="orderStatus != null">
+        order_status,
+      </if>
+      <if test="liquidationStatus != null">
+        liquidation_status,
+      </if>
+      <if test="processStatus != null">
+        process_status,
+      </if>
+      <if test="projectStatus != null">
+        project_status,
+      </if>
+      <if test="approval != null">
+        approval,
+      </if>
+      <if test="orderRemarks != null">
+        order_remarks,
+      </if>
+      <if test="deleteSign != null">
+        delete_sign,
+      </if>
+      <if test="salesmanId != null">
+        salesman_id,
+      </if>
+      <if test="financeId != null">
+        finance_id,
+      </if>
+      <if test="technicianId != null">
+        technician_id,
+      </if>
+      <if test="signTime != null">
+        sign_time,
+      </if>
+      <if test="settlementTime != null">
+        settlement_time,
+      </if>
+      <if test="contractNo != null">
+        contract_no,
+      </if>
+      <if test="contractType != null">
+        contract_type,
+      </if>
+      <if test="contacts != null">
+        contacts,
+      </if>
+      <if test="contactMobile != null">
+        contact_mobile,
+      </if>
+      <if test="legalPerson != null">
+        legal_person,
+      </if>
+      <if test="legalPersonTel != null">
+        legal_person_tel,
+      </if>
+      <if test="proofCount != null">
+        proof_count,
+      </if>
+      <if test="proofAid != null">
+        proof_aid,
+      </if>
+      <if test="contractPictureUrl != null">
+        contract_picture_url,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="orderType != null">
+        #{orderType,jdbcType=INTEGER},
+      </if>
+      <if test="creater != null">
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="buyerId != null">
+        #{buyerId,jdbcType=VARCHAR},
+      </if>
+      <if test="firstAmount != null">
+        #{firstAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="totalAmount != null">
+        #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementAmount != null">
+        #{settlementAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="orderStatus != null">
+        #{orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="liquidationStatus != null">
+        #{liquidationStatus,jdbcType=INTEGER},
+      </if>
+      <if test="processStatus != null">
+        #{processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="projectStatus != null">
+        #{projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="approval != null">
+        #{approval,jdbcType=INTEGER},
+      </if>
+      <if test="orderRemarks != null">
+        #{orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteSign != null">
+        #{deleteSign,jdbcType=INTEGER},
+      </if>
+      <if test="salesmanId != null">
+        #{salesmanId,jdbcType=VARCHAR},
+      </if>
+      <if test="financeId != null">
+        #{financeId,jdbcType=VARCHAR},
+      </if>
+      <if test="technicianId != null">
+        #{technicianId,jdbcType=VARCHAR},
+      </if>
+      <if test="signTime != null">
+        #{signTime,jdbcType=DATE},
+      </if>
+      <if test="settlementTime != null">
+        #{settlementTime,jdbcType=DATE},
+      </if>
+      <if test="contractNo != null">
+        #{contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="contractType != null">
+        #{contractType,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="contactMobile != null">
+        #{contactMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPerson != null">
+        #{legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonTel != null">
+        #{legalPersonTel,jdbcType=VARCHAR},
+      </if>
+      <if test="proofCount != null">
+        #{proofCount,jdbcType=REAL},
+      </if>
+      <if test="proofAid != null">
+        #{proofAid,jdbcType=VARCHAR},
+      </if>
+      <if test="contractPictureUrl != null">
+        #{contractPictureUrl,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    select count(*) from t_order_new
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    update t_order_new
+    <set>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderType != null">
+        order_type = #{record.orderType,jdbcType=INTEGER},
+      </if>
+      <if test="record.creater != null">
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.buyerId != null">
+        buyer_id = #{record.buyerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.firstAmount != null">
+        first_amount = #{record.firstAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.totalAmount != null">
+        total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.settlementAmount != null">
+        settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.orderStatus != null">
+        order_status = #{record.orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.liquidationStatus != null">
+        liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.processStatus != null">
+        process_status = #{record.processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.projectStatus != null">
+        project_status = #{record.projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.approval != null">
+        approval = #{record.approval,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderRemarks != null">
+        order_remarks = #{record.orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deleteSign != null">
+        delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      </if>
+      <if test="record.salesmanId != null">
+        salesman_id = #{record.salesmanId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.financeId != null">
+        finance_id = #{record.financeId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.technicianId != null">
+        technician_id = #{record.technicianId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.signTime != null">
+        sign_time = #{record.signTime,jdbcType=DATE},
+      </if>
+      <if test="record.settlementTime != null">
+        settlement_time = #{record.settlementTime,jdbcType=DATE},
+      </if>
+      <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.contacts != null">
+        contacts = #{record.contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contactMobile != null">
+        contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.legalPerson != null">
+        legal_person = #{record.legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.legalPersonTel != null">
+        legal_person_tel = #{record.legalPersonTel,jdbcType=VARCHAR},
+      </if>
+      <if test="record.proofCount != null">
+        proof_count = #{record.proofCount,jdbcType=REAL},
+      </if>
+      <if test="record.proofAid != null">
+        proof_aid = #{record.proofAid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractPictureUrl != null">
+        contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    update t_order_new
+    set order_no = #{record.orderNo,jdbcType=VARCHAR},
+      order_type = #{record.orderType,jdbcType=INTEGER},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      buyer_id = #{record.buyerId,jdbcType=VARCHAR},
+      first_amount = #{record.firstAmount,jdbcType=DECIMAL},
+      total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
+      order_status = #{record.orderStatus,jdbcType=INTEGER},
+      liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
+      process_status = #{record.processStatus,jdbcType=INTEGER},
+      project_status = #{record.projectStatus,jdbcType=INTEGER},
+      approval = #{record.approval,jdbcType=INTEGER},
+      order_remarks = #{record.orderRemarks,jdbcType=VARCHAR},
+      delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      salesman_id = #{record.salesmanId,jdbcType=VARCHAR},
+      finance_id = #{record.financeId,jdbcType=VARCHAR},
+      technician_id = #{record.technicianId,jdbcType=VARCHAR},
+      sign_time = #{record.signTime,jdbcType=DATE},
+      settlement_time = #{record.settlementTime,jdbcType=DATE},
+      contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      contract_type = #{record.contractType,jdbcType=VARCHAR},
+      contacts = #{record.contacts,jdbcType=VARCHAR},
+      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      legal_person = #{record.legalPerson,jdbcType=VARCHAR},
+      legal_person_tel = #{record.legalPersonTel,jdbcType=VARCHAR},
+      proof_count = #{record.proofCount,jdbcType=REAL},
+      proof_aid = #{record.proofAid,jdbcType=VARCHAR},
+      contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    update t_order_new
+    set order_no = #{record.orderNo,jdbcType=VARCHAR},
+      order_type = #{record.orderType,jdbcType=INTEGER},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      buyer_id = #{record.buyerId,jdbcType=VARCHAR},
+      first_amount = #{record.firstAmount,jdbcType=DECIMAL},
+      total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
+      order_status = #{record.orderStatus,jdbcType=INTEGER},
+      liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
+      process_status = #{record.processStatus,jdbcType=INTEGER},
+      project_status = #{record.projectStatus,jdbcType=INTEGER},
+      approval = #{record.approval,jdbcType=INTEGER},
+      order_remarks = #{record.orderRemarks,jdbcType=VARCHAR},
+      delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      salesman_id = #{record.salesmanId,jdbcType=VARCHAR},
+      finance_id = #{record.financeId,jdbcType=VARCHAR},
+      technician_id = #{record.technicianId,jdbcType=VARCHAR},
+      sign_time = #{record.signTime,jdbcType=DATE},
+      settlement_time = #{record.settlementTime,jdbcType=DATE},
+      contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      contract_type = #{record.contractType,jdbcType=VARCHAR},
+      contacts = #{record.contacts,jdbcType=VARCHAR},
+      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      legal_person = #{record.legalPerson,jdbcType=VARCHAR},
+      legal_person_tel = #{record.legalPersonTel,jdbcType=VARCHAR},
+      proof_count = #{record.proofCount,jdbcType=REAL},
+      proof_aid = #{record.proofAid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    update t_order_new
+    <set>
+      <if test="orderType != null">
+        order_type = #{orderType,jdbcType=INTEGER},
+      </if>
+      <if test="creater != null">
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="buyerId != null">
+        buyer_id = #{buyerId,jdbcType=VARCHAR},
+      </if>
+      <if test="firstAmount != null">
+        first_amount = #{firstAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="totalAmount != null">
+        total_amount = #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementAmount != null">
+        settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="orderStatus != null">
+        order_status = #{orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="liquidationStatus != null">
+        liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
+      </if>
+      <if test="processStatus != null">
+        process_status = #{processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="projectStatus != null">
+        project_status = #{projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="approval != null">
+        approval = #{approval,jdbcType=INTEGER},
+      </if>
+      <if test="orderRemarks != null">
+        order_remarks = #{orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=INTEGER},
+      </if>
+      <if test="salesmanId != null">
+        salesman_id = #{salesmanId,jdbcType=VARCHAR},
+      </if>
+      <if test="financeId != null">
+        finance_id = #{financeId,jdbcType=VARCHAR},
+      </if>
+      <if test="technicianId != null">
+        technician_id = #{technicianId,jdbcType=VARCHAR},
+      </if>
+      <if test="signTime != null">
+        sign_time = #{signTime,jdbcType=DATE},
+      </if>
+      <if test="settlementTime != null">
+        settlement_time = #{settlementTime,jdbcType=DATE},
+      </if>
+      <if test="contractNo != null">
+        contract_no = #{contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="contractType != null">
+        contract_type = #{contractType,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        contacts = #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="contactMobile != null">
+        contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPerson != null">
+        legal_person = #{legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonTel != null">
+        legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
+      </if>
+      <if test="proofCount != null">
+        proof_count = #{proofCount,jdbcType=REAL},
+      </if>
+      <if test="proofAid != null">
+        proof_aid = #{proofAid,jdbcType=VARCHAR},
+      </if>
+      <if test="contractPictureUrl != null">
+        contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.TOrderNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    update t_order_new
+    set order_type = #{orderType,jdbcType=INTEGER},
+      creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      buyer_id = #{buyerId,jdbcType=VARCHAR},
+      first_amount = #{firstAmount,jdbcType=DECIMAL},
+      total_amount = #{totalAmount,jdbcType=DECIMAL},
+      settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
+      order_status = #{orderStatus,jdbcType=INTEGER},
+      liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
+      process_status = #{processStatus,jdbcType=INTEGER},
+      project_status = #{projectStatus,jdbcType=INTEGER},
+      approval = #{approval,jdbcType=INTEGER},
+      order_remarks = #{orderRemarks,jdbcType=VARCHAR},
+      delete_sign = #{deleteSign,jdbcType=INTEGER},
+      salesman_id = #{salesmanId,jdbcType=VARCHAR},
+      finance_id = #{financeId,jdbcType=VARCHAR},
+      technician_id = #{technicianId,jdbcType=VARCHAR},
+      sign_time = #{signTime,jdbcType=DATE},
+      settlement_time = #{settlementTime,jdbcType=DATE},
+      contract_no = #{contractNo,jdbcType=VARCHAR},
+      contract_type = #{contractType,jdbcType=VARCHAR},
+      contacts = #{contacts,jdbcType=VARCHAR},
+      contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      legal_person = #{legalPerson,jdbcType=VARCHAR},
+      legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
+      proof_count = #{proofCount,jdbcType=REAL},
+      proof_aid = #{proofAid,jdbcType=VARCHAR},
+      contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR}
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderNew">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 10:12:37 CST 2018.
+    -->
+    update t_order_new
+    set order_type = #{orderType,jdbcType=INTEGER},
+      creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      buyer_id = #{buyerId,jdbcType=VARCHAR},
+      first_amount = #{firstAmount,jdbcType=DECIMAL},
+      total_amount = #{totalAmount,jdbcType=DECIMAL},
+      settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
+      order_status = #{orderStatus,jdbcType=INTEGER},
+      liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
+      process_status = #{processStatus,jdbcType=INTEGER},
+      project_status = #{projectStatus,jdbcType=INTEGER},
+      approval = #{approval,jdbcType=INTEGER},
+      order_remarks = #{orderRemarks,jdbcType=VARCHAR},
+      delete_sign = #{deleteSign,jdbcType=INTEGER},
+      salesman_id = #{salesmanId,jdbcType=VARCHAR},
+      finance_id = #{financeId,jdbcType=VARCHAR},
+      technician_id = #{technicianId,jdbcType=VARCHAR},
+      sign_time = #{signTime,jdbcType=DATE},
+      settlement_time = #{settlementTime,jdbcType=DATE},
+      contract_no = #{contractNo,jdbcType=VARCHAR},
+      contract_type = #{contractType,jdbcType=VARCHAR},
+      contacts = #{contacts,jdbcType=VARCHAR},
+      contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      legal_person = #{legalPerson,jdbcType=VARCHAR},
+      legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
+      proof_count = #{proofCount,jdbcType=REAL},
+      proof_aid = #{proofAid,jdbcType=VARCHAR}
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 644 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -0,0 +1,644 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.TOrderTaskMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="super_id" jdbcType="VARCHAR" property="superId" />
+    <result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
+    <result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
+    <result column="commodity_quantity" jdbcType="INTEGER" property="commodityQuantity" />
+    <result column="commodity_mode" jdbcType="VARCHAR" property="commodityMode" />
+    <result column="commodity_price" jdbcType="DECIMAL" property="commodityPrice" />
+    <result column="task_status" jdbcType="INTEGER" property="taskStatus" />
+    <result column="task_distribution_time" jdbcType="TIMESTAMP" property="taskDistributionTime" />
+    <result column="task_allocator" jdbcType="VARCHAR" property="taskAllocator" />
+    <result column="task_receiver" jdbcType="VARCHAR" property="taskReceiver" />
+    <result column="task_comment" jdbcType="VARCHAR" property="taskComment" />
+    <result column="task_start_time" jdbcType="TIMESTAMP" property="taskStartTime" />
+    <result column="task_end_time" jdbcType="TIMESTAMP" property="taskEndTime" />
+    <result column="project_status" jdbcType="INTEGER" property="projectStatus" />
+    <result column="accept_time" jdbcType="DATE" property="acceptTime" />
+    <result column="review_time" jdbcType="DATE" property="reviewTime" />
+    <result column="publicity_time" jdbcType="DATE" property="publicityTime" />
+    <result column="licence_time" jdbcType="DATE" property="licenceTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    id, order_no, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
+    commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
+    task_comment, task_start_time, task_end_time, project_status, accept_time, review_time, 
+    publicity_time, licence_time
+  </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 Mon Nov 19 11:03:38 CST 2018.
+    -->
+    attachment_url
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.TOrderTaskExample" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from t_order_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_order_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from t_order_task
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    delete from t_order_task
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderTaskExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    delete from t_order_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TOrderTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    insert into t_order_task (id, order_no, super_id, 
+      commodity_id, commodity_name, commodity_quantity, 
+      commodity_mode, commodity_price, task_status, 
+      task_distribution_time, task_allocator, 
+      task_receiver, task_comment, task_start_time, 
+      task_end_time, project_status, accept_time, 
+      review_time, publicity_time, licence_time, 
+      attachment_url)
+    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{superId,jdbcType=VARCHAR}, 
+      #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, 
+      #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, #{taskStatus,jdbcType=INTEGER}, 
+      #{taskDistributionTime,jdbcType=TIMESTAMP}, #{taskAllocator,jdbcType=VARCHAR}, 
+      #{taskReceiver,jdbcType=VARCHAR}, #{taskComment,jdbcType=VARCHAR}, #{taskStartTime,jdbcType=TIMESTAMP}, 
+      #{taskEndTime,jdbcType=TIMESTAMP}, #{projectStatus,jdbcType=INTEGER}, #{acceptTime,jdbcType=DATE}, 
+      #{reviewTime,jdbcType=DATE}, #{publicityTime,jdbcType=DATE}, #{licenceTime,jdbcType=DATE}, 
+      #{attachmentUrl,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    insert into t_order_task
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="superId != null">
+        super_id,
+      </if>
+      <if test="commodityId != null">
+        commodity_id,
+      </if>
+      <if test="commodityName != null">
+        commodity_name,
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity,
+      </if>
+      <if test="commodityMode != null">
+        commodity_mode,
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price,
+      </if>
+      <if test="taskStatus != null">
+        task_status,
+      </if>
+      <if test="taskDistributionTime != null">
+        task_distribution_time,
+      </if>
+      <if test="taskAllocator != null">
+        task_allocator,
+      </if>
+      <if test="taskReceiver != null">
+        task_receiver,
+      </if>
+      <if test="taskComment != null">
+        task_comment,
+      </if>
+      <if test="taskStartTime != null">
+        task_start_time,
+      </if>
+      <if test="taskEndTime != null">
+        task_end_time,
+      </if>
+      <if test="projectStatus != null">
+        project_status,
+      </if>
+      <if test="acceptTime != null">
+        accept_time,
+      </if>
+      <if test="reviewTime != null">
+        review_time,
+      </if>
+      <if test="publicityTime != null">
+        publicity_time,
+      </if>
+      <if test="licenceTime != null">
+        licence_time,
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityMode != null">
+        #{commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityPrice != null">
+        #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskStatus != null">
+        #{taskStatus,jdbcType=INTEGER},
+      </if>
+      <if test="taskDistributionTime != null">
+        #{taskDistributionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskAllocator != null">
+        #{taskAllocator,jdbcType=VARCHAR},
+      </if>
+      <if test="taskReceiver != null">
+        #{taskReceiver,jdbcType=VARCHAR},
+      </if>
+      <if test="taskComment != null">
+        #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="taskStartTime != null">
+        #{taskStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskEndTime != null">
+        #{taskEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="projectStatus != null">
+        #{projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="acceptTime != null">
+        #{acceptTime,jdbcType=DATE},
+      </if>
+      <if test="reviewTime != null">
+        #{reviewTime,jdbcType=DATE},
+      </if>
+      <if test="publicityTime != null">
+        #{publicityTime,jdbcType=DATE},
+      </if>
+      <if test="licenceTime != null">
+        #{licenceTime,jdbcType=DATE},
+      </if>
+      <if test="attachmentUrl != null">
+        #{attachmentUrl,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    select count(*) from t_order_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    update t_order_task
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.superId != null">
+        super_id = #{record.superId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityId != null">
+        commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityName != null">
+        commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityQuantity != null">
+        commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.commodityMode != null">
+        commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityPrice != null">
+        commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.taskStatus != null">
+        task_status = #{record.taskStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.taskDistributionTime != null">
+        task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.taskAllocator != null">
+        task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskReceiver != null">
+        task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskComment != null">
+        task_comment = #{record.taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskStartTime != null">
+        task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.taskEndTime != null">
+        task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.projectStatus != null">
+        project_status = #{record.projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.acceptTime != null">
+        accept_time = #{record.acceptTime,jdbcType=DATE},
+      </if>
+      <if test="record.reviewTime != null">
+        review_time = #{record.reviewTime,jdbcType=DATE},
+      </if>
+      <if test="record.publicityTime != null">
+        publicity_time = #{record.publicityTime,jdbcType=DATE},
+      </if>
+      <if test="record.licenceTime != null">
+        licence_time = #{record.licenceTime,jdbcType=DATE},
+      </if>
+      <if test="record.attachmentUrl != null">
+        attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    update t_order_task
+    set id = #{record.id,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      super_id = #{record.superId,jdbcType=VARCHAR},
+      commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
+      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      task_status = #{record.taskStatus,jdbcType=INTEGER},
+      task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
+      task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
+      task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
+      task_comment = #{record.taskComment,jdbcType=VARCHAR},
+      task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP},
+      task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP},
+      project_status = #{record.projectStatus,jdbcType=INTEGER},
+      accept_time = #{record.acceptTime,jdbcType=DATE},
+      review_time = #{record.reviewTime,jdbcType=DATE},
+      publicity_time = #{record.publicityTime,jdbcType=DATE},
+      licence_time = #{record.licenceTime,jdbcType=DATE},
+      attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    update t_order_task
+    set id = #{record.id,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      super_id = #{record.superId,jdbcType=VARCHAR},
+      commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
+      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      task_status = #{record.taskStatus,jdbcType=INTEGER},
+      task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
+      task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
+      task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
+      task_comment = #{record.taskComment,jdbcType=VARCHAR},
+      task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP},
+      task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP},
+      project_status = #{record.projectStatus,jdbcType=INTEGER},
+      accept_time = #{record.acceptTime,jdbcType=DATE},
+      review_time = #{record.reviewTime,jdbcType=DATE},
+      publicity_time = #{record.publicityTime,jdbcType=DATE},
+      licence_time = #{record.licenceTime,jdbcType=DATE}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    update t_order_task
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        super_id = #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        commodity_id = #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        commodity_name = #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityMode != null">
+        commodity_mode = #{commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskStatus != null">
+        task_status = #{taskStatus,jdbcType=INTEGER},
+      </if>
+      <if test="taskDistributionTime != null">
+        task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskAllocator != null">
+        task_allocator = #{taskAllocator,jdbcType=VARCHAR},
+      </if>
+      <if test="taskReceiver != null">
+        task_receiver = #{taskReceiver,jdbcType=VARCHAR},
+      </if>
+      <if test="taskComment != null">
+        task_comment = #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="taskStartTime != null">
+        task_start_time = #{taskStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskEndTime != null">
+        task_end_time = #{taskEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="projectStatus != null">
+        project_status = #{projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="acceptTime != null">
+        accept_time = #{acceptTime,jdbcType=DATE},
+      </if>
+      <if test="reviewTime != null">
+        review_time = #{reviewTime,jdbcType=DATE},
+      </if>
+      <if test="publicityTime != null">
+        publicity_time = #{publicityTime,jdbcType=DATE},
+      </if>
+      <if test="licenceTime != null">
+        licence_time = #{licenceTime,jdbcType=DATE},
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.TOrderTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    update t_order_task
+    set order_no = #{orderNo,jdbcType=VARCHAR},
+      super_id = #{superId,jdbcType=VARCHAR},
+      commodity_id = #{commodityId,jdbcType=VARCHAR},
+      commodity_name = #{commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      commodity_mode = #{commodityMode,jdbcType=VARCHAR},
+      commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      task_status = #{taskStatus,jdbcType=INTEGER},
+      task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
+      task_allocator = #{taskAllocator,jdbcType=VARCHAR},
+      task_receiver = #{taskReceiver,jdbcType=VARCHAR},
+      task_comment = #{taskComment,jdbcType=VARCHAR},
+      task_start_time = #{taskStartTime,jdbcType=TIMESTAMP},
+      task_end_time = #{taskEndTime,jdbcType=TIMESTAMP},
+      project_status = #{projectStatus,jdbcType=INTEGER},
+      accept_time = #{acceptTime,jdbcType=DATE},
+      review_time = #{reviewTime,jdbcType=DATE},
+      publicity_time = #{publicityTime,jdbcType=DATE},
+      licence_time = #{licenceTime,jdbcType=DATE},
+      attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+    -->
+    update t_order_task
+    set order_no = #{orderNo,jdbcType=VARCHAR},
+      super_id = #{superId,jdbcType=VARCHAR},
+      commodity_id = #{commodityId,jdbcType=VARCHAR},
+      commodity_name = #{commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      commodity_mode = #{commodityMode,jdbcType=VARCHAR},
+      commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      task_status = #{taskStatus,jdbcType=INTEGER},
+      task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
+      task_allocator = #{taskAllocator,jdbcType=VARCHAR},
+      task_receiver = #{taskReceiver,jdbcType=VARCHAR},
+      task_comment = #{taskComment,jdbcType=VARCHAR},
+      task_start_time = #{taskStartTime,jdbcType=TIMESTAMP},
+      task_end_time = #{taskEndTime,jdbcType=TIMESTAMP},
+      project_status = #{projectStatus,jdbcType=INTEGER},
+      accept_time = #{acceptTime,jdbcType=DATE},
+      review_time = #{reviewTime,jdbcType=DATE},
+      publicity_time = #{publicityTime,jdbcType=DATE},
+      licence_time = #{licenceTime,jdbcType=DATE}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectOrderTask"  resultMap="BaseResultMap">
+  	select 
+  	<include refid="Base_Column_List" />
+  	 from t_order_task
+  	where order_no=  #{orderNo,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 8 - 0
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -402,4 +402,12 @@
 	and aid= #{aid,jdbcType=VARCHAR}
 	and business_project_id= #{businessProjectId,jdbcType=VARCHAR}
   </update>
+  <select id="checkTask" resultType="com.goafanti.customer.bo.LockingReleaseBo">
+  	select 
+		 id, type, uid, aid, business_project_id as  businessProjectId, status 
+	 from user_lock_release where type =1
+	and status=0
+	and uid=#{buyerId,jdbcType=VARCHAR}
+	and business_project_id=#{commodityId,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 996 - 0
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -0,0 +1,996 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TOrderNew {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.order_no
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String orderNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.order_type
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Integer orderType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.creater
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String creater;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.create_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.update_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Date updateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.buyer_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String buyerId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.first_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private BigDecimal firstAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.total_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.settlement_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private BigDecimal settlementAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.order_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Integer orderStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.liquidation_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Integer liquidationStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.process_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Integer processStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.project_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Integer projectStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.approval
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Integer approval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.order_remarks
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String orderRemarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.delete_sign
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Integer deleteSign;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.salesman_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String salesmanId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.finance_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String financeId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.technician_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String technicianId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.sign_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Date signTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.settlement_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Date settlementTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.contract_no
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String contractNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.contract_type
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String contractType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.contacts
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String contacts;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.contact_mobile
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String contactMobile;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.legal_person
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String legalPerson;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.legal_person_tel
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String legalPersonTel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.proof_count
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private Float proofCount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.proof_aid
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String proofAid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_new.contract_picture_url
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    private String contractPictureUrl;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.order_no
+     *
+     * @return the value of t_order_new.order_no
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.order_no
+     *
+     * @param orderNo the value for t_order_new.order_no
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.order_type
+     *
+     * @return the value of t_order_new.order_type
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.order_type
+     *
+     * @param orderType the value for t_order_new.order_type
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.creater
+     *
+     * @return the value of t_order_new.creater
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getCreater() {
+        return creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.creater
+     *
+     * @param creater the value for t_order_new.creater
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setCreater(String creater) {
+        this.creater = creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.create_time
+     *
+     * @return the value of t_order_new.create_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.create_time
+     *
+     * @param createTime the value for t_order_new.create_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.update_time
+     *
+     * @return the value of t_order_new.update_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.update_time
+     *
+     * @param updateTime the value for t_order_new.update_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.buyer_id
+     *
+     * @return the value of t_order_new.buyer_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getBuyerId() {
+        return buyerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.buyer_id
+     *
+     * @param buyerId the value for t_order_new.buyer_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setBuyerId(String buyerId) {
+        this.buyerId = buyerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.first_amount
+     *
+     * @return the value of t_order_new.first_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public BigDecimal getFirstAmount() {
+        return firstAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.first_amount
+     *
+     * @param firstAmount the value for t_order_new.first_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setFirstAmount(BigDecimal firstAmount) {
+        this.firstAmount = firstAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.total_amount
+     *
+     * @return the value of t_order_new.total_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.total_amount
+     *
+     * @param totalAmount the value for t_order_new.total_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.settlement_amount
+     *
+     * @return the value of t_order_new.settlement_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public BigDecimal getSettlementAmount() {
+        return settlementAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.settlement_amount
+     *
+     * @param settlementAmount the value for t_order_new.settlement_amount
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setSettlementAmount(BigDecimal settlementAmount) {
+        this.settlementAmount = settlementAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.order_status
+     *
+     * @return the value of t_order_new.order_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.order_status
+     *
+     * @param orderStatus the value for t_order_new.order_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.liquidation_status
+     *
+     * @return the value of t_order_new.liquidation_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Integer getLiquidationStatus() {
+        return liquidationStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.liquidation_status
+     *
+     * @param liquidationStatus the value for t_order_new.liquidation_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setLiquidationStatus(Integer liquidationStatus) {
+        this.liquidationStatus = liquidationStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.process_status
+     *
+     * @return the value of t_order_new.process_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Integer getProcessStatus() {
+        return processStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.process_status
+     *
+     * @param processStatus the value for t_order_new.process_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setProcessStatus(Integer processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.project_status
+     *
+     * @return the value of t_order_new.project_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Integer getProjectStatus() {
+        return projectStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.project_status
+     *
+     * @param projectStatus the value for t_order_new.project_status
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setProjectStatus(Integer projectStatus) {
+        this.projectStatus = projectStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.approval
+     *
+     * @return the value of t_order_new.approval
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Integer getApproval() {
+        return approval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.approval
+     *
+     * @param approval the value for t_order_new.approval
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.order_remarks
+     *
+     * @return the value of t_order_new.order_remarks
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getOrderRemarks() {
+        return orderRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.order_remarks
+     *
+     * @param orderRemarks the value for t_order_new.order_remarks
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setOrderRemarks(String orderRemarks) {
+        this.orderRemarks = orderRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.delete_sign
+     *
+     * @return the value of t_order_new.delete_sign
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Integer getDeleteSign() {
+        return deleteSign;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.delete_sign
+     *
+     * @param deleteSign the value for t_order_new.delete_sign
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setDeleteSign(Integer deleteSign) {
+        this.deleteSign = deleteSign;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.salesman_id
+     *
+     * @return the value of t_order_new.salesman_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getSalesmanId() {
+        return salesmanId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.salesman_id
+     *
+     * @param salesmanId the value for t_order_new.salesman_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setSalesmanId(String salesmanId) {
+        this.salesmanId = salesmanId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.finance_id
+     *
+     * @return the value of t_order_new.finance_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getFinanceId() {
+        return financeId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.finance_id
+     *
+     * @param financeId the value for t_order_new.finance_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setFinanceId(String financeId) {
+        this.financeId = financeId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.technician_id
+     *
+     * @return the value of t_order_new.technician_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getTechnicianId() {
+        return technicianId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.technician_id
+     *
+     * @param technicianId the value for t_order_new.technician_id
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setTechnicianId(String technicianId) {
+        this.technicianId = technicianId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.sign_time
+     *
+     * @return the value of t_order_new.sign_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Date getSignTime() {
+        return signTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.sign_time
+     *
+     * @param signTime the value for t_order_new.sign_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setSignTime(Date signTime) {
+        this.signTime = signTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.settlement_time
+     *
+     * @return the value of t_order_new.settlement_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Date getSettlementTime() {
+        return settlementTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.settlement_time
+     *
+     * @param settlementTime the value for t_order_new.settlement_time
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setSettlementTime(Date settlementTime) {
+        this.settlementTime = settlementTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.contract_no
+     *
+     * @return the value of t_order_new.contract_no
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.contract_no
+     *
+     * @param contractNo the value for t_order_new.contract_no
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 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_new.contract_type
+     *
+     * @return the value of t_order_new.contract_type
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 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_new.contract_type
+     *
+     * @param contractType the value for t_order_new.contract_type
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 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_new.contacts
+     *
+     * @return the value of t_order_new.contacts
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getContacts() {
+        return contacts;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.contacts
+     *
+     * @param contacts the value for t_order_new.contacts
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.contact_mobile
+     *
+     * @return the value of t_order_new.contact_mobile
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getContactMobile() {
+        return contactMobile;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.contact_mobile
+     *
+     * @param contactMobile the value for t_order_new.contact_mobile
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setContactMobile(String contactMobile) {
+        this.contactMobile = contactMobile;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.legal_person
+     *
+     * @return the value of t_order_new.legal_person
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.legal_person
+     *
+     * @param legalPerson the value for t_order_new.legal_person
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.legal_person_tel
+     *
+     * @return the value of t_order_new.legal_person_tel
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getLegalPersonTel() {
+        return legalPersonTel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.legal_person_tel
+     *
+     * @param legalPersonTel the value for t_order_new.legal_person_tel
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setLegalPersonTel(String legalPersonTel) {
+        this.legalPersonTel = legalPersonTel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.proof_count
+     *
+     * @return the value of t_order_new.proof_count
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public Float getProofCount() {
+        return proofCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.proof_count
+     *
+     * @param proofCount the value for t_order_new.proof_count
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setProofCount(Float proofCount) {
+        this.proofCount = proofCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.proof_aid
+     *
+     * @return the value of t_order_new.proof_aid
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getProofAid() {
+        return proofAid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.proof_aid
+     *
+     * @param proofAid the value for t_order_new.proof_aid
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setProofAid(String proofAid) {
+        this.proofAid = proofAid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_new.contract_picture_url
+     *
+     * @return the value of t_order_new.contract_picture_url
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public String getContractPictureUrl() {
+        return contractPictureUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_new.contract_picture_url
+     *
+     * @param contractPictureUrl the value for t_order_new.contract_picture_url
+     *
+     * @mbg.generated Mon Nov 19 10:12:37 CST 2018
+     */
+    public void setContractPictureUrl(String contractPictureUrl) {
+        this.contractPictureUrl = contractPictureUrl;
+    }
+}

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


+ 699 - 0
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -0,0 +1,699 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TOrderTask {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.order_no
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String orderNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.super_id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String superId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.commodity_id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String commodityId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.commodity_name
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String commodityName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.commodity_quantity
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Integer commodityQuantity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.commodity_mode
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String commodityMode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.commodity_price
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private BigDecimal commodityPrice;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.task_status
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Integer taskStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.task_distribution_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Date taskDistributionTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.task_allocator
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String taskAllocator;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.task_receiver
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String taskReceiver;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.task_comment
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String taskComment;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.task_start_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Date taskStartTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.task_end_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Date taskEndTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.project_status
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Integer projectStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.accept_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Date acceptTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.review_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Date reviewTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.publicity_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Date publicityTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.licence_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private Date licenceTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column t_order_task.attachment_url
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    private String attachmentUrl;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.id
+     *
+     * @return the value of t_order_task.id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.id
+     *
+     * @param id the value for t_order_task.id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.order_no
+     *
+     * @return the value of t_order_task.order_no
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.order_no
+     *
+     * @param orderNo the value for t_order_task.order_no
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.super_id
+     *
+     * @return the value of t_order_task.super_id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getSuperId() {
+        return superId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.super_id
+     *
+     * @param superId the value for t_order_task.super_id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setSuperId(String superId) {
+        this.superId = superId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.commodity_id
+     *
+     * @return the value of t_order_task.commodity_id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getCommodityId() {
+        return commodityId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.commodity_id
+     *
+     * @param commodityId the value for t_order_task.commodity_id
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setCommodityId(String commodityId) {
+        this.commodityId = commodityId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.commodity_name
+     *
+     * @return the value of t_order_task.commodity_name
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getCommodityName() {
+        return commodityName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.commodity_name
+     *
+     * @param commodityName the value for t_order_task.commodity_name
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setCommodityName(String commodityName) {
+        this.commodityName = commodityName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.commodity_quantity
+     *
+     * @return the value of t_order_task.commodity_quantity
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Integer getCommodityQuantity() {
+        return commodityQuantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.commodity_quantity
+     *
+     * @param commodityQuantity the value for t_order_task.commodity_quantity
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setCommodityQuantity(Integer commodityQuantity) {
+        this.commodityQuantity = commodityQuantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.commodity_mode
+     *
+     * @return the value of t_order_task.commodity_mode
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getCommodityMode() {
+        return commodityMode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.commodity_mode
+     *
+     * @param commodityMode the value for t_order_task.commodity_mode
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setCommodityMode(String commodityMode) {
+        this.commodityMode = commodityMode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.commodity_price
+     *
+     * @return the value of t_order_task.commodity_price
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public BigDecimal getCommodityPrice() {
+        return commodityPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.commodity_price
+     *
+     * @param commodityPrice the value for t_order_task.commodity_price
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setCommodityPrice(BigDecimal commodityPrice) {
+        this.commodityPrice = commodityPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.task_status
+     *
+     * @return the value of t_order_task.task_status
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Integer getTaskStatus() {
+        return taskStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.task_status
+     *
+     * @param taskStatus the value for t_order_task.task_status
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setTaskStatus(Integer taskStatus) {
+        this.taskStatus = taskStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.task_distribution_time
+     *
+     * @return the value of t_order_task.task_distribution_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Date getTaskDistributionTime() {
+        return taskDistributionTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.task_distribution_time
+     *
+     * @param taskDistributionTime the value for t_order_task.task_distribution_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setTaskDistributionTime(Date taskDistributionTime) {
+        this.taskDistributionTime = taskDistributionTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.task_allocator
+     *
+     * @return the value of t_order_task.task_allocator
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getTaskAllocator() {
+        return taskAllocator;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.task_allocator
+     *
+     * @param taskAllocator the value for t_order_task.task_allocator
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setTaskAllocator(String taskAllocator) {
+        this.taskAllocator = taskAllocator;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.task_receiver
+     *
+     * @return the value of t_order_task.task_receiver
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getTaskReceiver() {
+        return taskReceiver;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.task_receiver
+     *
+     * @param taskReceiver the value for t_order_task.task_receiver
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setTaskReceiver(String taskReceiver) {
+        this.taskReceiver = taskReceiver;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.task_comment
+     *
+     * @return the value of t_order_task.task_comment
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getTaskComment() {
+        return taskComment;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.task_comment
+     *
+     * @param taskComment the value for t_order_task.task_comment
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setTaskComment(String taskComment) {
+        this.taskComment = taskComment;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.task_start_time
+     *
+     * @return the value of t_order_task.task_start_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Date getTaskStartTime() {
+        return taskStartTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.task_start_time
+     *
+     * @param taskStartTime the value for t_order_task.task_start_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setTaskStartTime(Date taskStartTime) {
+        this.taskStartTime = taskStartTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.task_end_time
+     *
+     * @return the value of t_order_task.task_end_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Date getTaskEndTime() {
+        return taskEndTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.task_end_time
+     *
+     * @param taskEndTime the value for t_order_task.task_end_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setTaskEndTime(Date taskEndTime) {
+        this.taskEndTime = taskEndTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.project_status
+     *
+     * @return the value of t_order_task.project_status
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Integer getProjectStatus() {
+        return projectStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.project_status
+     *
+     * @param projectStatus the value for t_order_task.project_status
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setProjectStatus(Integer projectStatus) {
+        this.projectStatus = projectStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.accept_time
+     *
+     * @return the value of t_order_task.accept_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Date getAcceptTime() {
+        return acceptTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.accept_time
+     *
+     * @param acceptTime the value for t_order_task.accept_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setAcceptTime(Date acceptTime) {
+        this.acceptTime = acceptTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.review_time
+     *
+     * @return the value of t_order_task.review_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Date getReviewTime() {
+        return reviewTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.review_time
+     *
+     * @param reviewTime the value for t_order_task.review_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setReviewTime(Date reviewTime) {
+        this.reviewTime = reviewTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.publicity_time
+     *
+     * @return the value of t_order_task.publicity_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Date getPublicityTime() {
+        return publicityTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.publicity_time
+     *
+     * @param publicityTime the value for t_order_task.publicity_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setPublicityTime(Date publicityTime) {
+        this.publicityTime = publicityTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.licence_time
+     *
+     * @return the value of t_order_task.licence_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public Date getLicenceTime() {
+        return licenceTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.licence_time
+     *
+     * @param licenceTime the value for t_order_task.licence_time
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setLicenceTime(Date licenceTime) {
+        this.licenceTime = licenceTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column t_order_task.attachment_url
+     *
+     * @return the value of t_order_task.attachment_url
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public String getAttachmentUrl() {
+        return attachmentUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column t_order_task.attachment_url
+     *
+     * @param attachmentUrl the value for t_order_task.attachment_url
+     *
+     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
+     */
+    public void setAttachmentUrl(String attachmentUrl) {
+        this.attachmentUrl = attachmentUrl;
+    }
+}

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


+ 88 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -10,11 +10,13 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderTask;
 import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.service.OrderNewService;
 
 @RestController
-@RequestMapping(value = "/api/admin/newOrder")
+@RequestMapping(value = "/open/api/admin/newOrder")
 public class AdminNewOrderApiController extends CertifyApiController {
 	
 	@Autowired
@@ -37,7 +39,91 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单类型"));
 			return res;
 		}
-		//orderNewService.createServiceOrder(uid,orderType);
+		res.data(orderNewService.createServiceOrder(uid,orderType));
+		return res;
+	}
+	/**
+	 * 添加项目
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/addOrderTask",method = RequestMethod.POST)
+	public Result addOrderTask(TOrderTask t){
+		Result res = new Result();
+		if(StringUtils.isBlank(t.getOrderNo())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		
+		return res.data(orderNewService.addOrderTask(t));
+	}
+	/**
+	 * 添加项目
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/pudateOrderTask",method = RequestMethod.POST)
+	public Result pudateOrderTask(TOrderTask t){
+		Result res=new Result();
+		return res.data(orderNewService.updateOrderTask(t));
+	}
+	/**
+	 * 删除订单项目
+	 * @param detailId
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteOrderTask",method = RequestMethod.POST)
+	public Result deleteOrderTask(Integer id){
+		Result res = new Result();
+		if(id==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","项目编号"));
+			return res;
+		}
+		return res.data(orderNewService.delectOrderTask(id));
+	}
+	
+	/**
+	 * 获取订单项目信息
+	 * @param orderNo
+	 * @return
+	 */
+	@RequestMapping(value = "/getOrderTask",method = RequestMethod.GET)
+	public Result getOrderTask(String orderNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		res.setData(orderNewService.selectOrderTask(orderNo));
+		return res;
+	}
+	/**
+	 * 修改订单
+	 * @param orderNo
+	 * @param firstPayment
+	 * @param orderAmount
+	 * @param signFirstPayment
+	 * @param signTotalAmount
+	 * @param approval
+	 * @param orderRemarks
+	 * @return
+	 */
+	@RequestMapping(value = "/updateServiceOrderNew",method = RequestMethod.POST)
+	public Result updateServiceOrder(TOrderNew t,Integer isSubmit){
+		Result res = new Result();
+		if(StringUtils.isBlank(t.getOrderNo())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号"));
+			return res;
+		}
+		if(null==t.getTotalAmount() || null==t.getFirstAmount()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单金额 和 首付金额"));
+			return res;
+		}
+		if(StringUtils.isBlank(t.getContractPictureUrl())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "合同图片"));
+			return res;
+		}
+		res.setData(orderNewService.updateServiceOrder(t,isSubmit));
 		return res;
 	}
 }

+ 49 - 0
src/main/java/com/goafanti/order/enums/ApprovalNewState.java

@@ -0,0 +1,49 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ApprovalNewState {
+	FTP(0,"非特批"),
+	DSH(1,"待审核"),
+	TG(2,"通过"),
+	BH(3,"驳回"),
+	/** 无效 **/
+	INVALID(10, "INVALID");
+	
+	private ApprovalNewState(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, ApprovalNewState> status = new HashMap<Integer, ApprovalNewState>();
+
+	static {
+		for (ApprovalNewState value : ApprovalNewState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static ApprovalNewState getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 55 - 0
src/main/java/com/goafanti/order/enums/LiquidationNewState.java

@@ -0,0 +1,55 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum LiquidationNewState {
+	/** 首付待付清 **/
+	WAIT_PAY_FIRST_BALANCE(0,"首付待付清"),
+	/** 尾款待付清 **/
+	WAIT_PAY_LAST_BALANCE(1,"尾款待付清"),
+	/** 已付清 **/
+	ALREADY_PAY(2,"已付清"),
+	/** 退款待确认 **/
+	REBATESQUAN(3,"退款待确认"),
+	FULL_REFUND(3,"全部退款"),
+	/** 无效 **/
+	INVALID(10, "INVALID");
+	
+	private LiquidationNewState(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, LiquidationNewState> status = new HashMap<Integer, LiquidationNewState>();
+
+	static {
+		for (LiquidationNewState value : LiquidationNewState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static LiquidationNewState getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 57 - 0
src/main/java/com/goafanti/order/enums/OrderNewState.java

@@ -0,0 +1,57 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrderNewState {
+	/** 意向阶段 **/
+	DQD(0,"待签单 "),
+	/** 跟单阶段 **/
+	QDDS(1,"签单待审"),
+	/** 合同阶段 **/
+	QDSHTG(2,"签单审核通过"),
+	/** 项目阶段 **/
+	QDSHJJ(3, "签单审核拒绝"),
+	
+	YJX(4, "已结项"),
+	YBH(5, "已驳回"),
+	YTD(6, "已退单");
+	
+	private OrderNewState(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, OrderNewState> status = new HashMap<Integer, OrderNewState>();
+
+	static {
+		for (OrderNewState value : OrderNewState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static OrderNewState getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return DQD;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+	
+	
+}

+ 58 - 0
src/main/java/com/goafanti/order/enums/ProcessStatus.java

@@ -0,0 +1,58 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 项目阶段
+ * @author Administrator
+ *
+ */
+public enum ProcessStatus {
+	YPYXY(0,"已派营销员"),
+	YPYXGLY(1,"已派营销管理员"),
+	YPCWGLY(2,"已派财务管理员"),
+	YPCWZY(3,"已派财务专员"),
+	YPZXSGLY(4,"已派咨询师管理员"),
+	YBFPZXSGLY(5,"已部分派咨询师经理"),
+	YQBFPZXSGLY(6,"已全部分派咨询师经理"),
+	/** 无效 **/
+	INVALID(10, "INVALID");
+	
+	
+	private ProcessStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, ProcessStatus> status = new HashMap<Integer, ProcessStatus>();
+
+	static {
+		for (ProcessStatus value : ProcessStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static ProcessStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 60 - 0
src/main/java/com/goafanti/order/enums/ProjectNewStage.java

@@ -0,0 +1,60 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 项目阶段
+ * @author Administrator
+ *
+ */
+public enum ProjectNewStage {
+	DTJ(0,"项目待提交"),
+	YTJ(1,"项目已提交"),
+	PS(2,"项目评审"),
+	DGS(3,"项目待公示"),
+	GS(4,"项目公示"),
+	CC(5,"项目抽查"),
+	BA(6,"项目备案"),
+	XZ(7,"项目下证"),
+	YS(8,"项目验收"),
+	BK(9,"项目拨款"),
+	/** 无效 **/
+	INVALID(10, "INVALID");
+	
+	private ProjectNewStage(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, ProjectNewStage> status = new HashMap<Integer, ProjectNewStage>();
+
+	static {
+		for (ProjectNewStage value : ProjectNewStage.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static ProjectNewStage getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 49 - 0
src/main/java/com/goafanti/order/enums/TaskState.java

@@ -0,0 +1,49 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum TaskState {
+	 WFP(0,"未分派"),
+	 YFP(1,"已分派"),
+	 CLYQD(2,"材料已启动"),
+	 CLYWC(2,"材料已完成"),
+	/** 无效 **/
+	INVALID(10, "无效");
+	
+	private TaskState(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, TaskState> status = new HashMap<Integer, TaskState>();
+
+	static {
+		for (TaskState value : TaskState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static TaskState getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 40 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -1,10 +1,49 @@
 package com.goafanti.order.service;
 
+import java.util.List;
 
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderTask;
 
 public interface OrderNewService {
 	
-	
+	/**
+	 * 创建订单
+	 * @param uid
+	 * @param orderType
+	 * @return
+	 */
+	int createServiceOrder(String uid, Integer orderType);
+	/**
+	 * 创建项目
+	 * @param t
+	 */
+	int addOrderTask(TOrderTask t);
+	/**
+	 * 修改项目信息
+	 * @param t
+	 * @return
+	 */
+	int updateOrderTask(TOrderTask t);
+	/**
+	 * 删除项目
+	 * @param id
+	 * @return
+	 */
+	int delectOrderTask(Integer id);
+	/**
+	 * 项目详情
+	 * @param orderNo
+	 * @return
+	 */
+	 List<TOrderTask> selectOrderTask(String orderNo);
+	 /**
+	  * 订单提交或保存
+	  * @param t
+	  * @param isSubmit
+	  * @return
+	  */
+	int updateServiceOrder(TOrderNew t, Integer isSubmit);
 	
 
 	

+ 144 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -0,0 +1,144 @@
+package com.goafanti.order.service.impl;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.dao.TOrderMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.common.dao.TOrderTaskMapper;
+import com.goafanti.common.dao.UserLockReleaseMapper;
+import com.goafanti.common.enums.UserLockReleaseStatus;
+import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.TOrder;
+import com.goafanti.common.model.TOrderDetail;
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderTask;
+import com.goafanti.common.model.UserLockRelease;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.JDBCIdGenerator;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.customer.bo.LockingReleaseBo;
+import com.goafanti.order.enums.ActiveState;
+import com.goafanti.order.enums.ApprovalNewState;
+import com.goafanti.order.enums.LiquidationNewState;
+import com.goafanti.order.enums.OrderNewState;
+import com.goafanti.order.enums.ProcessStatus;
+import com.goafanti.order.enums.ProjectNewStage;
+import com.goafanti.order.enums.TaskState;
+import com.goafanti.order.service.OrderNewService;
+
+@Service
+public class OrderNewServiceImpl extends BaseMybatisDao<TOrderMapper> implements OrderNewService {
+	@Autowired
+	private TOrderNewMapper	tOrderNewMapper;
+	@Autowired
+	private TOrderTaskMapper tOrderTaskMapper;
+	@Autowired
+	private JDBCIdGenerator	idGenerator;
+	@Autowired
+	private UserLockReleaseMapper	userLockReleaseMapper;
+	@Value(value = "${mobileRemindCodeTemplate}")
+	private String					mobileRemindCodeTemplate	= null;
+	
+	@Value(value = "${accessKey}")
+	private String					accessKey			= null;
+
+	@Value(value = "${accessSecret}")
+	private String					accessSecret		= null;
+	private final String DEFAULT_ADMIN_ID = "1"; //默认管理员
+	
+	
+	
+	/*
+	 * -------------------------------------------------- APP管理端 --------------------------------------------------------
+	 */
+	
+	@Override
+	public int createServiceOrder(String uid, Integer orderType) {
+		BigDecimal initial = new BigDecimal(0);
+		TOrderNew t=new TOrderNew();
+		t.setOrderNo(idGenerator.generateId().toString());
+		t.setOrderType(orderType);
+		t.setOrderStatus(OrderNewState.DQD.getCode());
+		t.setFirstAmount(initial);
+		t.setTotalAmount(initial);
+		t.setSettlementAmount(initial);
+		t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
+		t.setProcessStatus(ProcessStatus.YPYXY.getCode());
+		t.setProjectStatus(ProjectNewStage.DTJ.getCode());
+		t.setApproval(ApprovalNewState.FTP.getCode());
+		t.setDeleteSign(0);//0-正常,1-作废,2-锁定
+		t.setSalesmanId(TokenManager.getAdminId());
+		t.setCreater(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		t.setCreateTime(new Date());
+		t.setUpdateTime(new Date());
+		t.setBuyerId(uid);
+		return tOrderNewMapper.insertSelective(t); 
+	}
+
+
+
+	@Override
+	public int addOrderTask(TOrderTask t) {
+		TOrderNew order=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		checkOrder(order,t);
+		t.setTaskStatus(TaskState.WFP.getCode());
+		t.setProjectStatus(ProjectNewStage.DTJ.getCode());
+		return tOrderTaskMapper.insertSelective(t);
+	}
+
+	public void checkOrder(TOrderNew order,TOrderTask t){
+		if(order == null) 
+			 throw new BusinessException(new Error(ErrorConstants.ORDER_NOT_EXIST, "" ,""));
+		if(order.getDeleteSign() == ActiveState.ABOLISH.getCode())
+			 throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_FREEZE, order.getOrderNo(),""));
+		if(order.getDeleteSign() == ActiveState.LOCKING.getCode())
+			 throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, order.getOrderNo(),""));
+		List<LockingReleaseBo> list=userLockReleaseMapper.checkTask(order.getBuyerId(),t.getCommodityId());
+		if (list.size()>0) {
+			for (LockingReleaseBo lockingReleaseBo : list) {
+				if (!lockingReleaseBo.getAid().equals(TokenManager.getAdminId())) {
+					throw new BusinessException(new Error( "该业务已经被其他人锁定","该业务已经被其他人锁定"));
+				}
+			}
+			
+		}
+		
+	}
+
+
+	@Override
+	public int updateOrderTask(TOrderTask t) {
+		return tOrderTaskMapper.updateByPrimaryKeySelective(t);
+	}
+
+
+
+	@Override
+	public int delectOrderTask(Integer id) {
+		return tOrderTaskMapper.deleteByPrimaryKey(id);
+	}
+
+
+
+	@Override
+	public List<TOrderTask> selectOrderTask(String orderNo) {
+		return tOrderTaskMapper.selectOrderTask(orderNo);
+	}
+
+
+
+	@Override
+	public int updateServiceOrder(TOrderNew t, Integer isSubmit) {
+		
+		return tOrderNewMapper.updateByPrimaryKeySelective(t);
+	}
+}

+ 0 - 1
src/main/resources/props/error.properties

@@ -13,7 +13,6 @@ com.alibaba.fastjson.JSONException=\u53C2\u6570\u683C\u5F0F\u9519\u8BEF\uFF0C\u8
 
 NON_LOGIN=\u7528\u6237\u672A\u767B\u5F55\u3002
 
-VCODE_ERROR=\u56FE\u5F62\u9A8C\u8BC1\u7801\u8F93\u5165\u9519\u8BEF\uFF01
 
 NO_AUTH_ERROR=\u672A\u6388\u6743\u6216\u6388\u6743\u8FC7\u671F\u3002
 

+ 18 - 0
src/main/webapp/WEB-INF/views/admin/project.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>科技需求页</title>
+	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
+	<link th:href="${staticHost+'/admin/project.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/dll/dll.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/project.js'}"></script>
+	</div>
+</body>
+</html>