Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 6 years ago
parent
commit
51bb78e19c
41 changed files with 5655 additions and 274 deletions
  1. 1 1
      GeneratorConfig.xml
  2. 2 0
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  3. 84 0
      src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java
  4. 80 0
      src/main/java/com/goafanti/common/dao/OrderChangeLogMapper.java
  5. 11 11
      src/main/java/com/goafanti/common/dao/TOrderChangeMapper.java
  6. 2 0
      src/main/java/com/goafanti/common/dao/TOrderDunMapper.java
  7. 3 0
      src/main/java/com/goafanti/common/dao/TOrderLogMapper.java
  8. 14 14
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  9. 1 1
      src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml
  10. 762 0
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml
  11. 325 0
      src/main/java/com/goafanti/common/mapper/OrderChangeLogMapper.xml
  12. 2 2
      src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml
  13. 15 15
      src/main/java/com/goafanti/common/mapper/TOrderChangeMapper.xml
  14. 7 0
      src/main/java/com/goafanti/common/mapper/TOrderDunMapper.xml
  15. 1 1
      src/main/java/com/goafanti/common/mapper/TOrderLogMapper.xml
  16. 82 44
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  17. 2 2
      src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml
  18. 6 6
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  19. 1 1
      src/main/java/com/goafanti/common/mapper/TTaskHoursMapper.xml
  20. 560 0
      src/main/java/com/goafanti/common/model/NewOrderChange.java
  21. 1793 0
      src/main/java/com/goafanti/common/model/NewOrderChangeExample.java
  22. 168 0
      src/main/java/com/goafanti/common/model/OrderChangeLog.java
  23. 712 0
      src/main/java/com/goafanti/common/model/OrderChangeLogExample.java
  24. 21 21
      src/main/java/com/goafanti/common/model/TOrderChange.java
  25. 16 16
      src/main/java/com/goafanti/common/model/TOrderChangeExample.java
  26. 151 105
      src/main/java/com/goafanti/common/model/TOrderNew.java
  27. 156 16
      src/main/java/com/goafanti/common/model/TOrderNewExample.java
  28. 2 0
      src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java
  29. 111 0
      src/main/java/com/goafanti/order/bo/NewOderCahngeListBo.java
  30. 46 0
      src/main/java/com/goafanti/order/bo/NewOrderChangeBo.java
  31. 24 0
      src/main/java/com/goafanti/order/bo/OrderChangeLogBo.java
  32. 3 1
      src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java
  33. 1 1
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  34. 142 0
      src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
  35. 30 0
      src/main/java/com/goafanti/order/service/OrderChangeService.java
  36. 17 3
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  37. 260 0
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  38. 30 9
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  39. 9 2
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  40. 1 1
      src/main/resources/props/config_local.properties
  41. 1 1
      src/main/resources/props/error.properties

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="kede-server" type="XMLMAPPER" />
-    <table schema="aft" tableName="t_order_task"/>
+    <table schema="aft" tableName="new_order_change"/>
   </context>
 </generatorConfiguration>

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -17,6 +17,8 @@ public class AFTConstants {
 
 	public static final String	APPROVAL_DECISION					= "99999";				// 特批决策者
 	
+	public static final String	CED									= "999998";				// 总裁
+		
 	public static final String  TECH_ADMIN                          = "99998";				// 技术管理员
 
 	public static final String	AREAADMIN							= "";					// 地区管理员

+ 84 - 0
src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java

@@ -0,0 +1,84 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.NewOrderChange;
+import com.goafanti.common.model.NewOrderChangeExample;
+import com.goafanti.order.bo.NewOrderChangeBo;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface NewOrderChangeMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	long countByExample(NewOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	int deleteByExample(NewOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	int insert(NewOrderChange record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	int insertSelective(NewOrderChange record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	List<NewOrderChange> selectByExample(NewOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	NewOrderChange selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") NewOrderChange record,
+			@Param("example") NewOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	int updateByExample(@Param("record") NewOrderChange record, @Param("example") NewOrderChangeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	int updateByPrimaryKeySelective(NewOrderChange record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	int updateByPrimaryKey(NewOrderChange record);
+
+	NewOrderChangeBo selectByorderNo(String orderNo);
+
+	int checkOderNo(String orderNo);
+
+	NewOrderChangeBo selectById(Integer id);
+}

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

@@ -0,0 +1,80 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrderChangeLog;
+import com.goafanti.common.model.OrderChangeLogExample;
+import com.goafanti.order.bo.OrderChangeLogBo;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OrderChangeLogMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	long countByExample(OrderChangeLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	int deleteByExample(OrderChangeLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	int insert(OrderChangeLog record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	int insertSelective(OrderChangeLog record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	List<OrderChangeLog> selectByExample(OrderChangeLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	OrderChangeLog selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") OrderChangeLog record,
+			@Param("example") OrderChangeLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	int updateByExample(@Param("record") OrderChangeLog record, @Param("example") OrderChangeLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	int updateByPrimaryKeySelective(OrderChangeLog record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	int updateByPrimaryKey(OrderChangeLog record);
+
+	List<OrderChangeLogBo> selectOrderChangeLogList(String changeId);
+}

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

@@ -10,67 +10,67 @@ 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderChange record);
 

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

@@ -107,4 +107,6 @@ public interface TOrderDunMapper {
 	List<OrderDunTaskBo> getTaskAllOrderDun();
 
 	int checkOrderDun(@Param("dunSubject")Integer dunSubject, @Param("orderNo")String orderNo);
+
+	List<TOrderDun> selectByOrderNo(String orderNo);
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/TOrderLogMapper.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderLogExample;
 import com.goafanti.order.bo.TOrderLogBo;
@@ -76,4 +77,6 @@ public interface TOrderLogMapper {
 	int updateByPrimaryKey(TOrderLog record);
 
 	List<TOrderLogBo> selectOrderByNo(String orderNo);
+
+
 }

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

@@ -12,72 +12,72 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderNewMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	long countByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int deleteByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int deleteByPrimaryKey(String orderNo);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int insert(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int insertSelective(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	List<TOrderNew> selectByExampleWithBLOBs(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	List<TOrderNew> selectByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	TOrderNew selectByPrimaryKey(String orderNo);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int updateByExample(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderNew record);
 	TOrderNewBo getOrderNewDetail(String orderNo); 

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

@@ -809,7 +809,7 @@
   </select>
   
   <select id="selectBusinessProjectCatalog" resultType="com.goafanti.common.model.BusinessCategory">
-  	select id,cname from business_category where delete_sign = 0
+  	select id,cname from business_category where delete_sign=0
   </select>
   
 

+ 762 - 0
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -0,0 +1,762 @@
+<?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.NewOrderChangeMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.NewOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="process_state" jdbcType="INTEGER" property="processState" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="voucher_url" jdbcType="VARCHAR" property="voucherUrl" />
+    <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
+    <result column="settlement_amount" jdbcType="DECIMAL" property="settlementAmount" />
+    <result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
+    <result column="applicant" jdbcType="VARCHAR" property="applicant" />
+    <result column="dep_name" jdbcType="VARCHAR" property="depName" />
+    <result column="project_state" jdbcType="VARCHAR" property="projectState" />
+    <result column="zxs_cost" jdbcType="DECIMAL" property="zxsCost" />
+    <result column="zxs_remarks" jdbcType="VARCHAR" property="zxsRemarks" />
+    <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime" />
+    <result column="payment_amount" jdbcType="DECIMAL" property="paymentAmount" />
+    <result column="invoice_time" jdbcType="TIMESTAMP" property="invoiceTime" />
+    <result column="invoice_amount" jdbcType="DECIMAL" property="invoiceAmount" />
+    <result column="invoice_type" jdbcType="VARCHAR" property="invoiceType" />
+    <result column="cw_cost" jdbcType="DECIMAL" property="cwCost" />
+    <result column="refundable_amount" jdbcType="DECIMAL" property="refundableAmount" />
+    <result column="cw_remarks" jdbcType="VARCHAR" property="cwRemarks" />
+  </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 Thu Aug 22 09:48:19 CST 2019.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    id, order_no, process_state, status, type, create_time, remarks, voucher_url, total_amount, 
+    settlement_amount, change_amount, applicant, dep_name, project_state, zxs_cost, zxs_remarks, 
+    payment_time, payment_amount, invoice_time, invoice_amount, invoice_type, cw_cost, 
+    refundable_amount, cw_remarks
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from new_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.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from new_order_change
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    delete from new_order_change
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    delete from new_order_change
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.NewOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    insert into new_order_change (id, order_no, process_state, 
+      status, type, create_time, 
+      remarks, voucher_url, total_amount, 
+      settlement_amount, change_amount, applicant, 
+      dep_name, project_state, zxs_cost, 
+      zxs_remarks, payment_time, payment_amount, 
+      invoice_time, invoice_amount, invoice_type, 
+      cw_cost, refundable_amount, cw_remarks
+      )
+    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{processState,jdbcType=INTEGER}, 
+      #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{remarks,jdbcType=VARCHAR}, #{voucherUrl,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
+      #{settlementAmount,jdbcType=DECIMAL}, #{changeAmount,jdbcType=DECIMAL}, #{applicant,jdbcType=VARCHAR}, 
+      #{depName,jdbcType=VARCHAR}, #{projectState,jdbcType=VARCHAR}, #{zxsCost,jdbcType=DECIMAL}, 
+      #{zxsRemarks,jdbcType=VARCHAR}, #{paymentTime,jdbcType=TIMESTAMP}, #{paymentAmount,jdbcType=DECIMAL}, 
+      #{invoiceTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL}, #{invoiceType,jdbcType=VARCHAR}, 
+      #{cwCost,jdbcType=DECIMAL}, #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    insert into new_order_change
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="processState != null">
+        process_state,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="voucherUrl != null">
+        voucher_url,
+      </if>
+      <if test="totalAmount != null">
+        total_amount,
+      </if>
+      <if test="settlementAmount != null">
+        settlement_amount,
+      </if>
+      <if test="changeAmount != null">
+        change_amount,
+      </if>
+      <if test="applicant != null">
+        applicant,
+      </if>
+      <if test="depName != null">
+        dep_name,
+      </if>
+      <if test="projectState != null">
+        project_state,
+      </if>
+      <if test="zxsCost != null">
+        zxs_cost,
+      </if>
+      <if test="zxsRemarks != null">
+        zxs_remarks,
+      </if>
+      <if test="paymentTime != null">
+        payment_time,
+      </if>
+      <if test="paymentAmount != null">
+        payment_amount,
+      </if>
+      <if test="invoiceTime != null">
+        invoice_time,
+      </if>
+      <if test="invoiceAmount != null">
+        invoice_amount,
+      </if>
+      <if test="invoiceType != null">
+        invoice_type,
+      </if>
+      <if test="cwCost != null">
+        cw_cost,
+      </if>
+      <if test="refundableAmount != null">
+        refundable_amount,
+      </if>
+      <if test="cwRemarks != null">
+        cw_remarks,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="processState != null">
+        #{processState,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="voucherUrl != null">
+        #{voucherUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="totalAmount != null">
+        #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementAmount != null">
+        #{settlementAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="changeAmount != null">
+        #{changeAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="applicant != null">
+        #{applicant,jdbcType=VARCHAR},
+      </if>
+      <if test="depName != null">
+        #{depName,jdbcType=VARCHAR},
+      </if>
+      <if test="projectState != null">
+        #{projectState,jdbcType=VARCHAR},
+      </if>
+      <if test="zxsCost != null">
+        #{zxsCost,jdbcType=DECIMAL},
+      </if>
+      <if test="zxsRemarks != null">
+        #{zxsRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTime != null">
+        #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentAmount != null">
+        #{paymentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="invoiceTime != null">
+        #{invoiceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="invoiceAmount != null">
+        #{invoiceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="invoiceType != null">
+        #{invoiceType,jdbcType=VARCHAR},
+      </if>
+      <if test="cwCost != null">
+        #{cwCost,jdbcType=DECIMAL},
+      </if>
+      <if test="refundableAmount != null">
+        #{refundableAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="cwRemarks != null">
+        #{cwRemarks,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    select count(*) from new_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 Thu Aug 22 09:48:19 CST 2019.
+    -->
+    update new_order_change
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.processState != null">
+        process_state = #{record.processState,jdbcType=INTEGER},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.voucherUrl != null">
+        voucher_url = #{record.voucherUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.totalAmount != null">
+        total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.settlementAmount != null">
+        settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.changeAmount != null">
+        change_amount = #{record.changeAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.applicant != null">
+        applicant = #{record.applicant,jdbcType=VARCHAR},
+      </if>
+      <if test="record.depName != null">
+        dep_name = #{record.depName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectState != null">
+        project_state = #{record.projectState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zxsCost != null">
+        zxs_cost = #{record.zxsCost,jdbcType=DECIMAL},
+      </if>
+      <if test="record.zxsRemarks != null">
+        zxs_remarks = #{record.zxsRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.paymentTime != null">
+        payment_time = #{record.paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.paymentAmount != null">
+        payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.invoiceTime != null">
+        invoice_time = #{record.invoiceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.invoiceAmount != null">
+        invoice_amount = #{record.invoiceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.invoiceType != null">
+        invoice_type = #{record.invoiceType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cwCost != null">
+        cw_cost = #{record.cwCost,jdbcType=DECIMAL},
+      </if>
+      <if test="record.refundableAmount != null">
+        refundable_amount = #{record.refundableAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.cwRemarks != null">
+        cw_remarks = #{record.cwRemarks,jdbcType=VARCHAR},
+      </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 Thu Aug 22 09:48:19 CST 2019.
+    -->
+    update new_order_change
+    set id = #{record.id,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      process_state = #{record.processState,jdbcType=INTEGER},
+      status = #{record.status,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      voucher_url = #{record.voucherUrl,jdbcType=VARCHAR},
+      total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
+      change_amount = #{record.changeAmount,jdbcType=DECIMAL},
+      applicant = #{record.applicant,jdbcType=VARCHAR},
+      dep_name = #{record.depName,jdbcType=VARCHAR},
+      project_state = #{record.projectState,jdbcType=VARCHAR},
+      zxs_cost = #{record.zxsCost,jdbcType=DECIMAL},
+      zxs_remarks = #{record.zxsRemarks,jdbcType=VARCHAR},
+      payment_time = #{record.paymentTime,jdbcType=TIMESTAMP},
+      payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
+      invoice_time = #{record.invoiceTime,jdbcType=TIMESTAMP},
+      invoice_amount = #{record.invoiceAmount,jdbcType=DECIMAL},
+      invoice_type = #{record.invoiceType,jdbcType=VARCHAR},
+      cw_cost = #{record.cwCost,jdbcType=DECIMAL},
+      refundable_amount = #{record.refundableAmount,jdbcType=DECIMAL},
+      cw_remarks = #{record.cwRemarks,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.NewOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    update new_order_change
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="processState != null">
+        process_state = #{processState,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="voucherUrl != null">
+        voucher_url = #{voucherUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="totalAmount != null">
+        total_amount = #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementAmount != null">
+        settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="changeAmount != null">
+        change_amount = #{changeAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="applicant != null">
+        applicant = #{applicant,jdbcType=VARCHAR},
+      </if>
+      <if test="depName != null">
+        dep_name = #{depName,jdbcType=VARCHAR},
+      </if>
+      <if test="projectState != null">
+        project_state = #{projectState,jdbcType=VARCHAR},
+      </if>
+      <if test="zxsCost != null">
+        zxs_cost = #{zxsCost,jdbcType=DECIMAL},
+      </if>
+      <if test="zxsRemarks != null">
+        zxs_remarks = #{zxsRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTime != null">
+        payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentAmount != null">
+        payment_amount = #{paymentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="invoiceTime != null">
+        invoice_time = #{invoiceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="invoiceAmount != null">
+        invoice_amount = #{invoiceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="invoiceType != null">
+        invoice_type = #{invoiceType,jdbcType=VARCHAR},
+      </if>
+      <if test="cwCost != null">
+        cw_cost = #{cwCost,jdbcType=DECIMAL},
+      </if>
+      <if test="refundableAmount != null">
+        refundable_amount = #{refundableAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="cwRemarks != null">
+        cw_remarks = #{cwRemarks,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.NewOrderChange">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+    -->
+    update new_order_change
+    set order_no = #{orderNo,jdbcType=VARCHAR},
+      process_state = #{processState,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
+      type = #{type,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      voucher_url = #{voucherUrl,jdbcType=VARCHAR},
+      total_amount = #{totalAmount,jdbcType=DECIMAL},
+      settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
+      change_amount = #{changeAmount,jdbcType=DECIMAL},
+      applicant = #{applicant,jdbcType=VARCHAR},
+      dep_name = #{depName,jdbcType=VARCHAR},
+      project_state = #{projectState,jdbcType=VARCHAR},
+      zxs_cost = #{zxsCost,jdbcType=DECIMAL},
+      zxs_remarks = #{zxsRemarks,jdbcType=VARCHAR},
+      payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      payment_amount = #{paymentAmount,jdbcType=DECIMAL},
+      invoice_time = #{invoiceTime,jdbcType=TIMESTAMP},
+      invoice_amount = #{invoiceAmount,jdbcType=DECIMAL},
+      invoice_type = #{invoiceType,jdbcType=VARCHAR},
+      cw_cost = #{cwCost,jdbcType=DECIMAL},
+      refundable_amount = #{refundableAmount,jdbcType=DECIMAL},
+      cw_remarks = #{cwRemarks,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">
+select
+	a.id, a.order_no orderNo, a.process_state processState, a.status, a.`type`,a.refundable_amount refundableAmount,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,
+	a.total_amount totalAmount, a.settlement_amount settlementAmount, (a.total_amount-a.settlement_amount) arrears,
+	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
+	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
+	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
+	a.cw_remarks cwRemarks from new_order_change a where 1 = 1
+	and a.order_no= #{orderNo}
+	order by a.create_time desc
+	limit 1
+  </select>
+  
+  <select id="selectById" resultType="com.goafanti.order.bo.NewOrderChangeBo">
+  select
+	a.id, a.order_no orderNo, a.process_state processState, a.status, a.`type`,a.refundable_amount refundableAmount,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,
+	a.total_amount totalAmount, a.settlement_amount settlementAmount, (a.total_amount-a.settlement_amount) arrears,
+	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
+	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
+	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
+	a.cw_remarks cwRemarks from new_order_change a where 1 = 1 and a.id= #{id}
+  </select>
+  <select id="checkOderNo" resultType="java.lang.Integer">
+  select count(*) from new_order_change
+	where status != 4 and order_no= #{orderNo}
+  </select>
+  <select id="selectOrderChangeList" resultType="com.goafanti.order.bo.NewOderCahngeListBo">
+  select a.id,a.order_no orderNo, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,c.nickname,b.order_type orderType, 
+  date_format(b.create_time,'%Y-%m-%d %H:%i:%S')establishTimes, b.order_status orderStatus,b.total_amount totalAmount,a.status ,
+  b.settlement_amount settlementAmount,(b.total_amount-b.settlement_amount) arrears,d.name salesmanName,e.name depName,a.`type`,
+  a.process_state processState from new_order_change a left join t_order_new b on a.order_no=b.order_no 
+  left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id 
+	<if test="processState==2 or processState==3 "> 
+	left join (select x.order_no,x.aid from (SELECT order_no,task_allocator aid FROM t_order_task where task_allocator is not null
+  UNION SELECT order_no,task_receiver aid FROM t_order_task  where task_receiver is not null)x group by order_no,aid) f on a.order_no=f.order_no
+	</if> 
+	where 1=1
+	<if test="processState==0">
+	and b.salesman_id= #{aid}
+	</if>
+	<if test="processState==1">
+	and b.order_dep in
+  	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
+	 #{deps.id}
+  	</foreach>
+	</if>
+	<if test="processState==2 or processState==3 ">
+	and f.aid=#{aid}  and process_state &gt;= 2
+	</if>
+	<if test="processState==5">
+	and b.finance_id =#{aid}
+	</if>
+	<if test="userName !=null">
+	and c.nickname like concat('%',#{userName},'%')
+	</if>
+	<if test="timeType == 0 and startTime !=null and endTime !=null">
+	and a.create_time between #{startTime} and #{endTime}
+	</if>
+	<if test="timeType == 1 and startTime !=null and endTime !=null">
+	and b.create_time between #{startTime} and #{endTime}
+	</if>
+	<if test="depId !=null">
+	and b.order_dep = #{depId}
+	</if>
+	<if test="salesmanName !=null">
+	and d.name like concat('%',#{salesmanName},'%')
+	</if>
+	<if test="complete ==0 and processState != 8">
+	 and a.process_state &gt;= #{processState}
+	</if>
+	<if test="complete ==0 and processState == 8">
+	 and a.process_state &gt;= #{processState} and  a.process_state &lt; 9
+	</if>
+	<if test="complete ==1 and processState != 5 and processState != 7 and processState != 8">
+	 and a.process_state = #{processState} 
+	</if>
+	<if test="complete ==1 and processState == 5">
+	 and a.process_state in(5,9)  and a.status !=4
+	</if>
+	<if test="complete ==1 and processState == 7">
+	 and a.process_state = 7  and  a.status != 4
+	</if>
+	<if test="complete ==1 and processState == 8">
+	 and a.process_state = #{processState}  and a.status != 4
+	</if>
+	<if test="complete ==2 and processState != 5 and processState != 7 and processState != 8">
+	 and a.process_state &gt; #{processState}  
+	</if>
+	<if test="complete ==2 and processState == 5">
+	 and (a.process_state &gt; 5 and a.process_state &lt; 9) or (a.process_state =9 and a.status=4) 
+	</if>
+	<if test="complete ==2 and processState == 7">
+	 and ((a.process_state = 7  and  a.status = 4)or a.process_state &gt; 7)
+	</if>
+	<if test="complete ==2 and processState == 8">
+	 and a.process_state = 8  and  a.status = 4
+	</if>
+	order by a.create_time 
+	<if test="page_sql != null">
+			${page_sql}
+	</if>
+  </select>
+  
+  <select id="selectOrderChangeCount" resultType="java.lang.Integer">
+  select count(*) from new_order_change a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
+  left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
+	<if test="processState==2 or processState==3 "> 
+	left join (select x.order_no,x.aid from (SELECT order_no,task_allocator aid FROM t_order_task where task_allocator is not null
+  UNION SELECT order_no,task_receiver aid FROM t_order_task  where task_receiver is not null)x group by order_no,aid) f on a.order_no=f.order_no
+	</if> 
+	where 1=1
+	<if test="processState==0">
+	and b.salesman_id= #{aid}
+	</if>
+	<if test="processState==1">
+	and b.order_dep in
+  	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
+	 #{deps.id}
+  	</foreach>
+	</if>
+	<if test="processState==2 or processState==3 ">
+	and f.aid=#{aid}
+	</if>
+	<if test="processState==5">
+	and b.finance_id =#{aid}
+	</if>
+	<if test="userName !=null">
+	and c.nickname like concat('%',#{userName},'%')
+	</if>
+	<if test="timeType == 0 and startTime !=null and endTime !=null">
+	and a.create_time between #{startTime} and #{endTime}
+	</if>
+	<if test="timeType == 1 and startTime !=null and endTime !=null">
+	and b.create_time between #{startTime} and #{endTime}
+	</if>
+	<if test="depId !=null">
+	and b.order_dep = #{depId}
+	</if>
+	<if test="salesmanName !=null">
+	and d.name like concat('%',#{salesmanName},'%')
+	</if>
+	<if test="complete ==0 and processState != 8">
+	 and a.process_state &gt;= #{processState}
+	</if>
+	<if test="complete ==0 and processState == 8">
+	 and a.process_state &gt;= #{processState} and  a.process_state &lt; 9
+	</if>
+	<if test="complete ==1 and processState != 5 and processState != 7 and processState != 8">
+	 and a.process_state = #{processState} 
+	</if>
+	<if test="complete ==1 and processState == 5">
+	 and a.process_state in(5,9)  and a.status !=4
+	</if>
+	<if test="complete ==1 and processState == 7">
+	 and a.process_state = 7  and  a.status != 4
+	</if>
+	<if test="complete ==1 and processState == 8">
+	 and a.process_state = #{processState}  and a.status != 4
+	</if>
+	<if test="complete ==2 and processState != 5 and processState != 7 and processState != 8">
+	 and a.process_state &gt; #{processState}  
+	</if>
+	<if test="complete ==2 and processState == 5">
+	 and ((a.process_state &gt; 5 and  a.status != 4)or  (a.process_state in (5,9) and  a.status = 4))    
+	</if>
+	<if test="complete ==2 and processState == 7">
+	 and ((a.process_state = 7  and  a.status = 4)or a.process_state &gt; 7)
+	</if>
+	<if test="complete ==2 and processState == 8">
+	 and a.process_state = 8  and  a.status = 4
+	</if>
+	</select>
+</mapper>

+ 325 - 0
src/main/java/com/goafanti/common/mapper/OrderChangeLogMapper.xml

@@ -0,0 +1,325 @@
+<?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.OrderChangeLogMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrderChangeLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="change_id" jdbcType="INTEGER" property="changeId" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="auditor" jdbcType="VARCHAR" property="auditor" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    id, change_id, order_no, status, create_time, remarks, auditor
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.OrderChangeLogExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from order_change_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from order_change_log
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    delete from order_change_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrderChangeLogExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    delete from order_change_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrderChangeLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    insert into order_change_log (id, change_id, order_no, 
+      status, create_time, remarks, 
+      auditor)
+    values (#{id,jdbcType=INTEGER}, #{changeId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, 
+      #{auditor,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrderChangeLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    insert into order_change_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="changeId != null">
+        change_id,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="auditor != null">
+        auditor,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="changeId != null">
+        #{changeId,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="auditor != null">
+        #{auditor,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.OrderChangeLogExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    select count(*) from order_change_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    update order_change_log
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.changeId != null">
+        change_id = #{record.changeId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditor != null">
+        auditor = #{record.auditor,jdbcType=VARCHAR},
+      </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 Fri Aug 16 14:22:36 CST 2019.
+    -->
+    update order_change_log
+    set id = #{record.id,jdbcType=INTEGER},
+      change_id = #{record.changeId,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      auditor = #{record.auditor,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrderChangeLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    update order_change_log
+    <set>
+      <if test="changeId != null">
+        change_id = #{changeId,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="auditor != null">
+        auditor = #{auditor,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrderChangeLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 16 14:22:36 CST 2019.
+    -->
+    update order_change_log
+    set change_id = #{changeId,jdbcType=INTEGER},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      auditor = #{auditor,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectOrderChangeLogList" resultType="com.goafanti.order.bo.OrderChangeLogBo">
+  select a.id,a.change_id changeId,a.order_no orderNo,a.status,a.remarks,a.auditor,a.create_time createTime,
+		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes ,b.name aname
+		from order_change_log a left join admin b on a.auditor=b.id
+		where a.change_id= #{changeId}
+		order by a.create_time
+  </select>
+</mapper>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -488,7 +488,7 @@
   	left join admin ad on b.creater = ad.id
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
-  	where b.delete_sign = 0 
+  	where b.delete_sign != 1 
   	<if test='b.orderNo != null and b.orderNo != ""'>
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>
@@ -526,7 +526,7 @@
   	left join `user` a on b.payee_id = a.id
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
-  	where b.delete_sign = 0 
+  	where b.delete_sign != 1 
   	<if test='b.orderNo != null and b.orderNo != ""'>
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>

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

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Apr 08 14:22:15 CST 2018.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -19,7 +19,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -53,7 +53,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -87,7 +87,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     id, order_no, creater_id, create_time, change_comment, change_status, delete_sign
   </sql>
@@ -95,7 +95,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     select
     <if test="distinct">
@@ -114,7 +114,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -125,7 +125,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     delete from t_order_change
     where id = #{id,jdbcType=VARCHAR}
@@ -134,7 +134,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     delete from t_order_change
     <if test="_parameter != null">
@@ -145,7 +145,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     insert into t_order_change (id, order_no, creater_id, 
       create_time, change_comment, change_status, 
@@ -158,7 +158,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     insert into t_order_change
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -212,7 +212,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     select count(*) from t_order_change
     <if test="_parameter != null">
@@ -223,7 +223,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     update t_order_change
     <set>
@@ -257,7 +257,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     update t_order_change
     set id = #{record.id,jdbcType=VARCHAR},
@@ -275,7 +275,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     update t_order_change
     <set>
@@ -304,7 +304,7 @@
     <!--
       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.
+      This element was generated on Fri Aug 16 09:06:39 CST 2019.
     -->
     update t_order_change
     set order_no = #{orderNo,jdbcType=VARCHAR},

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

@@ -369,6 +369,13 @@
   	select id,dun_subject as dunSubject,money,order_no as orderNo,dun_status as dunStatus from t_order_dun 
     where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
   </select>
+  
+  <select id="selectByOrderNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_order_dun
+    where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
+  </select>
   <select id="getOrderDunData" resultType="com.goafanti.order.bo.TOrderNewBo">
 select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
     c.nickname as userName,b.order_status as orderStatus,b.total_amount as totalAmount,

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

@@ -284,7 +284,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOrderByNo" 	parameterType="string"	resultType="com.goafanti.order.bo.TOrderLogBo">
-  select a.id,a.order_no as orderNo,a.process,a.create_time as createTime, b.name as adminName
+  select a.id,a.order_no as orderNo,a.aid,a.process,a.create_time as createTime, b.name as adminName
 	from t_order_log a left join admin b on a.aid=b.id
 	where a.order_no= #{orderNo,jdbcType=VARCHAR}
 	order by a.create_time

+ 82 - 44
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_type" jdbcType="INTEGER" property="orderType" />
@@ -41,12 +41,14 @@
     <result column="proof_status" jdbcType="INTEGER" property="proofStatus" />
     <result column="order_dep" jdbcType="VARCHAR" property="orderDep" />
     <result column="outsource" jdbcType="INTEGER" property="outsource" />
+    <result column="additional_order" jdbcType="VARCHAR" property="additionalOrder" />
+    <result column="primary_order" jdbcType="VARCHAR" property="primaryOrder" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderNew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     <result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
   </resultMap>
@@ -54,7 +56,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -88,7 +90,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -122,20 +124,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     order_no, order_type, creater, create_time, update_time, buyer_id, first_amount, 
     total_amount, settlement_amount, refund_amount, order_status, liquidation_status, 
     process_status, project_status, approval, order_remarks, delete_sign, salesman_id, 
     finance_id, technician_id, sign_time, settlement_time, contract_no, contract_type, 
     contacts, contact_mobile, legal_person, legal_person_tel, proof_count, proof_aid, 
-    proof_time, proof_status, order_dep, outsource
+    proof_time, proof_status, order_dep, outsource, additional_order, primary_order
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     contract_picture_url
   </sql>
@@ -143,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     select
     <if test="distinct">
@@ -164,7 +166,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     select
     <if test="distinct">
@@ -183,7 +185,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -196,7 +198,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     delete from t_order_new
     where order_no = #{orderNo,jdbcType=VARCHAR}
@@ -205,7 +207,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     delete from t_order_new
     <if test="_parameter != null">
@@ -216,7 +218,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     insert into t_order_new (order_no, order_type, creater, 
       create_time, update_time, buyer_id, 
@@ -229,7 +231,8 @@
       contacts, contact_mobile, legal_person, 
       legal_person_tel, proof_count, proof_aid, 
       proof_time, proof_status, order_dep, 
-      outsource, contract_picture_url)
+      outsource, additional_order, primary_order, 
+      contract_picture_url)
     values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, 
       #{firstAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL}, 
@@ -241,13 +244,14 @@
       #{contacts,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, #{legalPerson,jdbcType=VARCHAR}, 
       #{legalPersonTel,jdbcType=VARCHAR}, #{proofCount,jdbcType=REAL}, #{proofAid,jdbcType=VARCHAR}, 
       #{proofTime,jdbcType=TIMESTAMP}, #{proofStatus,jdbcType=INTEGER}, #{orderDep,jdbcType=VARCHAR}, 
-      #{outsource,jdbcType=INTEGER}, #{contractPictureUrl,jdbcType=LONGVARCHAR})
+      #{outsource,jdbcType=INTEGER}, #{additionalOrder,jdbcType=VARCHAR}, #{primaryOrder,jdbcType=VARCHAR}, 
+      #{contractPictureUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     insert into t_order_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -353,6 +357,12 @@
       <if test="outsource != null">
         outsource,
       </if>
+      <if test="additionalOrder != null">
+        additional_order,
+      </if>
+      <if test="primaryOrder != null">
+        primary_order,
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url,
       </if>
@@ -460,6 +470,12 @@
       <if test="outsource != null">
         #{outsource,jdbcType=INTEGER},
       </if>
+      <if test="additionalOrder != null">
+        #{additionalOrder,jdbcType=VARCHAR},
+      </if>
+      <if test="primaryOrder != null">
+        #{primaryOrder,jdbcType=VARCHAR},
+      </if>
       <if test="contractPictureUrl != null">
         #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -469,7 +485,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     select count(*) from t_order_new
     <if test="_parameter != null">
@@ -480,7 +496,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     update t_order_new
     <set>
@@ -586,6 +602,12 @@
       <if test="record.outsource != null">
         outsource = #{record.outsource,jdbcType=INTEGER},
       </if>
+      <if test="record.additionalOrder != null">
+        additional_order = #{record.additionalOrder,jdbcType=VARCHAR},
+      </if>
+      <if test="record.primaryOrder != null">
+        primary_order = #{record.primaryOrder,jdbcType=VARCHAR},
+      </if>
       <if test="record.contractPictureUrl != null">
         contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -598,7 +620,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     update t_order_new
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -635,6 +657,8 @@
       proof_status = #{record.proofStatus,jdbcType=INTEGER},
       order_dep = #{record.orderDep,jdbcType=VARCHAR},
       outsource = #{record.outsource,jdbcType=INTEGER},
+      additional_order = #{record.additionalOrder,jdbcType=VARCHAR},
+      primary_order = #{record.primaryOrder,jdbcType=VARCHAR},
       contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -644,7 +668,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     update t_order_new
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -680,7 +704,9 @@
       proof_time = #{record.proofTime,jdbcType=TIMESTAMP},
       proof_status = #{record.proofStatus,jdbcType=INTEGER},
       order_dep = #{record.orderDep,jdbcType=VARCHAR},
-      outsource = #{record.outsource,jdbcType=INTEGER}
+      outsource = #{record.outsource,jdbcType=INTEGER},
+      additional_order = #{record.additionalOrder,jdbcType=VARCHAR},
+      primary_order = #{record.primaryOrder,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -689,7 +715,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     update t_order_new
     <set>
@@ -792,6 +818,12 @@
       <if test="outsource != null">
         outsource = #{outsource,jdbcType=INTEGER},
       </if>
+      <if test="additionalOrder != null">
+        additional_order = #{additionalOrder,jdbcType=VARCHAR},
+      </if>
+      <if test="primaryOrder != null">
+        primary_order = #{primaryOrder,jdbcType=VARCHAR},
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -802,7 +834,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     update t_order_new
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -838,6 +870,8 @@
       proof_status = #{proofStatus,jdbcType=INTEGER},
       order_dep = #{orderDep,jdbcType=VARCHAR},
       outsource = #{outsource,jdbcType=INTEGER},
+      additional_order = #{additionalOrder,jdbcType=VARCHAR},
+      primary_order = #{primaryOrder,jdbcType=VARCHAR},
       contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -845,7 +879,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 11:48:15 CST 2019.
+      This element was generated on Fri Aug 16 14:55:05 CST 2019.
     -->
     update t_order_new
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -880,7 +914,9 @@
       proof_time = #{proofTime,jdbcType=TIMESTAMP},
       proof_status = #{proofStatus,jdbcType=INTEGER},
       order_dep = #{orderDep,jdbcType=VARCHAR},
-      outsource = #{outsource,jdbcType=INTEGER}
+      outsource = #{outsource,jdbcType=INTEGER},
+      additional_order = #{additionalOrder,jdbcType=VARCHAR},
+      primary_order = #{primaryOrder,jdbcType=VARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
   
@@ -891,7 +927,7 @@
   	,liquidation_status,o.finance_id as financeId,contract_no as contractNo,d.name as departmentName,e.name as outsourceName
   	from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
   	left join department d on o.order_dep=d.id left join (select order_no,max(name)as name from outsource_organization group by order_no) e
-  	 on o.order_no=e.order_no  left join t_order_outsource f on f.order_no=o.order_no where delete_sign = 0 
+  	 on o.order_no=e.order_no  left join t_order_outsource f on f.order_no=o.order_no where delete_sign != 1 
   	and approval in (0,2) 
   	<if test="o.outsource != null">
   	and o.outsource=#{o.outsource,jdbcType=INTEGER}
@@ -936,7 +972,7 @@
   </select>
   <select id="getAllUnassignedCountOrder" parameterType="Map" resultType="java.lang.Integer">
   select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
-  	left join t_order_outsource f on f.order_no=o.order_no where delete_sign = 0  and approval in (0,2) 
+  	left join t_order_outsource f on f.order_no=o.order_no where delete_sign != 1  and approval in (0,2) 
 	<if test="o.outsource != null">
   	and o.outsource=#{o.outsource,jdbcType=INTEGER}
   	</if>
@@ -1053,7 +1089,7 @@
   on o.order_dep=d.id left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id left join 
   (select sum(transaction_amount) as amount ,order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no 
   left join (select order_no,max(name) as name from outsource_organization group by order_no) e 
-  on o.order_no=e.order_no where delete_sign = 0 and outsource=#{o.outsource,jdbcType=INTEGER}
+  on o.order_no=e.order_no where delete_sign != 1 and outsource=#{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
@@ -1100,7 +1136,7 @@
   	 left join admin a on o.salesman_id = a.id
   	 left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new
   				group by order_no ) b on b.order_no = o.order_no
-  	 where delete_sign = 0 and outsource=#{o.outsource,jdbcType=INTEGER}
+  	 where delete_sign != 1 and outsource=#{o.outsource,jdbcType=INTEGER}
   		<if test="o.processStatus == 3">
 	  	and process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
@@ -1166,7 +1202,7 @@
 where super_id is null )  e on e.order_no=a.order_no
   	left join admin f on e.task_receiver=f.id
   	</if>
-  	where a.delete_sign = 0
+  	where a.delete_sign !=1
   	<if test="outsource != null">
   	and a.outsource= #{outsource,jdbcType=INTEGER}
   	</if>
@@ -1253,7 +1289,7 @@ where super_id is null )  e on e.order_no=a.order_no
 where super_id is null ) e on e.order_no=a.order_no
   	left join admin f on e.task_receiver=f.id
   	</if>
-  	where a.delete_sign = 0 
+  	where a.delete_sign != 1 
   	<if test="outsource != null">
   	and a.outsource= #{outsource,jdbcType=INTEGER}
   	</if>
@@ -1320,7 +1356,7 @@ where super_id is null ) e on e.order_no=a.order_no
     left join `user` c on b.buyer_id=c.id 
     left join admin d on b.salesman_id=d.id
     left join department dep on d.department_id=dep.id
-    where a.start_time is not null and b.delete_sign = 0
+    where a.start_time is not null and b.delete_sign != 1
     <if test="name != null">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -1351,7 +1387,7 @@ where super_id is null ) e on e.order_no=a.order_no
 		count(*)
     from t_order_dun a left join t_order_new b on a.order_no=b.order_no
     left join `user` c on b.buyer_id=c.id 
-    where a.start_time is not null and b.delete_sign = 0
+    where a.start_time is not null and b.delete_sign != 1
     <if test="name != null">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -1373,15 +1409,17 @@ where super_id is null ) e on e.order_no=a.order_no
   </select>
   
   <select id="getOrderNewDetail" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-      select 
-    a.order_no as orderNo, a.order_type as orderType, a.creater, a.create_time as createTime,a.update_time as updateTime, a.buyer_id as buyerId, a.first_amount as firstAmount, 
-    a.total_amount as totalAmount, a.settlement_amount as settlementAmount, order_status as orderStatus, a.liquidation_status as liquidationStatus, a.process_status as processStatus, 
-    a.project_status as projectStatus, a.approval, a.order_remarks as orderRemarks, a.delete_sign as deleteSign, a.salesman_id as salesmanId, finance_id as financeId, technician_id as technicianId, 
-    a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts, a.contact_mobile as contactMobile, 
-    a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount, a.proof_aid as proofAid,contract_picture_url as contractPictureUrl,
-    c.name as salesmanName,dep.name as depName,d.name as financeName,c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName
-    ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep,
-    g.location_province as locationProvince,g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource
+    select 
+    a.order_no as orderNo, a.order_type as orderType, a.creater, a.create_time as createTime,a.update_time as updateTime, a.buyer_id as buyerId,
+    a.first_amount as firstAmount,a.total_amount as totalAmount, a.settlement_amount as settlementAmount, order_status as orderStatus,
+    a.liquidation_status as liquidationStatus, a.process_status as processStatus, a.project_status as projectStatus, a.approval,
+    a.order_remarks as orderRemarks, a.delete_sign as deleteSign, a.salesman_id as salesmanId, finance_id as financeId, technician_id as technicianId, 
+    a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts,
+    a.contact_mobile as contactMobile, a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount,
+    a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,
+    c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName ,e.back_status as backStatus,f.name as initiateName,
+    e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
+    g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.additional_order additionalOrder
     from t_order_new a left join `user` b on a.buyer_id=b.id left join admin c on a.salesman_id=c.id
     left join department dep on a.order_dep=dep.id left join admin d on a.finance_id=d.id
   	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
@@ -1395,7 +1433,7 @@ where super_id is null ) e on e.order_no=a.order_no
     a.reason,b.liquidation_status as liquidationStatus
     from t_order_refund a left join t_order_new b on a.order_no=b.order_no
     left join `user` c on b.buyer_id=c.id 
-    where  b.delete_sign = 0 
+    where  b.delete_sign != 1 
     <if test="name != null">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -1419,7 +1457,7 @@ where super_id is null ) e on e.order_no=a.order_no
 		count(*)
   	 from t_order_refund a left join t_order_new b on a.order_no=b.order_no
     left join `user` c on b.buyer_id=c.id 
-    where  b.delete_sign = 0 
+    where  b.delete_sign != 1 
     <if test="name != null">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml

@@ -466,7 +466,7 @@
 	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
 	left join admin d on b.salesman_id=d.id left join department e on d.department_id=e.id
 	left join admin f on b.finance_id=f.id
-	where 1=1 and b.outsource=1
+	where b.delete_sign !=1 and b.outsource=1
 		and d.department_id in
   	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}
@@ -491,7 +491,7 @@
   <select id="salesmanOrderOutsourceCount" resultType="java.lang.Integer">
   select count(*) from t_order_outsource a left join t_order_new b on a.order_no=b.order_no 
   left join `user` c on b.buyer_id=c.id  left join admin d on b.salesman_id=d.id
-  where 1=1 and b.outsource=1
+  where b.delete_sign !=1 and b.outsource=1
   	and d.department_id in
   	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}

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

@@ -886,7 +886,7 @@
   	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
     group by task_id) i on a.id=i.task_id  left join (select order_no,max(name)as name from outsource_organization group by order_no) j 
-    on a.order_no=j.order_no where e.delete_sign=0  and e.order_status not in (5,7) and e.outsource= #{outsource,jdbcType=INTEGER}
+    on a.order_no=j.order_no where e.delete_sign !=1  and e.order_status not in (5,7) and e.outsource= #{outsource,jdbcType=INTEGER}
     <if test="specially == 0 or specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>
@@ -924,7 +924,7 @@
     left join t_order_new e on a.order_no=e.order_no
     left join admin g on e.salesman_id=g.id
     left join department h on g.department_id=h.id
-    where e.delete_sign=0  and e.order_status not in (5,7)
+    where e.delete_sign !=1 and e.order_status not in (5,7)
     and e.outsource= #{outsource,jdbcType=INTEGER}
     <if test="specially == 0 or specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
@@ -988,7 +988,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join department dep on e.order_dep=dep.id  
     left join user f on e.buyer_id=f.id
     left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id
-    where e.delete_sign=0 and a.super_id is null
+    where e.delete_sign !=1 and a.super_id is null
     <if test="fid != null">
   	and e.finance_id= #{fid,jdbcType=VARCHAR}
   	</if>
@@ -1014,7 +1014,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join admin d on a.task_receiver=d.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
-    where e.delete_sign=0 and a.super_id is null
+    where e.delete_sign !=1 and a.super_id is null
     <if test="fid != null">
   	and e.finance_id= #{fid,jdbcType=VARCHAR}
   	</if>
@@ -1042,7 +1042,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id
     left join (select task_id , sum(already_number) as alreadyNumber from task_progress group by task_id) i on a.id=i.task_id
-    where e.delete_sign=0 
+    where e.delete_sign !=1 
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
@@ -1081,7 +1081,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id
     left join (select task_id , sum(already_number) as alreadyNumber from task_progress group by task_id) i on a.id=i.task_id
-    where e.delete_sign=0 
+    where e.delete_sign !=1 
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>

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

@@ -331,7 +331,7 @@
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
     left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id
-    where e.delete_sign=0 and a.super_id is null
+    where e.delete_sign !=1 and a.super_id is null
     <if test="fid != null">
   	and e.finance_id= #{fid,jdbcType=VARCHAR}
   	</if>

+ 560 - 0
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -0,0 +1,560 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class NewOrderChange {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.id
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.order_no
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.process_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Integer processState;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.status
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Integer type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.create_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.voucher_url
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String voucherUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.total_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal totalAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.settlement_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal settlementAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.change_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal changeAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.applicant
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String applicant;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.dep_name
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String depName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.project_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String projectState;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal zxsCost;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String zxsRemarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Date paymentTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal paymentAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Date invoiceTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal invoiceAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String invoiceType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal cwCost;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refundable_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal refundableAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String cwRemarks;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.id
+	 * @return  the value of new_order_change.id
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.id
+	 * @param id  the value for new_order_change.id
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.order_no
+	 * @return  the value of new_order_change.order_no
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.order_no
+	 * @param orderNo  the value for new_order_change.order_no
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.process_state
+	 * @return  the value of new_order_change.process_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Integer getProcessState() {
+		return processState;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.process_state
+	 * @param processState  the value for new_order_change.process_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setProcessState(Integer processState) {
+		this.processState = processState;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.status
+	 * @return  the value of new_order_change.status
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.status
+	 * @param status  the value for new_order_change.status
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.type
+	 * @return  the value of new_order_change.type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.type
+	 * @param type  the value for new_order_change.type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.create_time
+	 * @return  the value of new_order_change.create_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.create_time
+	 * @param createTime  the value for new_order_change.create_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.remarks
+	 * @return  the value of new_order_change.remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.remarks
+	 * @param remarks  the value for new_order_change.remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.voucher_url
+	 * @return  the value of new_order_change.voucher_url
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getVoucherUrl() {
+		return voucherUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.voucher_url
+	 * @param voucherUrl  the value for new_order_change.voucher_url
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setVoucherUrl(String voucherUrl) {
+		this.voucherUrl = voucherUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.total_amount
+	 * @return  the value of new_order_change.total_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getTotalAmount() {
+		return totalAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.total_amount
+	 * @param totalAmount  the value for new_order_change.total_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setTotalAmount(BigDecimal totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.settlement_amount
+	 * @return  the value of new_order_change.settlement_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getSettlementAmount() {
+		return settlementAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.settlement_amount
+	 * @param settlementAmount  the value for new_order_change.settlement_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setSettlementAmount(BigDecimal settlementAmount) {
+		this.settlementAmount = settlementAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.change_amount
+	 * @return  the value of new_order_change.change_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getChangeAmount() {
+		return changeAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.change_amount
+	 * @param changeAmount  the value for new_order_change.change_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setChangeAmount(BigDecimal changeAmount) {
+		this.changeAmount = changeAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.applicant
+	 * @return  the value of new_order_change.applicant
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getApplicant() {
+		return applicant;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.applicant
+	 * @param applicant  the value for new_order_change.applicant
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setApplicant(String applicant) {
+		this.applicant = applicant;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.dep_name
+	 * @return  the value of new_order_change.dep_name
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getDepName() {
+		return depName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.dep_name
+	 * @param depName  the value for new_order_change.dep_name
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.project_state
+	 * @return  the value of new_order_change.project_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getProjectState() {
+		return projectState;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.project_state
+	 * @param projectState  the value for new_order_change.project_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setProjectState(String projectState) {
+		this.projectState = projectState;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.zxs_cost
+	 * @return  the value of new_order_change.zxs_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getZxsCost() {
+		return zxsCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.zxs_cost
+	 * @param zxsCost  the value for new_order_change.zxs_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setZxsCost(BigDecimal zxsCost) {
+		this.zxsCost = zxsCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.zxs_remarks
+	 * @return  the value of new_order_change.zxs_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getZxsRemarks() {
+		return zxsRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.zxs_remarks
+	 * @param zxsRemarks  the value for new_order_change.zxs_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setZxsRemarks(String zxsRemarks) {
+		this.zxsRemarks = zxsRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.payment_time
+	 * @return  the value of new_order_change.payment_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Date getPaymentTime() {
+		return paymentTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.payment_time
+	 * @param paymentTime  the value for new_order_change.payment_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setPaymentTime(Date paymentTime) {
+		this.paymentTime = paymentTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.payment_amount
+	 * @return  the value of new_order_change.payment_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getPaymentAmount() {
+		return paymentAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.payment_amount
+	 * @param paymentAmount  the value for new_order_change.payment_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setPaymentAmount(BigDecimal paymentAmount) {
+		this.paymentAmount = paymentAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_time
+	 * @return  the value of new_order_change.invoice_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Date getInvoiceTime() {
+		return invoiceTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_time
+	 * @param invoiceTime  the value for new_order_change.invoice_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setInvoiceTime(Date invoiceTime) {
+		this.invoiceTime = invoiceTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_amount
+	 * @return  the value of new_order_change.invoice_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getInvoiceAmount() {
+		return invoiceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_amount
+	 * @param invoiceAmount  the value for new_order_change.invoice_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
+		this.invoiceAmount = invoiceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_type
+	 * @return  the value of new_order_change.invoice_type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getInvoiceType() {
+		return invoiceType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_type
+	 * @param invoiceType  the value for new_order_change.invoice_type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setInvoiceType(String invoiceType) {
+		this.invoiceType = invoiceType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.cw_cost
+	 * @return  the value of new_order_change.cw_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getCwCost() {
+		return cwCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.cw_cost
+	 * @param cwCost  the value for new_order_change.cw_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setCwCost(BigDecimal cwCost) {
+		this.cwCost = cwCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refundable_amount
+	 * @return  the value of new_order_change.refundable_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getRefundableAmount() {
+		return refundableAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refundable_amount
+	 * @param refundableAmount  the value for new_order_change.refundable_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setRefundableAmount(BigDecimal refundableAmount) {
+		this.refundableAmount = refundableAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.cw_remarks
+	 * @return  the value of new_order_change.cw_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getCwRemarks() {
+		return cwRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.cw_remarks
+	 * @param cwRemarks  the value for new_order_change.cw_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setCwRemarks(String cwRemarks) {
+		this.cwRemarks = cwRemarks;
+	}
+}

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


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

@@ -0,0 +1,168 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class OrderChangeLog {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column order_change_log.id
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column order_change_log.change_id
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	private Integer changeId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column order_change_log.order_no
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column order_change_log.status
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column order_change_log.create_time
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column order_change_log.remarks
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column order_change_log.auditor
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	private String auditor;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column order_change_log.id
+	 * @return  the value of order_change_log.id
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column order_change_log.id
+	 * @param id  the value for order_change_log.id
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column order_change_log.change_id
+	 * @return  the value of order_change_log.change_id
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public Integer getChangeId() {
+		return changeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column order_change_log.change_id
+	 * @param changeId  the value for order_change_log.change_id
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setChangeId(Integer changeId) {
+		this.changeId = changeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column order_change_log.order_no
+	 * @return  the value of order_change_log.order_no
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column order_change_log.order_no
+	 * @param orderNo  the value for order_change_log.order_no
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column order_change_log.status
+	 * @return  the value of order_change_log.status
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column order_change_log.status
+	 * @param status  the value for order_change_log.status
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column order_change_log.create_time
+	 * @return  the value of order_change_log.create_time
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column order_change_log.create_time
+	 * @param createTime  the value for order_change_log.create_time
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column order_change_log.remarks
+	 * @return  the value of order_change_log.remarks
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column order_change_log.remarks
+	 * @param remarks  the value for order_change_log.remarks
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column order_change_log.auditor
+	 * @return  the value of order_change_log.auditor
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public String getAuditor() {
+		return auditor;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column order_change_log.auditor
+	 * @param auditor  the value for order_change_log.auditor
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setAuditor(String auditor) {
+		this.auditor = auditor;
+	}
+}

+ 712 - 0
src/main/java/com/goafanti/common/model/OrderChangeLogExample.java

@@ -0,0 +1,712 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class OrderChangeLogExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public OrderChangeLogExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(Integer value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(Integer value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(Integer value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(Integer value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(Integer value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<Integer> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<Integer> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(Integer value1, Integer value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdIsNull() {
+			addCriterion("change_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdIsNotNull() {
+			addCriterion("change_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdEqualTo(Integer value) {
+			addCriterion("change_id =", value, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdNotEqualTo(Integer value) {
+			addCriterion("change_id <>", value, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdGreaterThan(Integer value) {
+			addCriterion("change_id >", value, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("change_id >=", value, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdLessThan(Integer value) {
+			addCriterion("change_id <", value, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdLessThanOrEqualTo(Integer value) {
+			addCriterion("change_id <=", value, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdIn(List<Integer> values) {
+			addCriterion("change_id in", values, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdNotIn(List<Integer> values) {
+			addCriterion("change_id not in", values, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdBetween(Integer value1, Integer value2) {
+			addCriterion("change_id between", value1, value2, "changeId");
+			return (Criteria) this;
+		}
+
+		public Criteria andChangeIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("change_id not between", value1, value2, "changeId");
+			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 andStatusIsNull() {
+			addCriterion("status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIsNotNull() {
+			addCriterion("status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusEqualTo(Integer value) {
+			addCriterion("status =", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotEqualTo(Integer value) {
+			addCriterion("status <>", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThan(Integer value) {
+			addCriterion("status >", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("status >=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThan(Integer value) {
+			addCriterion("status <", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("status <=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIn(List<Integer> values) {
+			addCriterion("status in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotIn(List<Integer> values) {
+			addCriterion("status not in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusBetween(Integer value1, Integer value2) {
+			addCriterion("status between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("status not between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria 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 andRemarksIsNull() {
+			addCriterion("remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNotNull() {
+			addCriterion("remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksEqualTo(String value) {
+			addCriterion("remarks =", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotEqualTo(String value) {
+			addCriterion("remarks <>", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThan(String value) {
+			addCriterion("remarks >", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("remarks >=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThan(String value) {
+			addCriterion("remarks <", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThanOrEqualTo(String value) {
+			addCriterion("remarks <=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLike(String value) {
+			addCriterion("remarks like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotLike(String value) {
+			addCriterion("remarks not like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIn(List<String> values) {
+			addCriterion("remarks in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotIn(List<String> values) {
+			addCriterion("remarks not in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksBetween(String value1, String value2) {
+			addCriterion("remarks between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotBetween(String value1, String value2) {
+			addCriterion("remarks not between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorIsNull() {
+			addCriterion("auditor is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorIsNotNull() {
+			addCriterion("auditor is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorEqualTo(String value) {
+			addCriterion("auditor =", value, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorNotEqualTo(String value) {
+			addCriterion("auditor <>", value, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorGreaterThan(String value) {
+			addCriterion("auditor >", value, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorGreaterThanOrEqualTo(String value) {
+			addCriterion("auditor >=", value, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorLessThan(String value) {
+			addCriterion("auditor <", value, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorLessThanOrEqualTo(String value) {
+			addCriterion("auditor <=", value, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorLike(String value) {
+			addCriterion("auditor like", value, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorNotLike(String value) {
+			addCriterion("auditor not like", value, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorIn(List<String> values) {
+			addCriterion("auditor in", values, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorNotIn(List<String> values) {
+			addCriterion("auditor not in", values, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorBetween(String value1, String value2) {
+			addCriterion("auditor between", value1, value2, "auditor");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuditorNotBetween(String value1, String value2) {
+			addCriterion("auditor not between", value1, value2, "auditor");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table order_change_log
+	 * @mbg.generated  Fri Aug 16 14:22:36 CST 2019
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table order_change_log
+     *
+     * @mbg.generated do_not_delete_during_merge Fri Aug 16 09:06:57 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

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

@@ -6,44 +6,44 @@ 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public String getId() {
 		return id;
@@ -52,7 +52,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -61,7 +61,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -70,7 +70,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -79,7 +79,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public String getCreaterId() {
 		return createrId;
@@ -88,7 +88,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setCreaterId(String createrId) {
 		this.createrId = createrId;
@@ -97,7 +97,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -106,7 +106,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -115,7 +115,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public String getChangeComment() {
 		return changeComment;
@@ -124,7 +124,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setChangeComment(String changeComment) {
 		this.changeComment = changeComment;
@@ -133,7 +133,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public Integer getChangeStatus() {
 		return changeStatus;
@@ -142,7 +142,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setChangeStatus(Integer changeStatus) {
 		this.changeStatus = changeStatus;
@@ -151,7 +151,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -160,7 +160,7 @@ public class TOrderChange {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;

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

@@ -7,23 +7,23 @@ 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public TOrderChangeExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -626,7 +626,7 @@ public class TOrderChangeExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Aug 16 09:06:39 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 151 - 105
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -7,184 +7,194 @@ public class TOrderNew {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_no
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_type
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer orderType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.creater
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.create_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.update_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.buyer_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String buyerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.first_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private BigDecimal firstAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.total_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.settlement_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private BigDecimal settlementAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.refund_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private BigDecimal refundAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer orderStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.liquidation_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer liquidationStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.process_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer processStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.project_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer projectStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.approval
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer approval;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_remarks
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String orderRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.delete_sign
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.salesman_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String salesmanId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.finance_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String financeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.technician_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String technicianId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.sign_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Date signTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.settlement_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Date settlementTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_no
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String contractNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_type
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String contractType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contacts
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String contacts;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contact_mobile
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String contactMobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.legal_person
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String legalPerson;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.legal_person_tel
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String legalPersonTel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_count
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Float proofCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_aid
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String proofAid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Date proofTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer proofStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_dep
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String orderDep;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.outsource
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private Integer outsource;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.additional_order
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
+	 */
+	private String additionalOrder;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.primary_order
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
+	 */
+	private String primaryOrder;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_picture_url
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	private String contractPictureUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_no
 	 * @return  the value of t_order_new.order_no
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -193,7 +203,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_no
 	 * @param orderNo  the value for t_order_new.order_no
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -202,7 +212,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_type
 	 * @return  the value of t_order_new.order_type
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getOrderType() {
 		return orderType;
@@ -211,7 +221,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_type
 	 * @param orderType  the value for t_order_new.order_type
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
@@ -220,7 +230,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.creater
 	 * @return  the value of t_order_new.creater
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getCreater() {
 		return creater;
@@ -229,7 +239,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.creater
 	 * @param creater  the value for t_order_new.creater
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -238,7 +248,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.create_time
 	 * @return  the value of t_order_new.create_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -247,7 +257,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.create_time
 	 * @param createTime  the value for t_order_new.create_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -256,7 +266,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.update_time
 	 * @return  the value of t_order_new.update_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -265,7 +275,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.update_time
 	 * @param updateTime  the value for t_order_new.update_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -274,7 +284,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.buyer_id
 	 * @return  the value of t_order_new.buyer_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -283,7 +293,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.buyer_id
 	 * @param buyerId  the value for t_order_new.buyer_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -292,7 +302,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.first_amount
 	 * @return  the value of t_order_new.first_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public BigDecimal getFirstAmount() {
 		return firstAmount;
@@ -301,7 +311,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.first_amount
 	 * @param firstAmount  the value for t_order_new.first_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setFirstAmount(BigDecimal firstAmount) {
 		this.firstAmount = firstAmount;
@@ -310,7 +320,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.total_amount
 	 * @return  the value of t_order_new.total_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -319,7 +329,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.total_amount
 	 * @param totalAmount  the value for t_order_new.total_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -328,7 +338,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.settlement_amount
 	 * @return  the value of t_order_new.settlement_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -337,7 +347,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.settlement_amount
 	 * @param settlementAmount  the value for t_order_new.settlement_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -346,7 +356,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.refund_amount
 	 * @return  the value of t_order_new.refund_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public BigDecimal getRefundAmount() {
 		return refundAmount;
@@ -355,7 +365,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.refund_amount
 	 * @param refundAmount  the value for t_order_new.refund_amount
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setRefundAmount(BigDecimal refundAmount) {
 		this.refundAmount = refundAmount;
@@ -364,7 +374,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_status
 	 * @return  the value of t_order_new.order_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -373,7 +383,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_status
 	 * @param orderStatus  the value for t_order_new.order_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -382,7 +392,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.liquidation_status
 	 * @return  the value of t_order_new.liquidation_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -391,7 +401,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.liquidation_status
 	 * @param liquidationStatus  the value for t_order_new.liquidation_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
@@ -400,7 +410,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.process_status
 	 * @return  the value of t_order_new.process_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getProcessStatus() {
 		return processStatus;
@@ -409,7 +419,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.process_status
 	 * @param processStatus  the value for t_order_new.process_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setProcessStatus(Integer processStatus) {
 		this.processStatus = processStatus;
@@ -418,7 +428,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.project_status
 	 * @return  the value of t_order_new.project_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getProjectStatus() {
 		return projectStatus;
@@ -427,7 +437,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.project_status
 	 * @param projectStatus  the value for t_order_new.project_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
@@ -436,7 +446,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.approval
 	 * @return  the value of t_order_new.approval
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getApproval() {
 		return approval;
@@ -445,7 +455,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.approval
 	 * @param approval  the value for t_order_new.approval
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setApproval(Integer approval) {
 		this.approval = approval;
@@ -454,7 +464,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_remarks
 	 * @return  the value of t_order_new.order_remarks
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getOrderRemarks() {
 		return orderRemarks;
@@ -463,7 +473,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_remarks
 	 * @param orderRemarks  the value for t_order_new.order_remarks
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
@@ -472,7 +482,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.delete_sign
 	 * @return  the value of t_order_new.delete_sign
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -481,7 +491,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.delete_sign
 	 * @param deleteSign  the value for t_order_new.delete_sign
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -490,7 +500,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.salesman_id
 	 * @return  the value of t_order_new.salesman_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -499,7 +509,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.salesman_id
 	 * @param salesmanId  the value for t_order_new.salesman_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -508,7 +518,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.finance_id
 	 * @return  the value of t_order_new.finance_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -517,7 +527,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.finance_id
 	 * @param financeId  the value for t_order_new.finance_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -526,7 +536,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.technician_id
 	 * @return  the value of t_order_new.technician_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getTechnicianId() {
 		return technicianId;
@@ -535,7 +545,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.technician_id
 	 * @param technicianId  the value for t_order_new.technician_id
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setTechnicianId(String technicianId) {
 		this.technicianId = technicianId;
@@ -544,7 +554,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.sign_time
 	 * @return  the value of t_order_new.sign_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Date getSignTime() {
 		return signTime;
@@ -553,7 +563,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.sign_time
 	 * @param signTime  the value for t_order_new.sign_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setSignTime(Date signTime) {
 		this.signTime = signTime;
@@ -562,7 +572,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.settlement_time
 	 * @return  the value of t_order_new.settlement_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Date getSettlementTime() {
 		return settlementTime;
@@ -571,7 +581,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.settlement_time
 	 * @param settlementTime  the value for t_order_new.settlement_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setSettlementTime(Date settlementTime) {
 		this.settlementTime = settlementTime;
@@ -580,7 +590,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contract_no
 	 * @return  the value of t_order_new.contract_no
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getContractNo() {
 		return contractNo;
@@ -589,7 +599,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contract_no
 	 * @param contractNo  the value for t_order_new.contract_no
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
@@ -598,7 +608,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contract_type
 	 * @return  the value of t_order_new.contract_type
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getContractType() {
 		return contractType;
@@ -607,7 +617,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contract_type
 	 * @param contractType  the value for t_order_new.contract_type
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setContractType(String contractType) {
 		this.contractType = contractType;
@@ -616,7 +626,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contacts
 	 * @return  the value of t_order_new.contacts
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getContacts() {
 		return contacts;
@@ -625,7 +635,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contacts
 	 * @param contacts  the value for t_order_new.contacts
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -634,7 +644,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contact_mobile
 	 * @return  the value of t_order_new.contact_mobile
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -643,7 +653,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contact_mobile
 	 * @param contactMobile  the value for t_order_new.contact_mobile
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -652,7 +662,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.legal_person
 	 * @return  the value of t_order_new.legal_person
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getLegalPerson() {
 		return legalPerson;
@@ -661,7 +671,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.legal_person
 	 * @param legalPerson  the value for t_order_new.legal_person
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setLegalPerson(String legalPerson) {
 		this.legalPerson = legalPerson;
@@ -670,7 +680,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.legal_person_tel
 	 * @return  the value of t_order_new.legal_person_tel
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getLegalPersonTel() {
 		return legalPersonTel;
@@ -679,7 +689,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.legal_person_tel
 	 * @param legalPersonTel  the value for t_order_new.legal_person_tel
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setLegalPersonTel(String legalPersonTel) {
 		this.legalPersonTel = legalPersonTel;
@@ -688,7 +698,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.proof_count
 	 * @return  the value of t_order_new.proof_count
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Float getProofCount() {
 		return proofCount;
@@ -697,7 +707,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.proof_count
 	 * @param proofCount  the value for t_order_new.proof_count
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setProofCount(Float proofCount) {
 		this.proofCount = proofCount;
@@ -706,7 +716,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.proof_aid
 	 * @return  the value of t_order_new.proof_aid
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getProofAid() {
 		return proofAid;
@@ -715,7 +725,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.proof_aid
 	 * @param proofAid  the value for t_order_new.proof_aid
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setProofAid(String proofAid) {
 		this.proofAid = proofAid;
@@ -724,7 +734,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.proof_time
 	 * @return  the value of t_order_new.proof_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Date getProofTime() {
 		return proofTime;
@@ -733,7 +743,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.proof_time
 	 * @param proofTime  the value for t_order_new.proof_time
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setProofTime(Date proofTime) {
 		this.proofTime = proofTime;
@@ -742,7 +752,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.proof_status
 	 * @return  the value of t_order_new.proof_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getProofStatus() {
 		return proofStatus;
@@ -751,7 +761,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.proof_status
 	 * @param proofStatus  the value for t_order_new.proof_status
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setProofStatus(Integer proofStatus) {
 		this.proofStatus = proofStatus;
@@ -760,7 +770,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_dep
 	 * @return  the value of t_order_new.order_dep
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getOrderDep() {
 		return orderDep;
@@ -769,7 +779,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_dep
 	 * @param orderDep  the value for t_order_new.order_dep
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setOrderDep(String orderDep) {
 		this.orderDep = orderDep;
@@ -778,7 +788,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.outsource
 	 * @return  the value of t_order_new.outsource
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Integer getOutsource() {
 		return outsource;
@@ -787,16 +797,52 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.outsource
 	 * @param outsource  the value for t_order_new.outsource
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setOutsource(Integer outsource) {
 		this.outsource = outsource;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.additional_order
+	 * @return  the value of t_order_new.additional_order
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
+	 */
+	public String getAdditionalOrder() {
+		return additionalOrder;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.additional_order
+	 * @param additionalOrder  the value for t_order_new.additional_order
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
+	 */
+	public void setAdditionalOrder(String additionalOrder) {
+		this.additionalOrder = additionalOrder;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.primary_order
+	 * @return  the value of t_order_new.primary_order
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
+	 */
+	public String getPrimaryOrder() {
+		return primaryOrder;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.primary_order
+	 * @param primaryOrder  the value for t_order_new.primary_order
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
+	 */
+	public void setPrimaryOrder(String primaryOrder) {
+		this.primaryOrder = primaryOrder;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contract_picture_url
 	 * @return  the value of t_order_new.contract_picture_url
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getContractPictureUrl() {
 		return contractPictureUrl;
@@ -805,7 +851,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contract_picture_url
 	 * @param contractPictureUrl  the value for t_order_new.contract_picture_url
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setContractPictureUrl(String contractPictureUrl) {
 		this.contractPictureUrl = contractPictureUrl;

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

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderNewExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public TOrderNewExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2380,11 +2380,151 @@ public class TOrderNewExample {
 			addCriterion("outsource not between", value1, value2, "outsource");
 			return (Criteria) this;
 		}
+
+		public Criteria andAdditionalOrderIsNull() {
+			addCriterion("additional_order is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderIsNotNull() {
+			addCriterion("additional_order is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderEqualTo(String value) {
+			addCriterion("additional_order =", value, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderNotEqualTo(String value) {
+			addCriterion("additional_order <>", value, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderGreaterThan(String value) {
+			addCriterion("additional_order >", value, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderGreaterThanOrEqualTo(String value) {
+			addCriterion("additional_order >=", value, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderLessThan(String value) {
+			addCriterion("additional_order <", value, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderLessThanOrEqualTo(String value) {
+			addCriterion("additional_order <=", value, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderLike(String value) {
+			addCriterion("additional_order like", value, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderNotLike(String value) {
+			addCriterion("additional_order not like", value, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderIn(List<String> values) {
+			addCriterion("additional_order in", values, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderNotIn(List<String> values) {
+			addCriterion("additional_order not in", values, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderBetween(String value1, String value2) {
+			addCriterion("additional_order between", value1, value2, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andAdditionalOrderNotBetween(String value1, String value2) {
+			addCriterion("additional_order not between", value1, value2, "additionalOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderIsNull() {
+			addCriterion("primary_order is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderIsNotNull() {
+			addCriterion("primary_order is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderEqualTo(String value) {
+			addCriterion("primary_order =", value, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderNotEqualTo(String value) {
+			addCriterion("primary_order <>", value, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderGreaterThan(String value) {
+			addCriterion("primary_order >", value, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderGreaterThanOrEqualTo(String value) {
+			addCriterion("primary_order >=", value, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderLessThan(String value) {
+			addCriterion("primary_order <", value, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderLessThanOrEqualTo(String value) {
+			addCriterion("primary_order <=", value, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderLike(String value) {
+			addCriterion("primary_order like", value, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderNotLike(String value) {
+			addCriterion("primary_order not like", value, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderIn(List<String> values) {
+			addCriterion("primary_order in", values, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderNotIn(List<String> values) {
+			addCriterion("primary_order not in", values, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderBetween(String value1, String value2) {
+			addCriterion("primary_order between", value1, value2, "primaryOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andPrimaryOrderNotBetween(String value1, String value2) {
+			addCriterion("primary_order not between", value1, value2, "primaryOrder");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 * @mbg.generated  Fri Aug 16 14:55:05 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 2 - 0
src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.page.MysqlDialect;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.NewOrderChangeBo;
 
 @SuppressWarnings({ "unchecked" })
 public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
@@ -241,6 +242,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 		return ps;
 	}
 
+
 	
 
 }

+ 111 - 0
src/main/java/com/goafanti/order/bo/NewOderCahngeListBo.java

@@ -0,0 +1,111 @@
+package com.goafanti.order.bo;
+
+public class NewOderCahngeListBo {
+	private Integer id;
+	private String orderNo;
+	private String createTimes;
+	private String nickname;
+	private Integer orderType;
+	private String establishTimes;
+	private Integer type;
+	private Integer status;
+	private Integer orderStatus;
+	private String totalAmount;
+	private String settlementAmount;
+	private String arrears;
+	private String salesmanName;
+	private String depName;
+	private Integer processState;
+	public String getCreateTimes() {
+		return createTimes;
+	}
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+	public Integer getOrderType() {
+		return orderType;
+	}
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+	public String getEstablishTimes() {
+		return establishTimes;
+	}
+	public void setEstablishTimes(String establishTimes) {
+		this.establishTimes = establishTimes;
+	}
+	public Integer getOrderStatus() {
+		return orderStatus;
+	}
+	public void setOrderStatus(Integer orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public String getTotalAmount() {
+		return totalAmount;
+	}
+	public void setTotalAmount(String totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	public String getSettlementAmount() {
+		return settlementAmount;
+	}
+	public void setSettlementAmount(String settlementAmount) {
+		this.settlementAmount = settlementAmount;
+	}
+	public String getArrears() {
+		return arrears;
+	}
+	public void setArrears(String arrears) {
+		this.arrears = arrears;
+	}
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public Integer getProcessState() {
+		return processState;
+	}
+	public void setProcessState(Integer processState) {
+		this.processState = processState;
+	}
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	
+	
+}

+ 46 - 0
src/main/java/com/goafanti/order/bo/NewOrderChangeBo.java

@@ -0,0 +1,46 @@
+package com.goafanti.order.bo;
+
+import java.math.BigDecimal;
+
+import com.goafanti.common.model.NewOrderChange;
+
+public class NewOrderChangeBo extends NewOrderChange {
+	private String createTimes;
+	private BigDecimal arrears;
+	private String paymentTimes;
+	private String invoiceTimes;
+	
+	
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+
+	public BigDecimal getArrears() {
+		if(arrears==null)return super.getTotalAmount().subtract(super.getSettlementAmount());
+		return arrears;
+	}
+
+	public void setArrears(BigDecimal arrears) {
+		this.arrears = arrears;
+	}
+
+	public String getPaymentTimes() {
+		return paymentTimes;
+	}
+
+	public void setPaymentTimes(String paymentTimes) {
+		this.paymentTimes = paymentTimes;
+	}
+
+	public String getInvoiceTimes() {
+		return invoiceTimes;
+	}
+
+	public void setInvoiceTimes(String invoiceTimes) {
+		this.invoiceTimes = invoiceTimes;
+	}
+}

+ 24 - 0
src/main/java/com/goafanti/order/bo/OrderChangeLogBo.java

@@ -0,0 +1,24 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.OrderChangeLog;
+
+public class OrderChangeLogBo extends OrderChangeLog {
+	private String createTimes;
+	private String aname;
+
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+
+	public String getAname() {
+		return aname;
+	}
+
+	public void setAname(String aname) {
+		this.aname = aname;
+	}
+}

+ 3 - 1
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.bo;
 
+import com.goafanti.common.utils.StringUtils;
+
 public class TOrderTaskDetailBo {
 	private String id;
 	private String taskName;
@@ -80,7 +82,7 @@ public class TOrderTaskDetailBo {
 		return outsourcePrice;
 	}
 	public void setOutsourcePrice(String outsourcePrice) {
-		this.outsourcePrice = outsourcePrice;
+		if(StringUtils.isNotBlank(outsourcePrice))this.outsourcePrice = outsourcePrice;
 	}
 	public Integer getLocationProvince() {
 		return locationProvince;

+ 1 - 1
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -151,7 +151,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		if(i>0){
 			res.setData("新增收款记录成功!");
 		}else if(i == -3){
-			res.getError().add(buildError("", "该订单的任务还没有分配给咨询师不能收完全款!"));
+			res.getError().add(buildError("", "订单变更锁定中"));
 		}else if(i == -2){
 			res.getError().add(buildError("", "订单编号错误!"));
 		}else{

+ 142 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -0,0 +1,142 @@
+package com.goafanti.order.controller;
+
+
+
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.order.bo.NewOrderChangeBo;
+import com.goafanti.order.service.OrderChangeService;
+
+@RestController
+@RequestMapping(value = "/api/admin/orderChange")
+public class OrderChangeApiController extends CertifyApiController {
+	
+	@Autowired
+	private OrderChangeService	orderChangeService;
+	
+	
+	/**
+	 *  新增变更
+	 */
+	@RequestMapping(value = "/addOrderChange", method = RequestMethod.POST)
+	public Result addOrderChange(NewOrderChangeBo t){
+		Result res = new Result();
+		if(null==t.getOrderNo()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单编号"));
+			return res;
+		}
+		if(orderChangeService.checkOderNo(t.getOrderNo())){
+			res.getError().add(buildError( "", "订单变更未完成"));
+			return res;
+		}
+		res.setData(orderChangeService.addOrderChange(t));
+		return res;
+	}
+	/**
+	 *    订单查看变更详情
+	 */
+	@RequestMapping(value = "/orderChangeDetails", method = RequestMethod.GET)
+	public Result orderChangeDetails(String orderNo){
+		Result res = new Result();
+		if(null==orderNo){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单编号"));
+			return res;
+		}
+		res.setData(orderChangeService.orderChangeDetails( orderNo));
+		return res;
+	}
+	/**
+	 *    id查看变更详情
+	 */
+	@RequestMapping(value = "/orderChangeDetailsById", method = RequestMethod.GET)
+	public Result orderChangeDetailsById(Integer id){
+		Result res = new Result();
+		if(null==id){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单变更编号"));
+			return res;
+		}
+		res.setData(orderChangeService.orderChangeDetailsById( id));
+		return res;
+	}
+	/**
+	 * 变更修改
+	 */
+	@RequestMapping(value = "/updateOrderChange", method = RequestMethod.POST)
+	public Result orderChangeDetails(NewOrderChangeBo t ,Integer changeType){
+		Result res = new Result();
+		if(null==t.getId()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单变更id"));
+			return res;
+		}
+		if (changeType==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "修改变更类型"));
+			return res;
+		}
+		res.setData(orderChangeService.updateOrderChange(t,changeType));
+		return res;
+	}
+	/**
+	 *   变更审核
+	 */
+	@RequestMapping(value = "/orderChangeAudit", method = RequestMethod.POST)
+	public Result orderChangeAudit(String orderNo,String remarks,Integer status,Integer processState){
+		Result res = new Result();
+		if(null==orderNo){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "订单编号", "订单编号"));
+			return res;
+		}
+		if(null==status){//2通过 3驳回
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "审核结果", "审核结果"));
+			return res;
+		}
+		if(null==remarks){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "审核批示", "审核批示"));
+			return res;
+		}
+		res.setData(orderChangeService.pushOrderChangeAudit( orderNo, remarks, status, processState));
+		return res;
+	}
+	/**
+	 *  变更日志
+	 */
+	@RequestMapping(value ="/orderChangeLogList",method = RequestMethod.GET)
+	public Result orderChangeLogList(String changeId) {
+		Result res =new Result();
+		if (null==changeId) {
+			res.getError().add(buildError("变更id错误", "变更id错误"));
+			return res;
+		}
+		res.data(orderChangeService.selectOrderChangeLogList(changeId));
+		return res;
+	}
+	/**
+	 *	  变更文件上传 
+	 */
+	@RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+	public Result uploadRefundOrderFile(HttpServletRequest req,String sign){
+		Result res = new Result();
+		//order_refund_file
+		res.setData(handleFile(res, "/order_change_file/", false, req, sign));
+		return res;
+	}
+	/**
+	 *  变更列表
+	 */
+	@RequestMapping(value ="/orderChangeList",method = RequestMethod.GET)
+	public Result orderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
+			String depId,String salesmanName,Integer complete,Integer pageSize, Integer pageNo) {
+		Result res =new Result();
+		res.data(orderChangeService.selectOrderChangeList( userName,  processState, timeType, startTime, endTime,
+				depId, salesmanName, complete,pageSize,  pageNo));
+		return res;
+	}
+}

+ 30 - 0
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -0,0 +1,30 @@
+package com.goafanti.order.service;
+
+import java.util.List;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.NewOrderChangeBo;
+import com.goafanti.order.bo.OrderChangeLogBo;
+
+public interface OrderChangeService {
+
+	int addOrderChange(NewOrderChangeBo t);
+
+	NewOrderChangeBo orderChangeDetails(String orderNo);
+
+	int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState);
+
+	boolean checkOderNo(String orderNo);
+
+	List<OrderChangeLogBo> selectOrderChangeLogList(String changeId);
+
+	Pagination<NewOrderChangeBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
+			String depId,String salesmanName,Integer complete,Integer pageSize, Integer pageNo);
+
+	int updateOrderChange(NewOrderChangeBo t, Integer changeType);
+
+	NewOrderChangeBo orderChangeDetailsById(Integer id);
+
+
+
+}

+ 17 - 3
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -18,6 +18,8 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.EmailBo;
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.TOrderBackMapper;
@@ -30,6 +32,7 @@ import com.goafanti.common.dao.TOrderRefundMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderBillNew;
@@ -99,10 +102,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if(approval != ApprovalNewState.TG.getCode() && approval != ApprovalNewState.FTP.getCode()){//特批未通过 2 0
 			return -1;
 		}
+		
+		TOrderNew torder=checkDeleteSign(orderNo);
 		TOrderNew onew = new TOrderNew();
-		TOrderNew torder=tOrderNewMapper.selectByPrimaryKey(orderNo);
 		onew.setOrderNo(orderNo);
-		onew.setDeleteSign(0);//正常
+		//onew.setDeleteSign(0);//锁定订单也能走流程
 		onew.setApproval(approval);//特批状态
 		onew.setProcessStatus(ProcessStatus.YPCWGLY.getCode());//已派财务管理员
 		onew.setOrderStatus(OrderNewState.QDSHTG.getCode());//营销管理员审核通过
@@ -126,6 +130,12 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		return r;
 	}
 	
+	private TOrderNew checkDeleteSign(String orderNo) {
+		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
+		return t;
+	}
+
 	public void addOrderLog(String orderNo, Integer code) {
 		TOrderLog tl=new TOrderLog();
 		tl.setOrderNo(orderNo);
@@ -149,6 +159,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public Integer updateReject(TOrderBack back) {
 		// 是否已经收款
+		checkDeleteSign(back.getOrderNo());
 		BigDecimal bd = billNewMapper.getAmountByOid(back.getOrderNo());
 		if(bd.compareTo(new BigDecimal(0.0)) == 1){
 			return 0;//已经收款不能驳回
@@ -200,10 +211,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//判断有没有要加入的金额有没有超过总金额
 		BigDecimal bill = billNewMapper.getAmountByOid(billNew.getOrderNo());
 		//获得的单个订单金额数据(首付金额和总金额)
-		TOrderNew o = tOrderNewMapper.selectByPrimaryKey(billNew.getOrderNo());
+		TOrderNew o = checkDeleteSign(billNew.getOrderNo());
 		if(null == o){
 			return -2;
 		}
+		if(o.getDeleteSign()==3)return -3;
 		BigDecimal bd = bill.add(billNew.getTransactionAmount().abs());
 		//奖金信息
 		TOrderBonus bonus = new TOrderBonus();
@@ -392,6 +404,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public Integer addRefundFlow(TOrderBillNew billNew) {
 		// 查看收款总金额流水
+		
 		BigDecimal bd = billNewMapper.getAmountByOid(billNew.getOrderNo());
 		billNew.setTransactionAmount(billNew.getTransactionAmount().abs());//绝对值
 		int lstaus = 3;
@@ -488,6 +501,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public int updateFinanceApproval(String orderNo) {
 		TOrderNew t=new TOrderNew();
+		checkDeleteSign(orderNo);
 		t.setOrderNo(orderNo);
 		t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);

+ 260 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -0,0 +1,260 @@
+package com.goafanti.order.service.impl;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.NewOrderChangeMapper;
+import com.goafanti.common.dao.OrderChangeLogMapper;
+import com.goafanti.common.dao.TOrderDunMapper;
+import com.goafanti.common.dao.TOrderLogMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.common.dao.TOrderTaskMapper;
+import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.OrderChangeLog;
+import com.goafanti.common.model.TOrderDun;
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.NewOrderChange;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.JDBCIdGenerator;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.NewOrderChangeBo;
+import com.goafanti.order.bo.OrderChangeLogBo;
+import com.goafanti.order.bo.TOrderLogBo;
+import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.order.service.OrderChangeService;
+import com.goafanti.order.service.OrderService;
+@Service
+public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
+	@Autowired
+	private NewOrderChangeMapper	newOrderChangeMapper;
+	@Autowired
+	private OrderChangeLogMapper	orderChangeLogMapper;
+	@Autowired
+	private TOrderNewMapper			tOrderNewMapper;
+	@Autowired
+	private TOrderDunMapper			tOrderDunMapper;
+	@Autowired
+	private TOrderLogMapper 		tOrderLogMapper;  
+	@Autowired
+	private TOrderTaskMapper	tOrderTaskMapper;
+	@Autowired
+	private OrderService	orderService;
+	@Autowired
+	private JDBCIdGenerator	idGenerator;
+	
+	
+	
+	@Override
+	public int addOrderChange(NewOrderChangeBo t) {
+		TOrderNew ton=new TOrderNew();
+		ton.setOrderNo(t.getOrderNo());
+		ton.setDeleteSign(2);//将订单置为锁定
+		t.setProcessState(1);//设置营销管理员来审核
+		tOrderNewMapper.updateByPrimaryKeySelective(ton);
+		newOrderChangeMapper.insertSelective(t);
+		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNo(t.getOrderNo());
+		OrderChangeLog ocl=new OrderChangeLog();
+		ocl.setAuditor(TokenManager.getAdminId());
+		ocl.setOrderNo(t.getOrderNo());
+		ocl.setRemarks("发起了订单变更");
+		ocl.setChangeId(ncb.getId());
+		ocl.setStatus(0);
+		orderChangeLogMapper.insertSelective(ocl);
+		return 1;
+	}
+	@Override
+	public NewOrderChangeBo orderChangeDetails(String orderNo) {
+		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
+		return nb;
+	}
+	@Override
+	public NewOrderChangeBo orderChangeDetailsById(Integer id) {
+		NewOrderChangeBo nb=newOrderChangeMapper.selectById(id);
+		return nb;
+	}
+	@Override
+	public int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState) {
+		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
+		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
+			throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
+		}
+		if (nb.getStatus()==4) {
+			throw new BusinessException(new Error( "变更流程已通过审核","变更流程已通过审核"));
+		}
+		//2通过 3驳回
+		if (status==2) {
+			//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
+			if(nb.getType()==0){
+				if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长
+					if(nb.getProcessState()==7) {//项目变更通过
+						changgeAdopt(nb);
+						}else if(nb.getProcessState()==1){
+							nb.setProcessState(3);
+						}else{
+							nb.setProcessState(nb.getProcessState()+1);
+							}
+				}else {
+					if(nb.getProcessState()==8) {//项目变更通过
+						changgeAdopt(nb);
+						}else if(nb.getProcessState()==1){
+							nb.setProcessState(3);
+						} else{
+							nb.setProcessState(nb.getProcessState()+1);
+							}
+				}
+			}else {
+				if(nb.getProcessState()==9) {changgeAdopt(nb);}//项目变更通过
+				//流程状态 0营销员 1营销管理员 2技术员 3技术经理 4技术总监 5财务专员(退单) 6财务总监 7总裁 8董事长 9 财务专员(非退单)
+				if (nb.getProcessState()==1) nb.setProcessState(7);
+				else if (nb.getProcessState()==7)nb.setProcessState(9);
+			}
+		}else {
+			nb.setProcessState(0);
+			nb.setStatus(3);//订单变更设置为驳回
+		}
+		OrderChangeLog ocl=new OrderChangeLog();
+		ocl.setAuditor(TokenManager.getAdminId());
+		ocl.setOrderNo(orderNo);
+		ocl.setRemarks(remarks);
+		ocl.setChangeId(nb.getId());
+		ocl.setStatus(status);
+		orderChangeLogMapper.insertSelective(ocl);
+		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
+		return 1;
+	}
+	private void changgeAdopt(NewOrderChangeBo nb) {
+		TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		List<TOrderDun> td1=tOrderDunMapper.selectByOrderNo(nb.getOrderNo());
+		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTask(nb.getOrderNo());
+		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
+		String newOrderNo=idGenerator.generateId().toString();
+		t1.setOrderNo(newOrderNo);
+		t1.setDeleteSign(1);//将原订单作废,只能查看
+		tOrderNewMapper.insertSelective(t1);
+		for (TOrderTaskBo tOrderTaskBo : tt1) {
+			tOrderTaskBo.setId(null);
+			tOrderTaskBo.setOrderNo(newOrderNo);
+			tOrderTaskMapper.insertSelective(tOrderTaskBo);
+		}
+		for (TOrderDun tOrderDun : td1) {
+			tOrderDun.setId(UUID.randomUUID().toString());
+			tOrderDun.setOrderNo(newOrderNo);
+			tOrderDunMapper.insertSelective(tOrderDun);
+		}
+		for (TOrderLogBo tOrderLogBo : tl1) {
+			tOrderLogBo.setId(null);
+			tOrderLogBo.setOrderNo(newOrderNo);
+			tOrderLogMapper.insertSelective(tOrderLogBo);
+		}
+		nb.setStatus(4);
+		//将订单恢复正常
+		TOrderNew orderNew =new TOrderNew();
+		TOrderNew additionalOrder =new TOrderNew();
+		String additionalOrderNo;
+		orderNew.setOrderNo(nb.getOrderNo());
+		orderNew.setDeleteSign(3);//设置为变更中
+		orderNew.setPrimaryOrder(newOrderNo);
+		if (nb.getType()==4||nb.getType()==5) {//重报或者赠送
+			additionalOrderNo=idGenerator.generateId().toString();
+			orderNew.setAdditionalOrder(additionalOrderNo);
+			additionalOrder.setOrderNo(additionalOrderNo);
+			additionalOrder.setCreater(TokenManager.getAdminId());
+			additionalOrder.setSalesmanId(t1.getSalesmanId());
+			additionalOrder.setOrderType(t1.getOrderType());
+			additionalOrder.setBuyerId(t1.getBuyerId());	
+			tOrderNewMapper.insertSelective(additionalOrder);
+		}
+		tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+		
+	}
+	@Override
+	public boolean checkOderNo(String orderNo) {
+		int i=newOrderChangeMapper.checkOderNo(orderNo);
+		if (i>0) {
+			return true;
+		}
+		return false;
+	}
+	@Override
+	public List<OrderChangeLogBo> selectOrderChangeLogList(String changeId) {
+		return orderChangeLogMapper.selectOrderChangeLogList(changeId);
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<NewOrderChangeBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
+			String depId,String salesmanName,Integer complete,Integer pageSize, Integer pageNo) {
+		Map<String, Object> parameter=new HashMap<String, Object>();
+		if(pageSize==null||pageSize<0)pageSize=10;
+		if(pageNo==null||pageNo<0)pageNo=1;
+		parameter.put("processState", processState==null?0:processState);
+		parameter.put("complete", complete==null?0:complete);
+		if (StringUtils.isNotBlank(userName)) parameter.put("userName", userName);
+		if (null!=processState) parameter.put("processState", processState);
+		if (null!=timeType) parameter.put("timeType", timeType);
+		if (StringUtils.isNotBlank(startTime)) parameter.put("startTime", startTime);
+		if (StringUtils.isNotBlank(endTime)) parameter.put("endTime", endTime+" 23:59:59");
+		if (StringUtils.isNotBlank(depId)) parameter.put("depId", depId);
+		if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
+		parameter.put("aid", TokenManager.getAdminId());
+		parameter.put("deps", orderService.selectMyDeps());
+		Pagination<NewOrderChangeBo> data = (Pagination<NewOrderChangeBo>)findPage("selectOrderChangeList", "selectOrderChangeCount", parameter, pageNo, pageSize);
+		return data;
+	}
+	@Override
+	public int updateOrderChange(NewOrderChangeBo t,Integer changeType) {
+		NewOrderChange  noc=new NewOrderChange();
+		noc.setId(t.getId());
+		if (changeType==0) {
+			noc.setRemarks(t.getRemarks());
+			noc.setType(t.getType());
+			noc.setVoucherUrl(t.getVoucherUrl());
+			noc.setTotalAmount(t.getTotalAmount());
+			noc.setSettlementAmount(t.getSettlementAmount());
+			noc.setChangeAmount(t.getChangeAmount());
+			noc.setApplicant(t.getApplicant());
+			noc.setStatus(1);//订单置为正常
+			noc.setProcessState(1);//流程置为营销管理员
+			noc.setDepName(t.getDepName());
+			OrderChangeLog ocl=new OrderChangeLog();
+			ocl.setAuditor(TokenManager.getAdminId());
+			ocl.setOrderNo(t.getOrderNo());
+			ocl.setRemarks("重新发起了订单变更");
+			ocl.setChangeId(noc.getId());
+			ocl.setStatus(0);
+			orderChangeLogMapper.insertSelective(ocl);
+			
+		}else if(changeType==1) {
+			noc.setProjectState(t.getProjectState());
+			noc.setZxsCost(t.getZxsCost());
+			noc.setZxsRemarks(t.getZxsRemarks());
+		}else if (changeType==2) {
+			try {
+				noc.setPaymentTime(DateUtils.StringToDate(t.getPaymentTimes(), AFTConstants.YYYYMMDD));
+				noc.setInvoiceTime(DateUtils.StringToDate(t.getInvoiceTimes(), AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			noc.setPaymentAmount(t.getPaymentAmount());
+			noc.setInvoiceAmount(t.getInvoiceAmount());
+			noc.setInvoiceType(t.getInvoiceType());
+			noc.setCwCost(t.getCwCost());
+			noc.setRefundableAmount(t.getRefundableAmount());
+			noc.setCwRemarks(t.getCwRemarks());
+		}
+		return newOrderChangeMapper.updateByPrimaryKeySelective(noc);
+	}
+	
+
+}

+ 30 - 9
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -208,7 +208,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateServiceOrder(TOrderNew t, Integer isSubmit) {
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew t2=checkDeleteSign(t.getOrderNo());
 		//判断手机号码是否存在
 		if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&
 				organizationContactBookMapper.checkContacts(t2.getBuyerId(), t2.getContactMobile(),TokenManager.getAdminId()==null?"1":TokenManager.getAdminId() )>0) {
@@ -224,8 +224,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
 		}
 		if (isSubmit==1) {//订单提交
-			t.setOrderStatus(OrderNewState.QDDS.getCode());
-			t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
+			if(t2.getProcessStatus()<ProcessStatus.YPYXGLY.getCode()) {
+				t.setOrderStatus(OrderNewState.QDDS.getCode());
+				t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
+			}
 			if (t2.getApproval()==ApprovalNewState.BH.getCode()){
 				t.setApproval(ApprovalNewState.DSH.getCode());
 			}
@@ -242,8 +244,16 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			t.setCreateTime(new Date());
 			tOrderBackMapper.updateByOrderNoAndBackStatus(t.getOrderNo());
 		}
-			
-		
+		// 0 相等
+		// -1 小于 
+		// 1 大于
+		//liquidation_status 清算状态 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
+		//settlement_amount 已付  total_amount 总价格   first_amount首付
+		if(t2.getSettlementAmount().compareTo(t2.getTotalAmount()) == 0){//如果已付等于总价
+			t.setLiquidationStatus(LiquidationNewState.ALREADY_PAY.getCode());
+		}else if(t2.getSettlementAmount().compareTo(t2.getFirstAmount()) >= 0){//如果大于等于首付
+			t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode());
+		}
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
@@ -419,7 +429,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int updateOrderNew(String orderNo, Integer orderStatus,String reason,Integer outsource, TOrderOutsource o) {
 		TOrderNew t= new TOrderNew();
-		TOrderNew t2= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t2= checkDeleteSign(orderNo);
 		t.setOrderNo(orderNo);
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
 			if (t2.getApproval()==ApprovalNewState.FTP.getCode()||t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
@@ -527,7 +537,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int addOrderRefund(TOrderRefundWithBLOBs t) {
-		TOrderNew order =tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew order =checkDeleteSign(t.getOrderNo());
+		if(order.getDeleteSign()!=0)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
 		t.setRefundStatus(refundState.DSH.getCode());
 		t.setCreateTime(new Date());
 		t.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
@@ -547,7 +558,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int updateApprovalOrder(String orderNo,Integer confirm,String reason) {
 		TOrderNew t=new TOrderNew();
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t2=checkDeleteSign(orderNo);
 		t.setOrderNo(orderNo);
 		if (confirm==2) {
 			t.setApproval(2);
@@ -730,6 +741,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateOrderRefund(TOrderRefundWithBLOBs t) {
+		checkDeleteSign(t.getOrderNo());
 		return tOrderRefundMapper.updateByPrimaryKeySelective(t);
 	}
 
@@ -737,7 +749,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updatetechnicianBackOrder(String orderNo,String reason) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t = checkDeleteSign(orderNo);
 		if (t.getSettlementAmount().compareTo(new BigDecimal(0))!=0||
 				t.getProcessStatus()>ProcessStatus.YPZXSGLY.getCode()) {
 			return -1;
@@ -748,6 +760,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		addBackOrder(orderNo, reason);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
+
+
+
+	private TOrderNew checkDeleteSign(String orderNo) {
+		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
+		return t;
+	}
 	
 	@Override
 	public List<OrderDunTaskBo> selectAllOrderDun() {
@@ -811,6 +831,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateFinance(String orderNo, String newFinance) {
+		checkDeleteSign(orderNo);
 		String aid=TokenManager.getAdminId();
 		return tOrderNewMapper.updateFinance(aid,orderNo,newFinance);
 		

+ 9 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
@@ -84,6 +85,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	public int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially) {
 		TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(taskId);
+		checkDeleteSign(t.getOrderNo());
 		t.setTaskStatus(TaskState.DISTRIBUTION.getCode());
 		t.setTaskAllocator(TokenManager.getAdminId());
 		t.setTaskReceiver(taskReceiverId);
@@ -100,6 +102,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}
 		return 1;
 	}
+	private TOrderNew checkDeleteSign(String orderNo) {
+		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
+		return t;
+	}
 	public void addOrderLog(String orderNo, Integer code) {
 		TOrderLog tl=new TOrderLog();
 		tl.setOrderNo(orderNo);
@@ -165,6 +172,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Transactional
 	public int updateOrderTask(TOrderTaskDetailBo t) {
 		TOrderTask task=new TOrderTask();
+		TOrderNew tn=checkDeleteSign(t.getOrderNo());
 		task.setAttachmentUrl(t.getAttachmentUrl());
 		task.setId(Integer.valueOf(t.getId()));
 		task.setTaskStatus(t.getTaskStatus());
@@ -181,8 +189,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setArrivalMoney(t.getArrivalMoney());
 		task.setSetUpAmount(t.getSetUpAmount());
 		task.setOutsourceName(t.getOutsourceName());
-		task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
-		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		if(StringUtils.isNotBlank(t.getOutsourcePrice()))task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
 		//根据修改的修改订单法人与联系人
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());
 		if(StringUtils.isNotEmpty(t.getContactMobile()))	tn.setContactMobile(t.getContactMobile());

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

@@ -65,7 +65,7 @@ avatar.host=//sb.jishutao.com
 
 #连测试
 #avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.14
+#static.host=//static.jishutao.com/1.1.15
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload
 

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

@@ -118,7 +118,7 @@ ORDER_CAN_NOT_MODIFY = \u5F53\u524D\u8BA2\u5355\u4E0D\u80FD\u4FEE\u6539{0}
 
 ORDER_ALREADY_FREEZE = \u8BE5\u8BA2\u5355\u5DF2\u7ECF\u51BB\u7ED3{0}
 
-ORDER_ALREADY_REVOKE = \u8BE5\u8BA2\u5355\u5DF2\u7ECF\u5E9F\u9664{0}
+ORDER_ALREADY_REVOKE = \u8BA2\u5355{0}\u5DF2\u7ECF\u9501\u5b9a
 
 ORDER_NOT_EXIST = \u8BA2\u5355\u4E0D\u5B58\u5728{0}