Browse Source

订单变更

wanghui 7 years ago
parent
commit
e4562506dd
32 changed files with 1972 additions and 200 deletions
  1. 2 3
      GeneratorConfig.xml
  2. 1 1
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  4. 18 0
      src/main/java/com/goafanti/common/constant/PageConstants.java
  5. 0 1
      src/main/java/com/goafanti/common/dao/NoticeMapper.java
  6. 2 0
      src/main/java/com/goafanti/common/dao/PermissionMapper.java
  7. 80 0
      src/main/java/com/goafanti/common/dao/TOrderChangeMapper.java
  8. 14 14
      src/main/java/com/goafanti/common/dao/TOrderMapper.java
  9. 3 1
      src/main/java/com/goafanti/common/mapper/PermissionMapper.xml
  10. 343 0
      src/main/java/com/goafanti/common/mapper/TOrderChangeMapper.xml
  11. 43 25
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml
  12. 12 3
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  13. 131 108
      src/main/java/com/goafanti/common/model/TOrder.java
  14. 168 0
      src/main/java/com/goafanti/common/model/TOrderChange.java
  15. 722 0
      src/main/java/com/goafanti/common/model/TOrderChangeExample.java
  16. 76 16
      src/main/java/com/goafanti/common/model/TOrderExample.java
  17. 1 1
      src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java
  18. 0 11
      src/main/java/com/goafanti/customer/bo/CustomerListOut.java
  19. 1 2
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  20. 38 0
      src/main/java/com/goafanti/order/bo/OrderChangeBo.java
  21. 72 0
      src/main/java/com/goafanti/order/controller/AdminOrderApiController.java
  22. 51 0
      src/main/java/com/goafanti/order/enums/ChangeState.java
  23. 32 0
      src/main/java/com/goafanti/order/service/OrderService.java
  24. 108 9
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  25. 1 1
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  26. 3 0
      src/main/java/com/goafanti/permission/service/PermissionService.java
  27. 6 0
      src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java
  28. 20 0
      src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java
  29. 8 0
      src/main/java/com/goafanti/techproject/service/TechProjectService.java
  30. 13 1
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  31. 1 1
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  32. 1 1
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

+ 2 - 3
GeneratorConfig.xml

@@ -3,14 +3,13 @@
 <generatorConfiguration>
 
   <!-- <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" /> -->
-   <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" 
     	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="demand_follow"/> 
-    <table schema="aft" tableName="demand_follow_detail"/> 
+    <table schema="aft" tableName="t_order_change"/> 
   </context>
 </generatorConfiguration>

+ 1 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -586,7 +586,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 
 	private void createTechBorkerNotice(Achievement a) {
-		noticeMapper.insert(disposeNotice(a, null));
+		// noticeMapper.insert(disposeNotice(a, null));
 	}
 
 	// 给所有审核员发送审核通知

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -414,7 +414,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		n.setAid(l.getPrincipal());
 		n.setContent("编号" + info.getSerialNumber() + "  " + OrgCognizanceStatus.getStatus(l.getState()).getDesc());
 		n.setNoticeType(NoticeStatus.COGNIZANCE.getCode());
-		noticeMapper.insert(n);
+		// noticeMapper.insert(n);
 	}
 
 	@Override

+ 18 - 0
src/main/java/com/goafanti/common/constant/PageConstants.java

@@ -0,0 +1,18 @@
+package com.goafanti.common.constant;
+
+public class PageConstants {
+	public static final String DEMAND_AUDIT_URL = "/admin/demand.html#techDemandAudit"; //需求审核
+	
+	public static final String DEMAND_PUBLISH_URL = "/admin/demand.html#techDemandPublish"; //需求发布
+	
+	public static final String ACHIEVEMENT_AUDIT_URL = "/admin/achievement.html#techAchievementAudit"; //成果审核
+	
+	public static final String ACHIEVEMENT_PUBLISH_URL = "/admin/achievement.html#techAchievementPublish"; //成果发布
+	
+	public static final String MY_SERVICE_ORDER = "/admin/order.html#myService"; //我的科技服务订单
+	
+	public static final String MY_SETTLEMENT_ORDER = "/admin/order.html#mySettlement"; //我的结算订单
+	
+	public static final String MY_SERVICE_PROJECT = "/admin/servicesManage/projectOrder.html#projectManage"; //项目管理
+	
+}

+ 0 - 1
src/main/java/com/goafanti/common/dao/NoticeMapper.java

@@ -17,7 +17,6 @@ public interface NoticeMapper {
 
     int updateByPrimaryKey(Notice record);
 
-
 	int findUnreadNoticeCount(String aid);
 
 	int selectUnreadedCount(String aid);

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

@@ -72,4 +72,6 @@ public interface PermissionMapper {
 	List<Navigation> selectNavList(@Param("aid")String aid);
 
 	List<SubMenu> selectMenuList(@Param("superId")String superId,@Param("aid")String aid);
+
+	String selectTopNavBySubUrl(@Param("subUrl")String subUrl);
 }

+ 80 - 0
src/main/java/com/goafanti/common/dao/TOrderChangeMapper.java

@@ -0,0 +1,80 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TOrderChange;
+import com.goafanti.common.model.TOrderChangeExample;
+import com.goafanti.order.bo.OrderChangeBo;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TOrderChangeMapper {
+    /**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	long countByExample(TOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	int deleteByExample(TOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	int insert(TOrderChange record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	int insertSelective(TOrderChange record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	List<TOrderChange> selectByExample(TOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	TOrderChange selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	int updateByExampleSelective(@Param("record") TOrderChange record, @Param("example") TOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	int updateByExample(@Param("record") TOrderChange record, @Param("example") TOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	int updateByPrimaryKeySelective(TOrderChange record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	int updateByPrimaryKey(TOrderChange record);
+
+	List<OrderChangeBo> selectOrderChange(String orderNo);
+
+	int selectCountByStatus(@Param("changeStatus")Integer changeStatus,@Param("orderNo")String orderNo);
+}

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

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

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

@@ -339,6 +339,8 @@
 					and a.uid = #{aid,jdbcType=VARCHAR}
   			</otherwise>
   		</choose>
-		
+  </select>
+  <select id="selectTopNavBySubUrl" resultType="java.lang.String" parameterType="java.lang.String">
+  	select super_id  from permission where id = (select super_id from permission where url = #{subUrl,jdbcType=VARCHAR})
   </select>
 </mapper>

+ 343 - 0
src/main/java/com/goafanti/common/mapper/TOrderChangeMapper.xml

@@ -0,0 +1,343 @@
+<?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.TOrderChangeMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="creater_id" jdbcType="VARCHAR" property="createrId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="change_comment" jdbcType="VARCHAR" property="changeComment" />
+    <result column="change_status" jdbcType="INTEGER" property="changeStatus" />
+    <result column="delete_sign" jdbcType="INTEGER" property="deleteSign" />
+  </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 Sun Apr 08 14:22:15 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 Sun Apr 08 14:22:15 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 Sun Apr 08 14:22:15 CST 2018.
+    -->
+    id, order_no, creater_id, create_time, change_comment, change_status, delete_sign
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderChangeExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_order_change
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_order_change
+    where id = #{id,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 Sun Apr 08 14:22:15 CST 2018.
+    -->
+    delete from t_order_change
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderChangeExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    delete from t_order_change
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    insert into t_order_change (id, order_no, creater_id, 
+      create_time, change_comment, change_status, 
+      delete_sign)
+    values (#{id,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, #{createrId,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{changeComment,jdbcType=VARCHAR}, #{changeStatus,jdbcType=INTEGER}, 
+      #{deleteSign,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    insert into t_order_change
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="createrId != null">
+        creater_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="changeComment != null">
+        change_comment,
+      </if>
+      <if test="changeStatus != null">
+        change_status,
+      </if>
+      <if test="deleteSign != null">
+        delete_sign,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createrId != null">
+        #{createrId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="changeComment != null">
+        #{changeComment,jdbcType=VARCHAR},
+      </if>
+      <if test="changeStatus != null">
+        #{changeStatus,jdbcType=INTEGER},
+      </if>
+      <if test="deleteSign != null">
+        #{deleteSign,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderChangeExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    select count(*) from t_order_change
+    <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 Sun Apr 08 14:22:15 CST 2018.
+    -->
+    update t_order_change
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createrId != null">
+        creater_id = #{record.createrId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.changeComment != null">
+        change_comment = #{record.changeComment,jdbcType=VARCHAR},
+      </if>
+      <if test="record.changeStatus != null">
+        change_status = #{record.changeStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.deleteSign != null">
+        delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    update t_order_change
+    set id = #{record.id,jdbcType=VARCHAR},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      creater_id = #{record.createrId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      change_comment = #{record.changeComment,jdbcType=VARCHAR},
+      change_status = #{record.changeStatus,jdbcType=INTEGER},
+      delete_sign = #{record.deleteSign,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    update t_order_change
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createrId != null">
+        creater_id = #{createrId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="changeComment != null">
+        change_comment = #{changeComment,jdbcType=VARCHAR},
+      </if>
+      <if test="changeStatus != null">
+        change_status = #{changeStatus,jdbcType=INTEGER},
+      </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+    -->
+    update t_order_change
+    set order_no = #{orderNo,jdbcType=VARCHAR},
+      creater_id = #{createrId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      change_comment = #{changeComment,jdbcType=VARCHAR},
+      change_status = #{changeStatus,jdbcType=INTEGER},
+      delete_sign = #{deleteSign,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectOrderChange" parameterType="java.lang.String" resultType="com.goafanti.order.bo.OrderChangeBo">
+	 select
+		a.id,
+		a.order_no as orderNo,
+		date_format( a.create_time, '%Y-%m-%d %H:%i:%S' ) as createTime,
+		a.change_comment,
+		b.name as creater
+	from
+		t_order_change a left join admin b on
+		a.creater_id = b.id
+	where 
+		a.order_no = #{orderNo,jdbcType=VARCHAR} and a.delete_sign = 0
+  </select>
+  
+  <select id="selectCountByStatus" resultType="java.lang.Integer">
+	select
+		count( 0 )
+	from
+		t_order_change
+	where
+	order_no = #{orderNo,jdbcType=VARCHAR}
+	and delete_sign = 0
+	and change_status = #{changeStatus,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_type" jdbcType="INTEGER" property="orderType" />
@@ -42,12 +42,13 @@
     <result column="settlement_time" jdbcType="TIMESTAMP" property="settlementTime" />
     <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
     <result column="contract_type" jdbcType="VARCHAR" property="contractType" />
+    <result column="change_status" jdbcType="INTEGER" property="changeStatus" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrder">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     <result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
   </resultMap>
@@ -55,7 +56,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -89,7 +90,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -123,20 +124,21 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     order_no, order_type, creater, create_time, update_time, buyer_id, seller_id, first_payment, 
     order_amount, brokerage_amount, sign_first_payment, actually_first_payment, sign_total_amount, 
     actually_total_amount, sign_brokerage_amount, actually_brokerage_amount, sign_withdraw_amount, 
     actually_withdraw_amount, order_stage, project_stage, order_status, liquidation_status, 
     order_channel, approval, order_remarks, delete_sign, salesman_id, finance_id, technician_id, 
-    confirm_time, sign_time, set_up_time, settlement_time, contract_no, contract_type
+    confirm_time, sign_time, set_up_time, settlement_time, contract_no, contract_type, 
+    change_status
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     contract_picture_url
   </sql>
@@ -144,7 +146,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     select
     <if test="distinct">
@@ -165,7 +167,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     select
     <if test="distinct">
@@ -184,7 +186,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -197,7 +199,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     delete from t_order
     where order_no = #{orderNo,jdbcType=VARCHAR}
@@ -206,7 +208,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     delete from t_order
     <if test="_parameter != null">
@@ -217,7 +219,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     insert into t_order (order_no, order_type, creater, 
       create_time, update_time, buyer_id, 
@@ -231,7 +233,7 @@
       salesman_id, finance_id, technician_id, 
       confirm_time, sign_time, set_up_time, 
       settlement_time, contract_no, contract_type, 
-      contract_picture_url)
+      change_status, contract_picture_url)
     values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, 
       #{sellerId,jdbcType=VARCHAR}, #{firstPayment,jdbcType=DECIMAL}, #{orderAmount,jdbcType=DECIMAL}, 
@@ -244,13 +246,13 @@
       #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR}, #{technicianId,jdbcType=VARCHAR}, 
       #{confirmTime,jdbcType=TIMESTAMP}, #{signTime,jdbcType=TIMESTAMP}, #{setUpTime,jdbcType=TIMESTAMP}, 
       #{settlementTime,jdbcType=TIMESTAMP}, #{contractNo,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR}, 
-      #{contractPictureUrl,jdbcType=LONGVARCHAR})
+      #{changeStatus,jdbcType=INTEGER}, #{contractPictureUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrder">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     insert into t_order
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -359,6 +361,9 @@
       <if test="contractType != null">
         contract_type,
       </if>
+      <if test="changeStatus != null">
+        change_status,
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url,
       </if>
@@ -469,6 +474,9 @@
       <if test="contractType != null">
         #{contractType,jdbcType=VARCHAR},
       </if>
+      <if test="changeStatus != null">
+        #{changeStatus,jdbcType=INTEGER},
+      </if>
       <if test="contractPictureUrl != null">
         #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -478,7 +486,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     select count(*) from t_order
     <if test="_parameter != null">
@@ -489,7 +497,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     update t_order
     <set>
@@ -598,6 +606,9 @@
       <if test="record.contractType != null">
         contract_type = #{record.contractType,jdbcType=VARCHAR},
       </if>
+      <if test="record.changeStatus != null">
+        change_status = #{record.changeStatus,jdbcType=INTEGER},
+      </if>
       <if test="record.contractPictureUrl != null">
         contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -610,7 +621,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -648,6 +659,7 @@
       settlement_time = #{record.settlementTime,jdbcType=TIMESTAMP},
       contract_no = #{record.contractNo,jdbcType=VARCHAR},
       contract_type = #{record.contractType,jdbcType=VARCHAR},
+      change_status = #{record.changeStatus,jdbcType=INTEGER},
       contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -657,7 +669,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -694,7 +706,8 @@
       set_up_time = #{record.setUpTime,jdbcType=TIMESTAMP},
       settlement_time = #{record.settlementTime,jdbcType=TIMESTAMP},
       contract_no = #{record.contractNo,jdbcType=VARCHAR},
-      contract_type = #{record.contractType,jdbcType=VARCHAR}
+      contract_type = #{record.contractType,jdbcType=VARCHAR},
+      change_status = #{record.changeStatus,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -703,7 +716,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     update t_order
     <set>
@@ -809,6 +822,9 @@
       <if test="contractType != null">
         contract_type = #{contractType,jdbcType=VARCHAR},
       </if>
+      <if test="changeStatus != null">
+        change_status = #{changeStatus,jdbcType=INTEGER},
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -819,7 +835,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     update t_order
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -856,6 +872,7 @@
       settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
       contract_no = #{contractNo,jdbcType=VARCHAR},
       contract_type = #{contractType,jdbcType=VARCHAR},
+      change_status = #{changeStatus,jdbcType=INTEGER},
       contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -863,7 +880,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 02 16:57:09 CST 2018.
+      This element was generated on Mon Apr 02 16:45:39 CST 2018.
     -->
     update t_order
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -899,7 +916,8 @@
       set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
       settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
       contract_no = #{contractNo,jdbcType=VARCHAR},
-      contract_type = #{contractType,jdbcType=VARCHAR}
+      contract_type = #{contractType,jdbcType=VARCHAR},
+      change_status = #{changeStatus,jdbcType=INTEGER}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
   

+ 12 - 3
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -581,14 +581,16 @@
 		c.liquidation_status as liquidationStatus,
 		c.approval,
 		d.name as salesmanName,
-		e.name as departmentName
+		e.name as departmentName,
+		g.name as principalName
 	from
 		contract a left join user b on
 		a.uid = b.id left join t_order c on
 		a.order_no = c.order_no left join admin d on
 		c.salesman_id = d.id left join department_management e on
 		d.department_id = e.id left join business_varieties f on
-		a.type = f.id
+		a.type = f.id left join admin g on
+		a.principal = g.id
 	where 1=1
 	<if test="deletedSign != null">
 		and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
@@ -620,6 +622,9 @@
 	<if test="orderEndDate != null and orderEndDate != ''">
 		and c.create_time &lt; #{orderEndDate,jdbcType=TIMESTAMP}
 	</if>
+	<if test="principalName != null and principalName != ''">
+		and g.name = #{principalName,jdbcType=VARCHAR}
+	</if>
 		order by a.create_time desc
 	<if test="page_sql != null">
 		${page_sql}
@@ -634,7 +639,8 @@
 		a.order_no = c.order_no left join admin d on
 		c.salesman_id = d.id left join department_management e on
 		d.department_id = e.id left join business_varieties f on
-		a.type = f.id
+		a.type = f.id left join admin g on
+		a.principal = g.id
 	where 1=1
 	<if test="deletedSign != null">
 		and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
@@ -666,6 +672,9 @@
 	<if test="orderEndDate != null and orderEndDate != ''">
 		and c.create_time &lt; #{orderEndDate,jdbcType=TIMESTAMP}
 	</if>
+	<if test="principalName != null and principalName != ''">
+		and g.name = #{principalName,jdbcType=VARCHAR}
+	</if>
   </select>
   
   <select id="selectTechProjectDetail" resultType="com.goafanti.techproject.bo.ProjectDetailBo">

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

@@ -7,189 +7,194 @@ public class TOrder {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Integer orderType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.creater
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.create_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.update_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.buyer_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String buyerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.seller_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String sellerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal firstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal orderAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal brokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal signFirstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal actuallyFirstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_total_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal signTotalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_total_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal actuallyTotalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal signBrokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal actuallyBrokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_withdraw_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal signWithdrawAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_withdraw_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private BigDecimal actuallyWithdrawAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_stage
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Integer orderStage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.project_stage
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Integer projectStage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Integer orderStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.liquidation_status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Integer liquidationStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_channel
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Integer orderChannel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.approval
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Integer approval;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_remarks
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String orderRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.delete_sign
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Integer deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.salesman_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String salesmanId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.finance_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String financeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.technician_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String technicianId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.confirm_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Date confirmTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Date signTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.set_up_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Date setUpTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.settlement_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private Date settlementTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String contractNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String contractType;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.change_status
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 */
+	private Integer changeStatus;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_picture_url
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	private String contractPictureUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_no
 	 * @return  the value of t_order.order_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -198,7 +203,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_no
 	 * @param orderNo  the value for t_order.order_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -207,7 +212,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_type
 	 * @return  the value of t_order.order_type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Integer getOrderType() {
 		return orderType;
@@ -216,7 +221,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_type
 	 * @param orderType  the value for t_order.order_type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
@@ -225,7 +230,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.creater
 	 * @return  the value of t_order.creater
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getCreater() {
 		return creater;
@@ -234,7 +239,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.creater
 	 * @param creater  the value for t_order.creater
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -243,7 +248,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.create_time
 	 * @return  the value of t_order.create_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -252,7 +257,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.create_time
 	 * @param createTime  the value for t_order.create_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -261,7 +266,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.update_time
 	 * @return  the value of t_order.update_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -270,7 +275,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.update_time
 	 * @param updateTime  the value for t_order.update_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -279,7 +284,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.buyer_id
 	 * @return  the value of t_order.buyer_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -288,7 +293,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.buyer_id
 	 * @param buyerId  the value for t_order.buyer_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -297,7 +302,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.seller_id
 	 * @return  the value of t_order.seller_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getSellerId() {
 		return sellerId;
@@ -306,7 +311,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.seller_id
 	 * @param sellerId  the value for t_order.seller_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSellerId(String sellerId) {
 		this.sellerId = sellerId;
@@ -315,7 +320,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.first_payment
 	 * @return  the value of t_order.first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getFirstPayment() {
 		return firstPayment;
@@ -324,7 +329,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.first_payment
 	 * @param firstPayment  the value for t_order.first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setFirstPayment(BigDecimal firstPayment) {
 		this.firstPayment = firstPayment;
@@ -333,7 +338,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_amount
 	 * @return  the value of t_order.order_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getOrderAmount() {
 		return orderAmount;
@@ -342,7 +347,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_amount
 	 * @param orderAmount  the value for t_order.order_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setOrderAmount(BigDecimal orderAmount) {
 		this.orderAmount = orderAmount;
@@ -351,7 +356,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.brokerage_amount
 	 * @return  the value of t_order.brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getBrokerageAmount() {
 		return brokerageAmount;
@@ -360,7 +365,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.brokerage_amount
 	 * @param brokerageAmount  the value for t_order.brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setBrokerageAmount(BigDecimal brokerageAmount) {
 		this.brokerageAmount = brokerageAmount;
@@ -369,7 +374,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_first_payment
 	 * @return  the value of t_order.sign_first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getSignFirstPayment() {
 		return signFirstPayment;
@@ -378,7 +383,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_first_payment
 	 * @param signFirstPayment  the value for t_order.sign_first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSignFirstPayment(BigDecimal signFirstPayment) {
 		this.signFirstPayment = signFirstPayment;
@@ -387,7 +392,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_first_payment
 	 * @return  the value of t_order.actually_first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getActuallyFirstPayment() {
 		return actuallyFirstPayment;
@@ -396,7 +401,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_first_payment
 	 * @param actuallyFirstPayment  the value for t_order.actually_first_payment
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setActuallyFirstPayment(BigDecimal actuallyFirstPayment) {
 		this.actuallyFirstPayment = actuallyFirstPayment;
@@ -405,7 +410,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_total_amount
 	 * @return  the value of t_order.sign_total_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getSignTotalAmount() {
 		return signTotalAmount;
@@ -414,7 +419,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_total_amount
 	 * @param signTotalAmount  the value for t_order.sign_total_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSignTotalAmount(BigDecimal signTotalAmount) {
 		this.signTotalAmount = signTotalAmount;
@@ -423,7 +428,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_total_amount
 	 * @return  the value of t_order.actually_total_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getActuallyTotalAmount() {
 		return actuallyTotalAmount;
@@ -432,7 +437,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_total_amount
 	 * @param actuallyTotalAmount  the value for t_order.actually_total_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setActuallyTotalAmount(BigDecimal actuallyTotalAmount) {
 		this.actuallyTotalAmount = actuallyTotalAmount;
@@ -441,7 +446,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_brokerage_amount
 	 * @return  the value of t_order.sign_brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getSignBrokerageAmount() {
 		return signBrokerageAmount;
@@ -450,7 +455,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_brokerage_amount
 	 * @param signBrokerageAmount  the value for t_order.sign_brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSignBrokerageAmount(BigDecimal signBrokerageAmount) {
 		this.signBrokerageAmount = signBrokerageAmount;
@@ -459,7 +464,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_brokerage_amount
 	 * @return  the value of t_order.actually_brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getActuallyBrokerageAmount() {
 		return actuallyBrokerageAmount;
@@ -468,7 +473,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_brokerage_amount
 	 * @param actuallyBrokerageAmount  the value for t_order.actually_brokerage_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setActuallyBrokerageAmount(BigDecimal actuallyBrokerageAmount) {
 		this.actuallyBrokerageAmount = actuallyBrokerageAmount;
@@ -477,7 +482,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_withdraw_amount
 	 * @return  the value of t_order.sign_withdraw_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getSignWithdrawAmount() {
 		return signWithdrawAmount;
@@ -486,7 +491,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_withdraw_amount
 	 * @param signWithdrawAmount  the value for t_order.sign_withdraw_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSignWithdrawAmount(BigDecimal signWithdrawAmount) {
 		this.signWithdrawAmount = signWithdrawAmount;
@@ -495,7 +500,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_withdraw_amount
 	 * @return  the value of t_order.actually_withdraw_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public BigDecimal getActuallyWithdrawAmount() {
 		return actuallyWithdrawAmount;
@@ -504,7 +509,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_withdraw_amount
 	 * @param actuallyWithdrawAmount  the value for t_order.actually_withdraw_amount
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setActuallyWithdrawAmount(BigDecimal actuallyWithdrawAmount) {
 		this.actuallyWithdrawAmount = actuallyWithdrawAmount;
@@ -513,7 +518,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_stage
 	 * @return  the value of t_order.order_stage
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Integer getOrderStage() {
 		return orderStage;
@@ -522,7 +527,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_stage
 	 * @param orderStage  the value for t_order.order_stage
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setOrderStage(Integer orderStage) {
 		this.orderStage = orderStage;
@@ -531,7 +536,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.project_stage
 	 * @return  the value of t_order.project_stage
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Integer getProjectStage() {
 		return projectStage;
@@ -540,7 +545,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.project_stage
 	 * @param projectStage  the value for t_order.project_stage
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setProjectStage(Integer projectStage) {
 		this.projectStage = projectStage;
@@ -549,7 +554,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_status
 	 * @return  the value of t_order.order_status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -558,7 +563,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_status
 	 * @param orderStatus  the value for t_order.order_status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -567,7 +572,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.liquidation_status
 	 * @return  the value of t_order.liquidation_status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -576,7 +581,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.liquidation_status
 	 * @param liquidationStatus  the value for t_order.liquidation_status
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
@@ -585,7 +590,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_channel
 	 * @return  the value of t_order.order_channel
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Integer getOrderChannel() {
 		return orderChannel;
@@ -594,7 +599,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_channel
 	 * @param orderChannel  the value for t_order.order_channel
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setOrderChannel(Integer orderChannel) {
 		this.orderChannel = orderChannel;
@@ -603,7 +608,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.approval
 	 * @return  the value of t_order.approval
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Integer getApproval() {
 		return approval;
@@ -612,7 +617,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.approval
 	 * @param approval  the value for t_order.approval
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setApproval(Integer approval) {
 		this.approval = approval;
@@ -621,7 +626,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_remarks
 	 * @return  the value of t_order.order_remarks
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getOrderRemarks() {
 		return orderRemarks;
@@ -630,7 +635,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_remarks
 	 * @param orderRemarks  the value for t_order.order_remarks
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
@@ -639,7 +644,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.delete_sign
 	 * @return  the value of t_order.delete_sign
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -648,7 +653,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.delete_sign
 	 * @param deleteSign  the value for t_order.delete_sign
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -657,7 +662,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.salesman_id
 	 * @return  the value of t_order.salesman_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -666,7 +671,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.salesman_id
 	 * @param salesmanId  the value for t_order.salesman_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -675,7 +680,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.finance_id
 	 * @return  the value of t_order.finance_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -684,7 +689,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.finance_id
 	 * @param financeId  the value for t_order.finance_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -693,7 +698,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.technician_id
 	 * @return  the value of t_order.technician_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getTechnicianId() {
 		return technicianId;
@@ -702,7 +707,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.technician_id
 	 * @param technicianId  the value for t_order.technician_id
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setTechnicianId(String technicianId) {
 		this.technicianId = technicianId;
@@ -711,7 +716,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.confirm_time
 	 * @return  the value of t_order.confirm_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Date getConfirmTime() {
 		return confirmTime;
@@ -720,7 +725,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.confirm_time
 	 * @param confirmTime  the value for t_order.confirm_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setConfirmTime(Date confirmTime) {
 		this.confirmTime = confirmTime;
@@ -729,7 +734,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_time
 	 * @return  the value of t_order.sign_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Date getSignTime() {
 		return signTime;
@@ -738,7 +743,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_time
 	 * @param signTime  the value for t_order.sign_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSignTime(Date signTime) {
 		this.signTime = signTime;
@@ -747,7 +752,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.set_up_time
 	 * @return  the value of t_order.set_up_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Date getSetUpTime() {
 		return setUpTime;
@@ -756,7 +761,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.set_up_time
 	 * @param setUpTime  the value for t_order.set_up_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSetUpTime(Date setUpTime) {
 		this.setUpTime = setUpTime;
@@ -765,7 +770,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.settlement_time
 	 * @return  the value of t_order.settlement_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Date getSettlementTime() {
 		return settlementTime;
@@ -774,7 +779,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.settlement_time
 	 * @param settlementTime  the value for t_order.settlement_time
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setSettlementTime(Date settlementTime) {
 		this.settlementTime = settlementTime;
@@ -783,7 +788,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_no
 	 * @return  the value of t_order.contract_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getContractNo() {
 		return contractNo;
@@ -792,7 +797,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_no
 	 * @param contractNo  the value for t_order.contract_no
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
@@ -801,7 +806,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_type
 	 * @return  the value of t_order.contract_type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getContractType() {
 		return contractType;
@@ -810,16 +815,34 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_type
 	 * @param contractType  the value for t_order.contract_type
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 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.change_status
+	 * @return  the value of t_order.change_status
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 */
+	public Integer getChangeStatus() {
+		return changeStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.change_status
+	 * @param changeStatus  the value for t_order.change_status
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
+	 */
+	public void setChangeStatus(Integer changeStatus) {
+		this.changeStatus = changeStatus;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_picture_url
 	 * @return  the value of t_order.contract_picture_url
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getContractPictureUrl() {
 		return contractPictureUrl;
@@ -828,7 +851,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_picture_url
 	 * @param contractPictureUrl  the value for t_order.contract_picture_url
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setContractPictureUrl(String contractPictureUrl) {
 		this.contractPictureUrl = contractPictureUrl;

+ 168 - 0
src/main/java/com/goafanti/common/model/TOrderChange.java

@@ -0,0 +1,168 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class TOrderChange {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_change.id
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_change.order_no
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_change.creater_id
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	private String createrId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_change.create_time
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_change.change_comment
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	private String changeComment;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_change.change_status
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	private Integer changeStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_change.delete_sign
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	private Integer deleteSign;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_change.id
+	 * @return  the value of t_order_change.id
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_change.id
+	 * @param id  the value for t_order_change.id
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_change.order_no
+	 * @return  the value of t_order_change.order_no
+	 * @mbg.generated  Sun Apr 08 14:22:15 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_change.order_no
+	 * @param orderNo  the value for t_order_change.order_no
+	 * @mbg.generated  Sun Apr 08 14:22:15 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_change.creater_id
+	 * @return  the value of t_order_change.creater_id
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public String getCreaterId() {
+		return createrId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_change.creater_id
+	 * @param createrId  the value for t_order_change.creater_id
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void setCreaterId(String createrId) {
+		this.createrId = createrId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_change.create_time
+	 * @return  the value of t_order_change.create_time
+	 * @mbg.generated  Sun Apr 08 14:22:15 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_change.create_time
+	 * @param createTime  the value for t_order_change.create_time
+	 * @mbg.generated  Sun Apr 08 14:22:15 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_change.change_comment
+	 * @return  the value of t_order_change.change_comment
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public String getChangeComment() {
+		return changeComment;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_change.change_comment
+	 * @param changeComment  the value for t_order_change.change_comment
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void setChangeComment(String changeComment) {
+		this.changeComment = changeComment;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_change.change_status
+	 * @return  the value of t_order_change.change_status
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public Integer getChangeStatus() {
+		return changeStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_change.change_status
+	 * @param changeStatus  the value for t_order_change.change_status
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void setChangeStatus(Integer changeStatus) {
+		this.changeStatus = changeStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_change.delete_sign
+	 * @return  the value of t_order_change.delete_sign
+	 * @mbg.generated  Sun Apr 08 14:22:15 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_change.delete_sign
+	 * @param deleteSign  the value for t_order_change.delete_sign
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+}

+ 722 - 0
src/main/java/com/goafanti/common/model/TOrderChangeExample.java

@@ -0,0 +1,722 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TOrderChangeExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public TOrderChangeExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(String value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(String value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(String value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(String value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(String value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(String value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLike(String value) {
+			addCriterion("id like", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotLike(String value) {
+			addCriterion("id not like", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<String> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<String> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(String value1, String value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(String value1, String value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIsNull() {
+			addCriterion("order_no is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIsNotNull() {
+			addCriterion("order_no is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoEqualTo(String value) {
+			addCriterion("order_no =", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotEqualTo(String value) {
+			addCriterion("order_no <>", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoGreaterThan(String value) {
+			addCriterion("order_no >", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+			addCriterion("order_no >=", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLessThan(String value) {
+			addCriterion("order_no <", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLessThanOrEqualTo(String value) {
+			addCriterion("order_no <=", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLike(String value) {
+			addCriterion("order_no like", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotLike(String value) {
+			addCriterion("order_no not like", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIn(List<String> values) {
+			addCriterion("order_no in", values, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotIn(List<String> values) {
+			addCriterion("order_no not in", values, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoBetween(String value1, String value2) {
+			addCriterion("order_no between", value1, value2, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotBetween(String value1, String value2) {
+			addCriterion("order_no not between", value1, value2, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdIsNull() {
+			addCriterion("creater_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdIsNotNull() {
+			addCriterion("creater_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdEqualTo(String value) {
+			addCriterion("creater_id =", value, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdNotEqualTo(String value) {
+			addCriterion("creater_id <>", value, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdGreaterThan(String value) {
+			addCriterion("creater_id >", value, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdGreaterThanOrEqualTo(String value) {
+			addCriterion("creater_id >=", value, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdLessThan(String value) {
+			addCriterion("creater_id <", value, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdLessThanOrEqualTo(String value) {
+			addCriterion("creater_id <=", value, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdLike(String value) {
+			addCriterion("creater_id like", value, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdNotLike(String value) {
+			addCriterion("creater_id not like", value, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdIn(List<String> values) {
+			addCriterion("creater_id in", values, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdNotIn(List<String> values) {
+			addCriterion("creater_id not in", values, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdBetween(String value1, String value2) {
+			addCriterion("creater_id between", value1, value2, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreaterIdNotBetween(String value1, String value2) {
+			addCriterion("creater_id not between", value1, value2, "createrId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNull() {
+			addCriterion("create_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNotNull() {
+			addCriterion("create_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeEqualTo(Date value) {
+			addCriterion("create_time =", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotEqualTo(Date value) {
+			addCriterion("create_time <>", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThan(Date value) {
+			addCriterion("create_time >", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("create_time >=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThan(Date value) {
+			addCriterion("create_time <", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+			addCriterion("create_time <=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIn(List<Date> values) {
+			addCriterion("create_time in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotIn(List<Date> values) {
+			addCriterion("create_time not in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
+			addCriterion("create_time between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+			addCriterion("create_time not between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentIsNull() {
+			addCriterion("change_comment is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentIsNotNull() {
+			addCriterion("change_comment is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentEqualTo(String value) {
+			addCriterion("change_comment =", value, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentNotEqualTo(String value) {
+			addCriterion("change_comment <>", value, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentGreaterThan(String value) {
+			addCriterion("change_comment >", value, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentGreaterThanOrEqualTo(String value) {
+			addCriterion("change_comment >=", value, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentLessThan(String value) {
+			addCriterion("change_comment <", value, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentLessThanOrEqualTo(String value) {
+			addCriterion("change_comment <=", value, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentLike(String value) {
+			addCriterion("change_comment like", value, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentNotLike(String value) {
+			addCriterion("change_comment not like", value, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentIn(List<String> values) {
+			addCriterion("change_comment in", values, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentNotIn(List<String> values) {
+			addCriterion("change_comment not in", values, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentBetween(String value1, String value2) {
+			addCriterion("change_comment between", value1, value2, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeCommentNotBetween(String value1, String value2) {
+			addCriterion("change_comment not between", value1, value2, "changeComment");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusIsNull() {
+			addCriterion("change_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusIsNotNull() {
+			addCriterion("change_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusEqualTo(Integer value) {
+			addCriterion("change_status =", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusNotEqualTo(Integer value) {
+			addCriterion("change_status <>", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusGreaterThan(Integer value) {
+			addCriterion("change_status >", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("change_status >=", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusLessThan(Integer value) {
+			addCriterion("change_status <", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("change_status <=", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusIn(List<Integer> values) {
+			addCriterion("change_status in", values, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusNotIn(List<Integer> values) {
+			addCriterion("change_status not in", values, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusBetween(Integer value1, Integer value2) {
+			addCriterion("change_status between", value1, value2, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("change_status not between", value1, value2, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignIsNull() {
+			addCriterion("delete_sign is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignIsNotNull() {
+			addCriterion("delete_sign is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignEqualTo(Integer value) {
+			addCriterion("delete_sign =", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignNotEqualTo(Integer value) {
+			addCriterion("delete_sign <>", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignGreaterThan(Integer value) {
+			addCriterion("delete_sign >", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignGreaterThanOrEqualTo(Integer value) {
+			addCriterion("delete_sign >=", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignLessThan(Integer value) {
+			addCriterion("delete_sign <", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignLessThanOrEqualTo(Integer value) {
+			addCriterion("delete_sign <=", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignIn(List<Integer> values) {
+			addCriterion("delete_sign in", values, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignNotIn(List<Integer> values) {
+			addCriterion("delete_sign not in", values, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignBetween(Integer value1, Integer value2) {
+			addCriterion("delete_sign between", value1, value2, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignNotBetween(Integer value1, Integer value2) {
+			addCriterion("delete_sign not between", value1, value2, "deleteSign");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_change
+	 * @mbg.generated  Sun Apr 08 14:22:15 CST 2018
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table t_order_change
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Apr 02 16:40:56 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public TOrderExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2363,11 +2363,71 @@ public class TOrderExample {
 			addCriterion("contract_type not between", value1, value2, "contractType");
 			return (Criteria) this;
 		}
+
+		public Criteria andChangeStatusIsNull() {
+			addCriterion("change_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusIsNotNull() {
+			addCriterion("change_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusEqualTo(Integer value) {
+			addCriterion("change_status =", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusNotEqualTo(Integer value) {
+			addCriterion("change_status <>", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusGreaterThan(Integer value) {
+			addCriterion("change_status >", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("change_status >=", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusLessThan(Integer value) {
+			addCriterion("change_status <", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("change_status <=", value, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusIn(List<Integer> values) {
+			addCriterion("change_status in", values, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusNotIn(List<Integer> values) {
+			addCriterion("change_status not in", values, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusBetween(Integer value1, Integer value2) {
+			addCriterion("change_status between", value1, value2, "changeStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("change_status not between", value1, value2, "changeStatus");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 * @mbg.generated  Mon Apr 02 16:45:39 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 1 - 1
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -354,7 +354,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		n.setAid(l.getPrincipal());
 		n.setContent("编号" + info.getSerialNumber() + "  " + CopyrightStatus.getStatus(l.getStatus()).getDesc());
 		n.setNoticeType(NoticeStatus.COPYRIGHT.getCode());
-		noticeMapper.insert(n);
+		// noticeMapper.insert(n);
 	}
 
 }

+ 0 - 11
src/main/java/com/goafanti/customer/bo/CustomerListOut.java

@@ -16,9 +16,6 @@ public class CustomerListOut extends CustomerListIn{
 	/** 营销员姓名 **/
 	private String adminName;
 	
-	/** 专家审核状态 **/
-	private Integer expertAudit;
-	
 	/** 专家发布状态**/
 	private Integer releaseStatus;
 	
@@ -41,14 +38,6 @@ public class CustomerListOut extends CustomerListIn{
 		this.releaseStatus = releaseStatus;
 	}
 
-	public Integer getExpertAudit() {
-		return expertAudit;
-	}
-
-	public void setExpertAudit(Integer expertAudit) {
-		this.expertAudit = expertAudit;
-	}
-
 	public String getUid() {
 		return uid;
 	}

+ 1 - 2
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -680,8 +680,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	// 给指派技术经纪人发送审核结果通知
 	private void createTechBorkerNotice(Demand a) {
-		noticeMapper.insert(disposeNotice(a, null));
-
+		// noticeMapper.insert(disposeNotice(a, null));
 	}
 
 	private Notice disposeNotice(Demand d, String aid) {

+ 38 - 0
src/main/java/com/goafanti/order/bo/OrderChangeBo.java

@@ -0,0 +1,38 @@
+package com.goafanti.order.bo;
+
+public class OrderChangeBo {
+	/** 创建人 **/
+	private String creater;
+	/** 创建时间 **/
+	private String createTime;
+	/** 订单编号 **/
+	private String orderNo;
+	/** 变更说明 **/
+	private String changeComment;
+	public String getCreater() {
+		return creater;
+	}
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getChangeComment() {
+		return changeComment;
+	}
+	public void setChangeComment(String changeComment) {
+		this.changeComment = changeComment;
+	}
+	
+	
+}

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

@@ -612,4 +612,76 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
+	/**
+	 * 发起订单变更
+	 * @param orderNo
+	 * @param changeComment
+	 * @return
+	 */
+	@RequestMapping(value = "/addOrderChange",method = RequestMethod.GET)
+	public Result addOrderChange(String orderNo,String changeComment){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		if(StringUtils.isBlank(changeComment)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更说明"));
+			return res;
+		}
+		orderServiceImpl.addOrderChange(orderNo,changeComment);
+		return res;
+	}
+	
+	/**
+	 * 查看变更记录
+	 * @param orderNo
+	 * @return
+	 */
+	@RequestMapping(value = "/viewOrderChange",method = RequestMethod.GET)
+	public Result viewOrderChange(String orderNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		res.setData(orderServiceImpl.selectOrderChange(orderNo));
+		return res;
+	}
+	
+	/**
+	 * 删除变更
+	 * @param changeId
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteOrderChange",method = RequestMethod.GET)
+	public Result deleteOrderChange(String changeId){
+		Result res = new Result();
+		if(StringUtils.isBlank(changeId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更ID"));
+			return res;
+		}
+		orderServiceImpl.deleteOrderChange(changeId);
+		return res;
+	}
+	
+	/**
+	 * 更新变更记录
+	 * @param changeComment
+	 * @param changeStatus
+	 * @return
+	 */
+	public Result updateOrderChange(String changeId,String changeComment,Integer changeStatus){
+		Result res = new Result();
+		if(StringUtils.isBlank(changeId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更ID"));
+			return res;
+		}
+		if(changeStatus == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更状态"));
+			return res;
+		}
+		orderServiceImpl.updateOrderChange(changeId,changeComment,changeStatus);
+		return res;
+	}
 }

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

@@ -0,0 +1,51 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ChangeState {
+	/** 正常  **/
+	UNCHANGE(0,"UNCHANGE"),
+	/** 变更中 **/
+	CHANGING(1,"CHANGING"),
+	/** 变更完成 **/
+	CHANGED(2,"CHANGED"),
+	/** 无效 **/
+	INVALID(10, "INVALID");
+	
+	private ChangeState(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, ChangeState> status = new HashMap<Integer, ChangeState>();
+
+	static {
+		for (ChangeState value : ChangeState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static ChangeState 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;
+	}
+}

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

@@ -13,6 +13,7 @@ import com.goafanti.order.bo.OrderListBo;
 import com.goafanti.order.bo.ServiceOrderDetailBo;
 import com.goafanti.order.bo.C2BOrderDetailBo;
 import com.goafanti.order.bo.C2COrderDetailBo;
+import com.goafanti.order.bo.OrderChangeBo;
 
 public interface OrderService {
 	
@@ -437,4 +438,35 @@ public interface OrderService {
 	 */
 	int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType, 
 			String createTime,String remarks) throws ParseException;
+
+	/**
+	 * 添加变更记录
+	 * @param orderNo
+	 * @param changeComment
+	 * @return
+	 */
+	int addOrderChange(String orderNo, String changeComment);
+
+	/**
+	 * 查看变更记录列表
+	 * @param orderNo
+	 * @return
+	 */
+	List<OrderChangeBo> selectOrderChange(String orderNo);
+
+	/**
+	 * 删除变更记录
+	 * @param changeId
+	 * @return
+	 */
+	int deleteOrderChange(String changeId);
+
+	/**
+	 * 修改变更记录
+	 * @param changeId
+	 * @param changeComment
+	 * @param changeStatus
+	 * @return
+	 */
+	int updateOrderChange(String changeId, String changeComment, Integer changeStatus);
 }

+ 108 - 9
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TOrderBillMapper;
+import com.goafanti.common.dao.TOrderChangeMapper;
 import com.goafanti.common.dao.TOrderDetailMapper;
 import com.goafanti.common.dao.TOrderMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -33,6 +34,7 @@ import com.goafanti.common.model.ContractTask;
 import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TOrderBill;
+import com.goafanti.common.model.TOrderChange;
 import com.goafanti.common.model.TOrderDetail;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.BeanUtilsExt;
@@ -45,6 +47,7 @@ import com.goafanti.order.bo.BillDetailBo;
 import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.CommodityDetailBo;
 import com.goafanti.order.bo.OperatorActive;
+import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.bo.OrderListBo;
 import com.goafanti.order.bo.ServiceOrderDetailBo;
 import com.goafanti.order.bo.C2BOrderDetailBo;
@@ -52,6 +55,7 @@ import com.goafanti.order.bo.C2COrderDetailBo;
 import com.goafanti.order.enums.ActiveState;
 import com.goafanti.order.enums.ApprovalState;
 import com.goafanti.order.enums.AuditState;
+import com.goafanti.order.enums.ChangeState;
 import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.enums.LiquidationState;
 import com.goafanti.order.enums.OrderAction;
@@ -81,6 +85,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private OrganizationManagementMapper organizationManagementMapper;
 	@Autowired
 	private ContractMapper contractMapper;
+	@Autowired
+	private TOrderChangeMapper tOrderChangeMapper;
 	
 	private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);//默认首付价格
 	private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);//默认单价
@@ -152,6 +158,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setDeleteSign(DeleteStatus.UNDELETE.getCode());
 		tOrder.setOrderChannel(OrderChannel.APP.getCode());
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
+		tOrder.setChangeStatus(ChangeState.UNCHANGE.getCode());
 		tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
 		tOrder.setOrderRemarks(remarks);
 		tOrder.setContractType(bo.getCommodityClassify());
@@ -298,12 +305,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			}		
 		}else if(orderAction == OrderAction.APPLY_FOR_REFUND){ //退款申请
 			boolean	flag = true;
-			if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
+			/*if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
 					&& tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_AFTER_SIGN.getCode()
 					&& tOrder.getOrderStatus() != OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode()
 					&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
 				flag = false;
-			}
+			}*/
 			if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode()
 					|| tOrder.getLiquidationStatus() == LiquidationState.REFUSE_REFUND.getCode()
 					|| tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
@@ -316,12 +323,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			tOrder.setLiquidationStatus(LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode());
 		}else if(orderAction == OrderAction.CONFIRM_REFUND){ //退款确认
 			boolean flag = true;
-			if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
+			/*if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
 					&& tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_AFTER_SIGN.getCode()
 					&& tOrder.getOrderStatus() != OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode()
 					&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
 				flag = false;
-			}
+			}*/
 			if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode())
 				flag = false;
 			if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
@@ -335,12 +342,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			}	
 		}else if(orderAction == OrderAction.COMPLETE_REFUND){ //完成退款
 			boolean flag = true;
-			if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
+			/*if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
 					&& tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_AFTER_SIGN.getCode()
 					&& tOrder.getOrderStatus() != OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode()
 					&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
 				flag = false;
-			}
+			}*/
 			if(tOrder.getLiquidationStatus() != LiquidationState.AGREE_REFUND.getCode())
 				flag = false;
 			if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
@@ -853,7 +860,35 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			flag = true;
 		if (new BigDecimal(signTotalAmount).compareTo(tOrder.getSignTotalAmount()) != 0)
 			flag = true;
-		if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode() && flag) {
+		boolean flag2 = false;
+		if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()){
+			flag2 = true;
+		}else if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()){
+			flag2 = true;
+			if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signTotalAmount)) > 0){ 	  //实际付款金额超过订单金额 ,应退款处理
+				tOrder.setLiquidationStatus(LiquidationState.AGREE_REFUND.getCode());
+				if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
+					tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
+			}else if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signTotalAmount)) == 0){ //刚好全付
+				tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
+				if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
+					tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
+			}else if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signFirstPayment)) < 0){ //未达首付
+				tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode());
+				if(tOrder.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
+					tOrder.setProjectStage(ProjectStage.NOT_SATISFY_CONDITION.getCode());
+			}else if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signFirstPayment)) == 0){ //刚好首付
+				tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
+				if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
+					tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
+			}else{ 																					   //超过首付未全付
+				tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode());
+				if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
+					tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
+			}
+			
+		}
+		if (flag && !flag2) { //只有待签单或者变更中可修改
 			throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
 		}
 		tOrder.setSignFirstPayment(new BigDecimal(signFirstPayment));
@@ -861,7 +896,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setOrderRemarks(orderRemarks);
 		tOrder.setUpdateTime(new Date());
 		tOrder.setContractNo(contractNo);
-		tOrder.setContractPictureUrl(contractPictureUrl);
+		if(StringUtils.isNotBlank(contractPictureUrl))tOrder.setContractPictureUrl(contractPictureUrl);
 		tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		return 1;
 	}
@@ -1140,6 +1175,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setDeleteSign(ActiveState.NORMAL.getCode());
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
 		tOrder.setContractType(contractType);
+		tOrder.setChangeStatus(ChangeState.UNCHANGE.getCode());
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		return tOrderMapper.insert(tOrder);
 	}
@@ -1579,7 +1615,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setDeleteSign(DeleteStatus.UNDELETE.getCode());
 		tOrder.setOrderChannel(OrderChannel.PORTAL.getCode());
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
-		
+		tOrder.setChangeStatus(ChangeState.UNCHANGE.getCode());
 		tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));			
 		
 		tOrder.setOrderRemarks(remarks);
@@ -1603,4 +1639,67 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrderMapper.insert(tOrder);
 		return 1;
 	}
+
+	@Override
+	@Transactional
+	public int addOrderChange(String orderNo, String changeComment) {
+		TOrder tOrder = new TOrder();
+		tOrder.setOrderNo(orderNo);
+		tOrder.setChangeStatus(ChangeState.CHANGING.getCode());
+		TOrderChange change = new TOrderChange();
+		change.setCreaterId(TokenManager.getAdminId());
+		change.setCreateTime(new Date());
+		change.setOrderNo(orderNo);
+		change.setId(UUID.randomUUID().toString());
+		change.setChangeComment(changeComment);
+		change.setChangeStatus(ChangeState.CHANGING.getCode());
+		change.setDeleteSign(DeleteStatus.UNDELETE.getCode());
+		tOrderChangeMapper.insert(change);
+		tOrderMapper.updateByPrimaryKeySelective(tOrder);
+		return 1;
+	}
+
+	@Override
+	public List<OrderChangeBo> selectOrderChange(String orderNo) {
+		return tOrderChangeMapper.selectOrderChange(orderNo);
+	}
+
+	@Override
+	public int deleteOrderChange(String changeId) {
+		TOrderChange change = tOrderChangeMapper.selectByPrimaryKey(changeId);
+		change.setDeleteSign(DeleteStatus.DELETED.getCode());
+		tOrderChangeMapper.updateByPrimaryKeySelective(change);
+		return updateOrderSatusByChange(change.getOrderNo());
+	}
+	
+	/**
+	 * 更新变更状态
+	 * @param changeId
+	 * @return
+	 */
+	private int updateOrderSatusByChange(String orderNo){
+		if(StringUtils.isBlank(orderNo)) return 0;
+		int resultStatus;
+		int allChangeCount = tOrderChangeMapper.selectCountByStatus(ChangeState.CHANGING.getCode(), orderNo);
+		int completeChangeCoumt = tOrderChangeMapper.selectCountByStatus(ChangeState.CHANGED.getCode(), orderNo);
+		if(allChangeCount == 0){
+			resultStatus = ChangeState.UNCHANGE.getCode();
+		} else if(allChangeCount - completeChangeCoumt > 0){
+			resultStatus = ChangeState.CHANGING.getCode();
+		} else {
+			resultStatus = ChangeState.CHANGED.getCode();
+		}
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		tOrder.setChangeStatus(resultStatus);
+		return tOrderMapper.updateByPrimaryKeySelective(tOrder);
+	}
+
+	@Override
+	public int updateOrderChange(String changeId, String changeComment, Integer changeStatus) {
+		TOrderChange change = tOrderChangeMapper.selectByPrimaryKey(changeId);
+		if(StringUtils.isNotBlank(changeComment))change.setChangeComment(changeComment);
+		change.setChangeStatus(changeStatus);
+		tOrderChangeMapper.updateByPrimaryKeySelective(change);
+		return updateOrderSatusByChange(change.getOrderNo());
+	}
 }

+ 1 - 1
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -643,7 +643,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		n.setAid(l.getPrincipal());
 		n.setContent("编号" + info.getSerialNumber() + "  " + PatentInfoStatus.getStatus(l.getState()).getDesc());
 		n.setNoticeType(NoticeStatus.PATENTINFO.getCode());
-		noticeMapper.insert(n);
+		// noticeMapper.insert(n);
 	}
 
 }

+ 3 - 0
src/main/java/com/goafanti/permission/service/PermissionService.java

@@ -38,4 +38,7 @@ public interface PermissionService {
 	List<Navigation> selectNavList();
 
 	List<Menu> selectMenuList(String superId);
+	
+	/** 查询 一级菜单通过三级菜单 **/
+	String selectTopNavBySubUrl(String subUrl);
 }

+ 6 - 0
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -282,4 +282,10 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 		return menus;
 	}
 
+	@Override
+	public String selectTopNavBySubUrl(String subUrl) {
+		// TODO Auto-generated method stub
+		return permissionMapper.selectTopNavBySubUrl(subUrl);
+	}
+
 }

+ 20 - 0
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -940,4 +940,24 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateProjectTask(task);
 		return res;
 	}
+	
+	/**
+	 * 转交项目
+	 * @param contractId
+	 * @param projectReceiveId
+	 * @return
+	 */
+	@RequestMapping(value = "/transferProject", method = RequestMethod.GET)
+	public Result transferProject(String contractId,String projectReceiveId,String orderNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(contractId) || StringUtils.isBlank(projectReceiveId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "项目ID和接收人ID"));
+			return res;
+		}
+		techProjectService.updateTransferProject(contractId,projectReceiveId);
+		if(StringUtils.isNotBlank(orderNo)){
+			orderServiceImpl.updateTransferOrder(orderNo, projectReceiveId, 2);
+		}
+		return res;
+	}
 }

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

@@ -143,4 +143,12 @@ public interface TechProjectService {
 	 * @return
 	 */
 	int updateRevokeOrComplete(String contractId, Integer operatorType,String completeComment);
+
+	/**
+	 * 转交项目
+	 * @param contractId
+	 * @param projectReceiveId
+	 * @return
+	 */
+	int updateTransferProject(String contractId, String projectReceiveId);
 }

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

@@ -299,7 +299,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		n.setAid(l.getPrincipal());
 		n.setContent("编号" + info.getSerialNumber() + "  " + TechProjectStatus.getStatus(l.getState()).getDesc());
 		n.setNoticeType(NoticeStatus.TECHPROJECT.getCode());
-		noticeMapper.insert(n);
+		// noticeMapper.insert(n);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -311,6 +311,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		if(bo.getDeletedSign() != null) params.put("deletedSign", bo.getDeletedSign());
 		if(StringUtils.isNotBlank(bo.getOrderNo())) params.put("orderNo", bo.getOrderNo());
 		if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());
+		if(StringUtils.isNotBlank(bo.getPrincipalName())) params.put("principalName", bo.getPrincipalName());
 		if(StringUtils.isNotBlank(bo.getSerialNumber())) params.put("serialNumber", bo.getSerialNumber());
 		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		try {
@@ -446,4 +447,15 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		return 0;
 	}
 
+	@Override
+	public int updateTransferProject(String contractId, String projectReceiveId) {
+		Contract contract = contractMapper.selectByPrimaryKey(contractId);
+		if(contract != null){
+			contract.setPrincipal(projectReceiveId);
+			contract.setUpdateTime(new Date());
+			return contractMapper.updateByPrimaryKeySelective(contract); 
+		}
+		return 0;
+	}
+
 }

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -333,7 +333,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		}
 		n.setContent(content);
 		n.setNoticeType(NoticeStatus.ORGANIZATIONCERTIFY.getCode());
-		noticeMapper.insert(n);
+		// noticeMapper.insert(n);
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -285,7 +285,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		}
 		n.setContent(content);
 		n.setNoticeType(NoticeStatus.PERSONALCERTIFY.getCode());
-		noticeMapper.insert(n);
+		// noticeMapper.insert(n);
 	}
 
 	@Override