소스 검색

Merge branch 'dev' of http://git.jishutao.com/jishutao/kede-server

anderx 6 년 전
부모
커밋
662d8bf2a1
34개의 변경된 파일4983개의 추가작업 그리고 343개의 파일을 삭제
  1. 1 1
      GeneratorConfig.xml
  2. 1 18
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  3. 0 93
      src/main/java/com/goafanti/common/controller/MainTest.java
  4. 18 12
      src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java
  5. 85 0
      src/main/java/com/goafanti/common/dao/TChangeDunMapper.java
  6. 81 0
      src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java
  7. 1 0
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  8. 0 1
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  9. 80 31
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml
  10. 507 0
      src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml
  11. 420 0
      src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml
  12. 25 3
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  13. 6 2
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  14. 104 81
      src/main/java/com/goafanti/common/model/NewOrderChange.java
  15. 86 16
      src/main/java/com/goafanti/common/model/NewOrderChangeExample.java
  16. 399 0
      src/main/java/com/goafanti/common/model/TChangeDun.java
  17. 1303 0
      src/main/java/com/goafanti/common/model/TChangeDunExample.java
  18. 284 0
      src/main/java/com/goafanti/common/model/TChangeTask.java
  19. 1023 0
      src/main/java/com/goafanti/common/model/TChangeTaskExample.java
  20. 0 26
      src/main/java/com/goafanti/common/utils/ExcelUtils.java
  21. 0 4
      src/main/java/com/goafanti/common/utils/SendEmailUtil.java
  22. 66 0
      src/main/java/com/goafanti/order/bo/TChangeDunOut.java
  23. 22 0
      src/main/java/com/goafanti/order/bo/TChangeTaskOut.java
  24. 26 0
      src/main/java/com/goafanti/order/bo/TOrderNewBo.java
  25. 4 3
      src/main/java/com/goafanti/order/controller/AdminOrderApiController.java
  26. 163 1
      src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
  27. 1 1
      src/main/java/com/goafanti/order/enums/OrderChangeType.java
  28. 26 2
      src/main/java/com/goafanti/order/service/OrderChangeService.java
  29. 3 1
      src/main/java/com/goafanti/order/service/OrderService.java
  30. 236 35
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  31. 5 7
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  32. 4 2
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  33. 2 2
      src/main/resources/props/config_local.properties
  34. 1 1
      src/main/resources/props/config_test.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="idle_contract_no"/>
+    <table schema="aft" tableName="new_order_change"/>
   </context>
 </generatorConfiguration>

+ 1 - 18
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -281,24 +281,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
         }
         return listGroup;
     }
-   /* public static void main(String[] args) {
-    	List<String> list=new ArrayList<>();
-		for (int i = 1; i < 888; i++) {
-			list.add(String.valueOf(i));
-		}
-		  List<List<String>> listGroup = new ArrayList<List<String>>();
-	        int listSize = list.size();
-	        //子集合的长度
-	        int toIndex = 100;
-	        for (int i = 0; i < list.size(); i += 100) {
-	            if (i + 100 > listSize) {
-	                toIndex = listSize - i;
-	            }
-	            List<String> newList = list.subList(i, i + toIndex);
-	            listGroup.add(newList);
-	        }
-	        System.out.println(listGroup);
-	}*/
+  
 
 	@Override
 	public List<Admin> getListDefaultPassword(String depId) {

+ 0 - 93
src/main/java/com/goafanti/common/controller/MainTest.java

@@ -1,93 +0,0 @@
-package com.goafanti.common.controller;
-
-import java.awt.print.Book;
-import java.awt.print.PageFormat;
-import java.awt.print.Paper;
-import java.awt.print.PrinterException;
-import java.awt.print.PrinterJob;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.print.PrintService;
-import javax.print.PrintServiceLookup;
-import javax.print.attribute.HashAttributeSet;
-import javax.print.attribute.standard.PrinterName;
-
-import com.goafanti.common.bo.Prient;
-import com.goafanti.common.bo.Test;
-
-/**
- * 打印测试类
- * 
- * @author admin
- * 
- */
-public class MainTest {
-
-	public static void main(String[] args) {
-		//这里是测试用的数据,自己定义就好了
-		List<Test> testList = new ArrayList<Test>();
-		Test t1 = new Test("麻辣牛肉", 23.00, 2);
-		Test t2 = new Test("麻辣牛肉", 23.00, 4);
-		Test t3 = new Test("精品千层肚", 24.00, 3);
-		Test t4 = new Test("麻辣牛肉", 23.00, 2);
-		Test t5 = new Test("极品鲜毛肚", 26.00, 1);
-		Test t6 = new Test("极品鲜毛肚", 26.00, 1);
-		Test t7 = new Test("极品鲜毛肚", 26.00, 1);
-		Test t8 = new Test("极品鲜毛肚", 26.00, 1);
-		Test t9 = new Test("极品鲜毛肚", 26.00, 1);
-		testList.add(t1);
-		testList.add(t2);
-		testList.add(t3);
-		testList.add(t4);
-		testList.add(t5);
-		testList.add(t6);
-		testList.add(t7);
-		testList.add(t8);
-		testList.add(t9);
-		
-		// 设置小票模型菜品集合
-		Prient.setTestList(testList);
-		// 定义纸张高度
-//		int height = 842;
-		// 通俗理解就是书、文档
-		Book book = new Book();
-		// 打印格式
-		PageFormat pf = new PageFormat();
-		// 原点在纸张的左上方,x 指向右方,y 指向下方。
-		pf.setOrientation(PageFormat.PORTRAIT);
-		// 通过Paper设置页面的空白边距和可打印区域。必须与实际打印纸张大小相符。
-		Paper p = new Paper();
-		// 页面宽度 页面高度
-		p.setSize(592, 842);
-		// x轴 y轴 宽度 高度
-		p.setImageableArea(0, 0, 260, 842);
-		pf.setPaper(p);
-		// 把 PageFormat 和 Printable 添加到书中,组成一个页面
-		book.append(new Prient(), pf);
-		// 指定打印机打印(printerName打印机名称)
-//		HashAttributeSet hs = new HashAttributeSet();
-//		String printerName = "OneNote";
-//		hs.add(new PrinterName(printerName, null));
-//		PrintService[] pss = PrintServiceLookup.lookupPrintServices(null, hs);
-		PrintService ps = PrintServiceLookup.lookupDefaultPrintService();
-		if (ps==null) {
-			System.out.println("无法找到打印机!");
-			return;
-		}
-		// 获取打印服务对象
-		PrinterJob job = PrinterJob.getPrinterJob();
-		// 写入书
-		job.setPageable(book);
-		try {
-			Integer random6 = (int) ((Math.random() * 9 + 1) * 100000);
-			System.out.println("Z"+System.currentTimeMillis()+random6.toString());
-			// 添加指定的打印机
-			job.setPrintService(ps);
-			// 打印执行
-			job.print();
-		} catch (PrinterException e) {
-			System.out.println("================打印出现异常");
-		}
-	}
-}

+ 18 - 12
src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java

@@ -6,78 +6,80 @@ import com.goafanti.order.bo.NewOrderChangeBo;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+
 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	long countByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	int deleteByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	int insert(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	int insertSelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	List<NewOrderChange> selectByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	NewOrderChange selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	int updateByPrimaryKeySelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	int updateByPrimaryKey(NewOrderChange record);
 
-	NewOrderChangeBo selectByorderNo(String orderNo);
+	List<NewOrderChangeBo> selectByorderNo(String orderNo);
 
 	int checkOderNo(String orderNo);
 
@@ -86,4 +88,8 @@ public interface NewOrderChangeMapper {
 	void addRefundInvoice(@Param("orderNo")String orderNo, @Param("amount")BigDecimal amount);
 
 	void subtractRefundInvoice(@Param("orderNo")String orderNo,@Param("amount")BigDecimal amount);
+
+	NewOrderChangeBo selectByorderNoAndStatus(String orderNo);
+
+	List<Map<String, String>> getOrderChange(String orderNo);
 }

+ 85 - 0
src/main/java/com/goafanti/common/dao/TChangeDunMapper.java

@@ -0,0 +1,85 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.model.TChangeDunExample;
+import com.goafanti.order.bo.TChangeDunOut;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TChangeDunMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	long countByExample(TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	int deleteByExample(TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	int insert(TChangeDun record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	int insertSelective(TChangeDun record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	List<TChangeDun> selectByExample(TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	TChangeDun selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") TChangeDun record, @Param("example") TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	int updateByExample(@Param("record") TChangeDun record, @Param("example") TChangeDunExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	int updateByPrimaryKeySelective(TChangeDun record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	int updateByPrimaryKey(TChangeDun record);
+
+	void insertSelectiveList(@Param("list")List<TChangeDun> list);
+
+	List<TChangeDunOut> selectByCid(Integer id);
+
+	int updateByTid(@Param("tid")Integer tid,@Param("type")Integer type);
+
+	int deleteByTid(Integer tid);
+}

+ 81 - 0
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -0,0 +1,81 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TChangeTask;
+import com.goafanti.common.model.TChangeTaskExample;
+import com.goafanti.order.bo.TChangeTaskOut;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TChangeTaskMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	long countByExample(TChangeTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	int deleteByExample(TChangeTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	int insert(TChangeTask record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	int insertSelective(TChangeTask record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	List<TChangeTask> selectByExample(TChangeTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	TChangeTask selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") TChangeTask record, @Param("example") TChangeTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	int updateByExample(@Param("record") TChangeTask record, @Param("example") TChangeTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	int updateByPrimaryKeySelective(TChangeTask record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_changge_task
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	int updateByPrimaryKey(TChangeTask record);
+
+	void insertSelectiveList(@Param("list")List<TChangeTask> list);
+
+	List<TChangeTaskOut> selectByCid(Integer id);
+}

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

@@ -97,4 +97,5 @@ public interface TOrderNewMapper {
 	Map<String, Object> countTotalAndActually(@Param("o")OrderListBo o, @Param("fids")List<String> fids);
 	TOrderBillNew getLastPayment(String orderNo);
 	int updateSalesmanId(@Param("aid")String aid, @Param("transferId")String transferId);
+	List<TOrderNewBo> selectUsedOrderByOrder(String orderNo);
 }

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

@@ -108,6 +108,5 @@ public interface TOrderTaskMapper {
 
 	List<String> listNameByDepAndName(@Param("orderNo")String orderNo, @Param("type")Integer type);
 
-	
 
 }

+ 80 - 31
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -34,12 +34,13 @@
     <result column="estimate_cost" jdbcType="DECIMAL" property="estimateCost" />
     <result column="estimate_refundable" jdbcType="DECIMAL" property="estimateRefundable" />
     <result column="refund_Invoice" jdbcType="DECIMAL" property="refundInvoice" />
+    <result column="used_order" jdbcType="VARCHAR" property="usedOrder" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -73,7 +74,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -107,18 +108,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     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, estimate_cost, estimate_refundable, refund_Invoice
+    refundable_amount, cw_remarks, estimate_cost, estimate_refundable, refund_Invoice, 
+    used_order
   </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 Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     select
     <if test="distinct">
@@ -137,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -148,7 +150,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     delete from new_order_change
     where id = #{id,jdbcType=INTEGER}
@@ -157,7 +159,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     delete from new_order_change
     <if test="_parameter != null">
@@ -168,7 +170,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     insert into new_order_change (id, order_no, process_state, 
       status, type, create_time, 
@@ -178,8 +180,8 @@
       zxs_remarks, payment_time, payment_amount, 
       invoice_time, invoice_amount, invoice_type, 
       cw_cost, refundable_amount, cw_remarks, 
-      estimate_cost, estimate_refundable, refund_Invoice
-      )
+      estimate_cost, estimate_refundable, refund_Invoice, 
+      used_order)
     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}, 
@@ -188,14 +190,14 @@
       #{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}, 
-      #{estimateCost,jdbcType=DECIMAL}, #{estimateRefundable,jdbcType=DECIMAL}, #{refundInvoice,jdbcType=DECIMAL}
-      )
+      #{estimateCost,jdbcType=DECIMAL}, #{estimateRefundable,jdbcType=DECIMAL}, #{refundInvoice,jdbcType=DECIMAL}, 
+      #{usedOrder,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 Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     insert into new_order_change
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -280,6 +282,9 @@
       <if test="refundInvoice != null">
         refund_Invoice,
       </if>
+      <if test="usedOrder != null">
+        used_order,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -363,13 +368,16 @@
       <if test="refundInvoice != null">
         #{refundInvoice,jdbcType=DECIMAL},
       </if>
+      <if test="usedOrder != null">
+        #{usedOrder,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 Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     select count(*) from new_order_change
     <if test="_parameter != null">
@@ -380,7 +388,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     update new_order_change
     <set>
@@ -465,6 +473,9 @@
       <if test="record.refundInvoice != null">
         refund_Invoice = #{record.refundInvoice,jdbcType=DECIMAL},
       </if>
+      <if test="record.usedOrder != null">
+        used_order = #{record.usedOrder,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -474,7 +485,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     update new_order_change
     set id = #{record.id,jdbcType=INTEGER},
@@ -503,7 +514,8 @@
       cw_remarks = #{record.cwRemarks,jdbcType=VARCHAR},
       estimate_cost = #{record.estimateCost,jdbcType=DECIMAL},
       estimate_refundable = #{record.estimateRefundable,jdbcType=DECIMAL},
-      refund_Invoice = #{record.refundInvoice,jdbcType=DECIMAL}
+      refund_Invoice = #{record.refundInvoice,jdbcType=DECIMAL},
+      used_order = #{record.usedOrder,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -512,7 +524,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     update new_order_change
     <set>
@@ -594,6 +606,9 @@
       <if test="refundInvoice != null">
         refund_Invoice = #{refundInvoice,jdbcType=DECIMAL},
       </if>
+      <if test="usedOrder != null">
+        used_order = #{usedOrder,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -601,7 +616,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 14:33:46 CST 2019.
+      This element was generated on Mon Jan 13 14:39:13 CST 2020.
     -->
     update new_order_change
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -629,7 +644,8 @@
       cw_remarks = #{cwRemarks,jdbcType=VARCHAR},
       estimate_cost = #{estimateCost,jdbcType=DECIMAL},
       estimate_refundable = #{estimateRefundable,jdbcType=DECIMAL},
-      refund_Invoice = #{refundInvoice,jdbcType=DECIMAL}
+      refund_Invoice = #{refundInvoice,jdbcType=DECIMAL},
+      used_order = #{usedOrder,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">
@@ -640,10 +656,22 @@ select
 	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
+	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="selectByorderNoAndStatus" 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 status!=4
+	and a.order_no= #{orderNo} 
 	order by a.create_time desc
-	limit 1
+	
   </select>
   
   <select id="selectById" resultType="com.goafanti.order.bo.NewOrderChangeBo">
@@ -662,11 +690,12 @@ select
 	where status != 4 and order_no= #{orderNo}
   </select>
   <select id="selectOrderChangeList" resultType="com.goafanti.order.bo.NewOderCahngeListBo">
-  select a.id,a.order_no orderNo,b.contract_no contractNo, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,c.nickname,b.order_type orderType, 
+	select a.id,a.order_no orderNo,b.contract_no contractNo, 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 
+  a.process_state processState from (select max(id)id from new_order_change group by order_no) noc left join  new_order_change a on noc.id=a.id
+  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 order_no,consultant_id,manager_id from t_order_task group by order_no,consultant_id,manager_id) x on a.order_no=x.order_no
 	</if> 
@@ -746,6 +775,9 @@ select
 	<if test="complete ==3">
 	 and   a.status = 2
 	</if>
+	<if test="complete ==4">
+	 and   a.status = 4
+	</if>
 	order by a.create_time desc
 	<if test="page_sql != null">
 			${page_sql}
@@ -753,10 +785,21 @@ select
   </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 
+  select count(*) from (select max(id)id from new_order_change group by order_no) noc left join  new_order_change a on noc.id=a.id
+  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 t_order_task x on a.order_no=x.order_no
+	left join (
+	select
+		order_no,
+		consultant_id,
+		manager_id
+	from
+		t_order_task
+	group by
+		order_no,
+		consultant_id,
+		manager_id) x on a.order_no=x.order_no
 	</if>
 	where 1=1
 	<if test="processState==0">
@@ -831,11 +874,14 @@ select
 	<if test="complete ==2 and processState == 8">
 	 and a.process_state = 8  and  (a.status = 4 or a.status = 2)
 	</if>
-		<if test="complete ==3">
+	<if test="complete ==3">
 	 and   a.status = 2
 	</if>
+	<if test="complete ==4">
+	 and   a.status = 4
+	</if>
 	</select>
-	<update id="addRefundInvoice" >
+	<update id="addRefundInvoice">
 	update  new_order_change
 	set `refund_Invoice`=ifnull(`refund_Invoice`,0)+ #{amount}
 	where order_no= #{orderNo}
@@ -845,4 +891,7 @@ select
 	set `refund_Invoice`=ifnull(`refund_Invoice`,0)- #{amount}
 	where order_no= #{orderNo}
 	</update>
+	<select id="getOrderChange" resultType="java.util.Map">
+	select id,used_order usedOrder from new_order_change where  order_no= #{orderNo} order by id
+	</select>
 </mapper>

+ 507 - 0
src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml

@@ -0,0 +1,507 @@
+<?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.TChangeDunMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TChangeDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="did" jdbcType="INTEGER" property="did" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="project_type" jdbcType="INTEGER" property="projectType" />
+    <result column="dun_type" jdbcType="INTEGER" property="dunType" />
+    <result column="wait_day" jdbcType="INTEGER" property="waitDay" />
+    <result column="effective_count" jdbcType="INTEGER" property="effectiveCount" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="money" jdbcType="DECIMAL" property="money" />
+    <result column="appropriation_ratio" jdbcType="DECIMAL" property="appropriationRatio" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="ctid" jdbcType="INTEGER" property="ctid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    id, did, cid, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, 
+    status, create_time, start_time, money, appropriation_ratio, type, ctid
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TChangeDunExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_change_dun
+    <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 Mon Jan 13 11:34:14 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_change_dun
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    delete from t_change_dun
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChangeDunExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    delete from t_change_dun
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TChangeDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    insert into t_change_dun (id, did, cid, 
+      order_no, tid, project_type, 
+      dun_type, wait_day, effective_count, 
+      aid, status, create_time, 
+      start_time, money, appropriation_ratio, 
+      type, ctid)
+    values (#{id,jdbcType=INTEGER}, #{did,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
+      #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER}, 
+      #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, #{effectiveCount,jdbcType=INTEGER}, 
+      #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}, #{appropriationRatio,jdbcType=DECIMAL}, 
+      #{type,jdbcType=INTEGER}, #{ctid,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    insert into t_change_dun
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="did != null">
+        did,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="projectType != null">
+        project_type,
+      </if>
+      <if test="dunType != null">
+        dun_type,
+      </if>
+      <if test="waitDay != null">
+        wait_day,
+      </if>
+      <if test="effectiveCount != null">
+        effective_count,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="money != null">
+        money,
+      </if>
+      <if test="appropriationRatio != null">
+        appropriation_ratio,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="ctid != null">
+        ctid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="did != null">
+        #{did,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="projectType != null">
+        #{projectType,jdbcType=INTEGER},
+      </if>
+      <if test="dunType != null">
+        #{dunType,jdbcType=INTEGER},
+      </if>
+      <if test="waitDay != null">
+        #{waitDay,jdbcType=INTEGER},
+      </if>
+      <if test="effectiveCount != null">
+        #{effectiveCount,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="money != null">
+        #{money,jdbcType=DECIMAL},
+      </if>
+      <if test="appropriationRatio != null">
+        #{appropriationRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="ctid != null">
+        #{ctid,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TChangeDunExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    select count(*) from t_change_dun
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    update t_change_dun
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.did != null">
+        did = #{record.did,jdbcType=INTEGER},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tid != null">
+        tid = #{record.tid,jdbcType=INTEGER},
+      </if>
+      <if test="record.projectType != null">
+        project_type = #{record.projectType,jdbcType=INTEGER},
+      </if>
+      <if test="record.dunType != null">
+        dun_type = #{record.dunType,jdbcType=INTEGER},
+      </if>
+      <if test="record.waitDay != null">
+        wait_day = #{record.waitDay,jdbcType=INTEGER},
+      </if>
+      <if test="record.effectiveCount != null">
+        effective_count = #{record.effectiveCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,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.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.money != null">
+        money = #{record.money,jdbcType=DECIMAL},
+      </if>
+      <if test="record.appropriationRatio != null">
+        appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
+      <if test="record.ctid != null">
+        ctid = #{record.ctid,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    update t_change_dun
+    set id = #{record.id,jdbcType=INTEGER},
+      did = #{record.did,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      tid = #{record.tid,jdbcType=INTEGER},
+      project_type = #{record.projectType,jdbcType=INTEGER},
+      dun_type = #{record.dunType,jdbcType=INTEGER},
+      wait_day = #{record.waitDay,jdbcType=INTEGER},
+      effective_count = #{record.effectiveCount,jdbcType=INTEGER},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      money = #{record.money,jdbcType=DECIMAL},
+      appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
+      type = #{record.type,jdbcType=INTEGER},
+      ctid = #{record.ctid,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChangeDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    update t_change_dun
+    <set>
+      <if test="did != null">
+        did = #{did,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="projectType != null">
+        project_type = #{projectType,jdbcType=INTEGER},
+      </if>
+      <if test="dunType != null">
+        dun_type = #{dunType,jdbcType=INTEGER},
+      </if>
+      <if test="waitDay != null">
+        wait_day = #{waitDay,jdbcType=INTEGER},
+      </if>
+      <if test="effectiveCount != null">
+        effective_count = #{effectiveCount,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="money != null">
+        money = #{money,jdbcType=DECIMAL},
+      </if>
+      <if test="appropriationRatio != null">
+        appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="ctid != null">
+        ctid = #{ctid,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TChangeDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+    -->
+    update t_change_dun
+    set did = #{did,jdbcType=INTEGER},
+      cid = #{cid,jdbcType=INTEGER},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      tid = #{tid,jdbcType=INTEGER},
+      project_type = #{projectType,jdbcType=INTEGER},
+      dun_type = #{dunType,jdbcType=INTEGER},
+      wait_day = #{waitDay,jdbcType=INTEGER},
+      effective_count = #{effectiveCount,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      money = #{money,jdbcType=DECIMAL},
+      appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
+      type = #{type,jdbcType=INTEGER},
+      ctid = #{ctid,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+   <insert id="insertSelectiveList" parameterType="java.util.List">
+    insert into t_change_dun (did, cid, 
+      order_no, tid, project_type, 
+      dun_type, wait_day, effective_count, 
+      aid, status, create_time, 
+      start_time, money, appropriation_ratio
+      )values
+      <foreach collection="list" index="index" item="item" separator=",">
+      ( #{item.did,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, 
+      #{item.orderNo,jdbcType=VARCHAR}, #{item.tid,jdbcType=INTEGER}, #{item.projectType,jdbcType=INTEGER}, 
+      #{item.dunType,jdbcType=INTEGER}, #{item.waitDay,jdbcType=INTEGER}, #{item.effectiveCount,jdbcType=INTEGER}, 
+      #{item.aid,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, now(), 
+      #{item.startTime,jdbcType=TIMESTAMP}, #{item.money,jdbcType=DECIMAL}, #{item.appropriationRatio,jdbcType=DECIMAL}
+      )
+    </foreach>
+  </insert>
+  
+  <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeDunOut">
+	select a.id,a.order_no orderNo,ifnull(a.tid,c.tid)tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
+  	  b.set_up_amount setUpAmount, a.effective_count effectiveCount, a.aid, a.create_time createTime,a.type,a.ctid,a.did,
+  	  ifnull(b.commodity_name,c.commodity_name) commodityName,a.money,a.status, a.appropriation_ratio appropriationRatio
+  	  from t_change_dun a left join t_order_task b on a.tid=b.id left join t_change_task c on a.ctid=c.id
+    	where a.cid= #{id} order by a.id
+  </select>
+  <update id="updateByTid">
+  		update t_change_dun set type= #{type} where tid= #{tid};
+  </update>
+  
+  <update id="deleteByTid">
+  		delete from t_change_dun where tid= #{tid};
+  </update>
+</mapper>

+ 420 - 0
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

@@ -0,0 +1,420 @@
+<?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.TChangeTaskMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TChangeTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="main" jdbcType="INTEGER" property="main" />
+    <result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
+    <result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
+    <result column="commodity_quantity" jdbcType="INTEGER" property="commodityQuantity" />
+    <result column="commodity_price" jdbcType="DECIMAL" property="commodityPrice" />
+    <result column="task_comment" jdbcType="VARCHAR" property="taskComment" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    id, tid, cid, order_no, main, commodity_id, commodity_name, commodity_quantity, commodity_price, 
+    task_comment, create_time, type
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TChangeTaskExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_change_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_change_task
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    delete from t_change_task
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChangeTaskExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    delete from t_change_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TChangeTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    insert into t_change_task (id, tid, cid, 
+      order_no, main, commodity_id, 
+      commodity_name, commodity_quantity, commodity_price, 
+      task_comment, create_time, type
+      )
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
+      #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{commodityId,jdbcType=VARCHAR}, 
+      #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, 
+      #{taskComment,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{type,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    insert into t_change_task
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="main != null">
+        main,
+      </if>
+      <if test="commodityId != null">
+        commodity_id,
+      </if>
+      <if test="commodityName != null">
+        commodity_name,
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity,
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price,
+      </if>
+      <if test="taskComment != null">
+        task_comment,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="main != null">
+        #{main,jdbcType=INTEGER},
+      </if>
+      <if test="commodityId != null">
+        #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityPrice != null">
+        #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskComment != null">
+        #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TChangeTaskExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    select count(*) from t_change_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    update t_change_task
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.tid != null">
+        tid = #{record.tid,jdbcType=INTEGER},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.main != null">
+        main = #{record.main,jdbcType=INTEGER},
+      </if>
+      <if test="record.commodityId != null">
+        commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityName != null">
+        commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityQuantity != null">
+        commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.commodityPrice != null">
+        commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.taskComment != null">
+        task_comment = #{record.taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    update t_change_task
+    set id = #{record.id,jdbcType=INTEGER},
+      tid = #{record.tid,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      main = #{record.main,jdbcType=INTEGER},
+      commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      task_comment = #{record.taskComment,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      type = #{record.type,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChangeTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    update t_change_task
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="main != null">
+        main = #{main,jdbcType=INTEGER},
+      </if>
+      <if test="commodityId != null">
+        commodity_id = #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        commodity_name = #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskComment != null">
+        task_comment = #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TChangeTask">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jan 13 09:27:33 CST 2020.
+    -->
+    update t_change_task
+    set tid = #{tid,jdbcType=INTEGER},
+      cid = #{cid,jdbcType=INTEGER},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      main = #{main,jdbcType=INTEGER},
+      commodity_id = #{commodityId,jdbcType=VARCHAR},
+      commodity_name = #{commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      task_comment = #{taskComment,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      type = #{type,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <insert id="insertSelectiveList" parameterType="java.util.List">
+    insert into t_change_task ( tid, cid, 
+      order_no, commodity_id, commodity_name, 
+      commodity_quantity, commodity_price, task_comment, 
+      create_time)
+    values 
+    <foreach collection="list" index="index" item="item" separator=",">
+      ( #{item.tid,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, 
+      #{item.orderNo,jdbcType=VARCHAR}, #{item.commodityId,jdbcType=VARCHAR}, #{item.commodityName,jdbcType=VARCHAR}, 
+      #{item.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR}, 
+      now())
+    </foreach>
+  </insert>
+  <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeTaskOut">
+     select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,
+  	 a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,
+  a.task_comment as taskComment ,a.commodity_price as commodityPrice
+    from t_change_task a left join business_project i on a.commodity_id=i.id
+  	left join business_category c on i.cid=c.id 
+  	where a.cid= #{id} order by a.id
+  </select>
+</mapper>

+ 25 - 3
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1197,7 +1197,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
   	</if>
   	<if test="specially == 4">
-  	,f.name as consultantName,a.settlement_amount as settlementAmount
+  	,f.name as consultantName,a.settlement_amount as settlementAmount,if(isnull(g.order_no)=0,1,0) ischange
   	</if>
   	from t_order_new a  left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
   	left join department dep on a.order_dep=dep.id
@@ -1209,9 +1209,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	left join admin f on e.initiate=f.id
   	</if>
   	<if test="specially == 4">
-  	left join (select * from t_order_task
-	where super_id is null )  e on e.order_no=a.order_no
+  	left join (select * from t_order_task where super_id is null )  e on e.order_no=a.order_no
   	left join admin f on e.task_receiver=f.id
+  	left join (select order_no from new_order_change group by order_no)g on a.order_no=g.order_no
   	</if>
   	where a.delete_sign !=1
   	<if test="outsource != null">
@@ -1495,6 +1495,8 @@ where super_id is null ) e on e.order_no=a.order_no
     where a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
   
+  
+  
    <select id="selectOrderRefundListByPage" resultType="com.goafanti.order.bo.TOrderRefundBo">
   	select a.id, date_format(a.create_time,'%Y-%m-%d') as createDate,a.order_no as orderNo,
     c.nickname as userName,b.order_status as orderStatus,a.refund_status as refundStatus,
@@ -1629,4 +1631,24 @@ where super_id is null ) e on e.order_no=a.order_no
   	update t_order_new set salesman_id= #{transferId},old_salesman_id= #{aid}
 	where delete_sign !=1 and salesman_id= #{aid}
   </update>
+  
+  <select id="selectUsedOrderByOrder" 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, a.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,
+    h.name NowFinance,h.contact_mobile NowFinanceMobile,a.additional_order additionalOrder,i.name as oldSalesmanName, i.contact_mobile oldSalesmanMobile
+    from new_order_change noc left join t_order_new a on noc.used_order=a.order_no left join `user` b on a.buyer_id=b.id left join admin i on a.old_salesman_id=i.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 admin h on dep.finance_id=h.id left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
+  	left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
+  	where noc.order_no= #{orderNo} order by noc.create_time
+  </select>
 </mapper>

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

@@ -246,12 +246,15 @@
       #{consultantId,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask" >
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      select LAST_INSERT_ID() as id
+      </selectKey>
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -912,7 +915,8 @@
   	 left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
   	 left join business_project i on a.commodity_id=i.id
   	 left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
-  	where a.super_id is null and  a.order_no= #{orderNo,jdbcType=VARCHAR}
+  	where a.super_id is null and  a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
+  	
   </select>
   
   

+ 104 - 81
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -7,144 +7,149 @@ public class NewOrderChange {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.id
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.order_no
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.process_state
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private Integer processState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.status
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.type
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.create_time
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.remarks
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.voucher_url
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String voucherUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.total_amount
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.settlement_amount
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal settlementAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.change_amount
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal changeAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.applicant
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String applicant;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.dep_name
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String depName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.project_state
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String projectState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_cost
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal zxsCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_remarks
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String zxsRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_time
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private Date paymentTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_amount
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal paymentAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_time
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private Date invoiceTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_amount
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal invoiceAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_type
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String invoiceType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_cost
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal cwCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refundable_amount
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal refundableAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_remarks
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private String cwRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.estimate_cost
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal estimateCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.estimate_refundable
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal estimateRefundable;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_Invoice
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	private BigDecimal refundInvoice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.used_order
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 */
+	private String usedOrder;
 
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -153,7 +158,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -162,7 +167,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -171,7 +176,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -180,7 +185,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Integer getProcessState() {
 		return processState;
@@ -189,7 +194,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setProcessState(Integer processState) {
 		this.processState = processState;
@@ -198,7 +203,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -207,7 +212,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -216,7 +221,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -225,7 +230,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -234,7 +239,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -243,7 +248,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -252,7 +257,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -261,7 +266,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -270,7 +275,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getVoucherUrl() {
 		return voucherUrl;
@@ -279,7 +284,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setVoucherUrl(String voucherUrl) {
 		this.voucherUrl = voucherUrl;
@@ -288,7 +293,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -297,7 +302,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -306,7 +311,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -315,7 +320,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -324,7 +329,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getChangeAmount() {
 		return changeAmount;
@@ -333,7 +338,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setChangeAmount(BigDecimal changeAmount) {
 		this.changeAmount = changeAmount;
@@ -342,7 +347,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -351,7 +356,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant;
@@ -360,7 +365,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getDepName() {
 		return depName;
@@ -369,7 +374,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setDepName(String depName) {
 		this.depName = depName;
@@ -378,7 +383,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getProjectState() {
 		return projectState;
@@ -387,7 +392,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setProjectState(String projectState) {
 		this.projectState = projectState;
@@ -396,7 +401,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getZxsCost() {
 		return zxsCost;
@@ -405,7 +410,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setZxsCost(BigDecimal zxsCost) {
 		this.zxsCost = zxsCost;
@@ -414,7 +419,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getZxsRemarks() {
 		return zxsRemarks;
@@ -423,7 +428,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setZxsRemarks(String zxsRemarks) {
 		this.zxsRemarks = zxsRemarks;
@@ -432,7 +437,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Date getPaymentTime() {
 		return paymentTime;
@@ -441,7 +446,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setPaymentTime(Date paymentTime) {
 		this.paymentTime = paymentTime;
@@ -450,7 +455,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
@@ -459,7 +464,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
@@ -468,7 +473,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Date getInvoiceTime() {
 		return invoiceTime;
@@ -477,7 +482,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setInvoiceTime(Date invoiceTime) {
 		this.invoiceTime = invoiceTime;
@@ -486,7 +491,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
@@ -495,7 +500,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
@@ -504,7 +509,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getInvoiceType() {
 		return invoiceType;
@@ -513,7 +518,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setInvoiceType(String invoiceType) {
 		this.invoiceType = invoiceType;
@@ -522,7 +527,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getCwCost() {
 		return cwCost;
@@ -531,7 +536,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setCwCost(BigDecimal cwCost) {
 		this.cwCost = cwCost;
@@ -540,7 +545,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getRefundableAmount() {
 		return refundableAmount;
@@ -549,7 +554,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setRefundableAmount(BigDecimal refundableAmount) {
 		this.refundableAmount = refundableAmount;
@@ -558,7 +563,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getCwRemarks() {
 		return cwRemarks;
@@ -567,7 +572,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setCwRemarks(String cwRemarks) {
 		this.cwRemarks = cwRemarks;
@@ -576,7 +581,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.estimate_cost
 	 * @return  the value of new_order_change.estimate_cost
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getEstimateCost() {
 		return estimateCost;
@@ -585,7 +590,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.estimate_cost
 	 * @param estimateCost  the value for new_order_change.estimate_cost
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setEstimateCost(BigDecimal estimateCost) {
 		this.estimateCost = estimateCost;
@@ -594,7 +599,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.estimate_refundable
 	 * @return  the value of new_order_change.estimate_refundable
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getEstimateRefundable() {
 		return estimateRefundable;
@@ -603,7 +608,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.estimate_refundable
 	 * @param estimateRefundable  the value for new_order_change.estimate_refundable
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setEstimateRefundable(BigDecimal estimateRefundable) {
 		this.estimateRefundable = estimateRefundable;
@@ -612,7 +617,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_Invoice
 	 * @return  the value of new_order_change.refund_Invoice
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public BigDecimal getRefundInvoice() {
 		return refundInvoice;
@@ -621,9 +626,27 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_Invoice
 	 * @param refundInvoice  the value for new_order_change.refund_Invoice
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setRefundInvoice(BigDecimal refundInvoice) {
 		this.refundInvoice = refundInvoice;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.used_order
+	 * @return  the value of new_order_change.used_order
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 */
+	public String getUsedOrder() {
+		return usedOrder;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.used_order
+	 * @param usedOrder  the value for new_order_change.used_order
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 */
+	public void setUsedOrder(String usedOrder) {
+		this.usedOrder = usedOrder;
+	}
 }

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class NewOrderChangeExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public NewOrderChangeExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1873,11 +1873,81 @@ public class NewOrderChangeExample {
 			addCriterion("refund_Invoice not between", value1, value2, "refundInvoice");
 			return (Criteria) this;
 		}
+
+		public Criteria andUsedOrderIsNull() {
+			addCriterion("used_order is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderIsNotNull() {
+			addCriterion("used_order is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderEqualTo(String value) {
+			addCriterion("used_order =", value, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderNotEqualTo(String value) {
+			addCriterion("used_order <>", value, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderGreaterThan(String value) {
+			addCriterion("used_order >", value, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderGreaterThanOrEqualTo(String value) {
+			addCriterion("used_order >=", value, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderLessThan(String value) {
+			addCriterion("used_order <", value, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderLessThanOrEqualTo(String value) {
+			addCriterion("used_order <=", value, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderLike(String value) {
+			addCriterion("used_order like", value, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderNotLike(String value) {
+			addCriterion("used_order not like", value, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderIn(List<String> values) {
+			addCriterion("used_order in", values, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderNotIn(List<String> values) {
+			addCriterion("used_order not in", values, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderBetween(String value1, String value2) {
+			addCriterion("used_order between", value1, value2, "usedOrder");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsedOrderNotBetween(String value1, String value2) {
+			addCriterion("used_order not between", value1, value2, "usedOrder");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 399 - 0
src/main/java/com/goafanti/common/model/TChangeDun.java

@@ -0,0 +1,399 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TChangeDun {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.id
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.did
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer did;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.cid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer cid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.order_no
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.tid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer tid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.project_type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer projectType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.dun_type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer dunType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.wait_day
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer waitDay;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.effective_count
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer effectiveCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.aid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.status
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.create_time
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.start_time
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Date startTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.money
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private BigDecimal money;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.appropriation_ratio
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private BigDecimal appropriationRatio;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.ctid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	private Integer ctid;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.id
+	 * @return  the value of t_change_dun.id
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.id
+	 * @param id  the value for t_change_dun.id
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.did
+	 * @return  the value of t_change_dun.did
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getDid() {
+		return did;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.did
+	 * @param did  the value for t_change_dun.did
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setDid(Integer did) {
+		this.did = did;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.cid
+	 * @return  the value of t_change_dun.cid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getCid() {
+		return cid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.cid
+	 * @param cid  the value for t_change_dun.cid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setCid(Integer cid) {
+		this.cid = cid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.order_no
+	 * @return  the value of t_change_dun.order_no
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.order_no
+	 * @param orderNo  the value for t_change_dun.order_no
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.tid
+	 * @return  the value of t_change_dun.tid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.tid
+	 * @param tid  the value for t_change_dun.tid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.project_type
+	 * @return  the value of t_change_dun.project_type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getProjectType() {
+		return projectType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.project_type
+	 * @param projectType  the value for t_change_dun.project_type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setProjectType(Integer projectType) {
+		this.projectType = projectType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.dun_type
+	 * @return  the value of t_change_dun.dun_type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getDunType() {
+		return dunType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.dun_type
+	 * @param dunType  the value for t_change_dun.dun_type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setDunType(Integer dunType) {
+		this.dunType = dunType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.wait_day
+	 * @return  the value of t_change_dun.wait_day
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getWaitDay() {
+		return waitDay;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.wait_day
+	 * @param waitDay  the value for t_change_dun.wait_day
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setWaitDay(Integer waitDay) {
+		this.waitDay = waitDay;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.effective_count
+	 * @return  the value of t_change_dun.effective_count
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getEffectiveCount() {
+		return effectiveCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.effective_count
+	 * @param effectiveCount  the value for t_change_dun.effective_count
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setEffectiveCount(Integer effectiveCount) {
+		this.effectiveCount = effectiveCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.aid
+	 * @return  the value of t_change_dun.aid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.aid
+	 * @param aid  the value for t_change_dun.aid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.status
+	 * @return  the value of t_change_dun.status
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.status
+	 * @param status  the value for t_change_dun.status
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.create_time
+	 * @return  the value of t_change_dun.create_time
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.create_time
+	 * @param createTime  the value for t_change_dun.create_time
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.start_time
+	 * @return  the value of t_change_dun.start_time
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.start_time
+	 * @param startTime  the value for t_change_dun.start_time
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.money
+	 * @return  the value of t_change_dun.money
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public BigDecimal getMoney() {
+		return money;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.money
+	 * @param money  the value for t_change_dun.money
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setMoney(BigDecimal money) {
+		this.money = money;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.appropriation_ratio
+	 * @return  the value of t_change_dun.appropriation_ratio
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public BigDecimal getAppropriationRatio() {
+		return appropriationRatio;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.appropriation_ratio
+	 * @param appropriationRatio  the value for t_change_dun.appropriation_ratio
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setAppropriationRatio(BigDecimal appropriationRatio) {
+		this.appropriationRatio = appropriationRatio;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.type
+	 * @return  the value of t_change_dun.type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.type
+	 * @param type  the value for t_change_dun.type
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.ctid
+	 * @return  the value of t_change_dun.ctid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public Integer getCtid() {
+		return ctid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.ctid
+	 * @param ctid  the value for t_change_dun.ctid
+	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 */
+	public void setCtid(Integer ctid) {
+		this.ctid = ctid;
+	}
+}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1303 - 0
src/main/java/com/goafanti/common/model/TChangeDunExample.java


+ 284 - 0
src/main/java/com/goafanti/common/model/TChangeTask.java

@@ -0,0 +1,284 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TChangeTask {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.id
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.tid
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private Integer tid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.cid
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private Integer cid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.order_no
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.main
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private Integer main;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_id
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private String commodityId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_name
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private String commodityName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_quantity
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private Integer commodityQuantity;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.commodity_price
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private BigDecimal commodityPrice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.task_comment
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private String taskComment;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.create_time
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_changge_task.type
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	private Integer type;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.id
+	 * @return  the value of t_changge_task.id
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.id
+	 * @param id  the value for t_changge_task.id
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.tid
+	 * @return  the value of t_changge_task.tid
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.tid
+	 * @param tid  the value for t_changge_task.tid
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.cid
+	 * @return  the value of t_changge_task.cid
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public Integer getCid() {
+		return cid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.cid
+	 * @param cid  the value for t_changge_task.cid
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setCid(Integer cid) {
+		this.cid = cid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.order_no
+	 * @return  the value of t_changge_task.order_no
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.order_no
+	 * @param orderNo  the value for t_changge_task.order_no
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.main
+	 * @return  the value of t_changge_task.main
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public Integer getMain() {
+		return main;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.main
+	 * @param main  the value for t_changge_task.main
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setMain(Integer main) {
+		this.main = main;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_id
+	 * @return  the value of t_changge_task.commodity_id
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public String getCommodityId() {
+		return commodityId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_id
+	 * @param commodityId  the value for t_changge_task.commodity_id
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setCommodityId(String commodityId) {
+		this.commodityId = commodityId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_name
+	 * @return  the value of t_changge_task.commodity_name
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public String getCommodityName() {
+		return commodityName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_name
+	 * @param commodityName  the value for t_changge_task.commodity_name
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_quantity
+	 * @return  the value of t_changge_task.commodity_quantity
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public Integer getCommodityQuantity() {
+		return commodityQuantity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_quantity
+	 * @param commodityQuantity  the value for t_changge_task.commodity_quantity
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setCommodityQuantity(Integer commodityQuantity) {
+		this.commodityQuantity = commodityQuantity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.commodity_price
+	 * @return  the value of t_changge_task.commodity_price
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public BigDecimal getCommodityPrice() {
+		return commodityPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.commodity_price
+	 * @param commodityPrice  the value for t_changge_task.commodity_price
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setCommodityPrice(BigDecimal commodityPrice) {
+		this.commodityPrice = commodityPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.task_comment
+	 * @return  the value of t_changge_task.task_comment
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public String getTaskComment() {
+		return taskComment;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.task_comment
+	 * @param taskComment  the value for t_changge_task.task_comment
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setTaskComment(String taskComment) {
+		this.taskComment = taskComment;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.create_time
+	 * @return  the value of t_changge_task.create_time
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.create_time
+	 * @param createTime  the value for t_changge_task.create_time
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_changge_task.type
+	 * @return  the value of t_changge_task.type
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_changge_task.type
+	 * @param type  the value for t_changge_task.type
+	 * @mbg.generated  Mon Jan 13 09:27:33 CST 2020
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1023 - 0
src/main/java/com/goafanti/common/model/TChangeTaskExample.java


+ 0 - 26
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -185,32 +185,6 @@ public class ExcelUtils {
 			return "";
 	}
 	
-	public static void main(String[] args) {
-//		ExcelUtils utils = new ExcelUtils();
-//		String s = utils.checkMobile("18320746285", 1);
-//		System.out.println(s);
-		String mm = "201111";
-		if(mm.length() != 2 && mm.length() != 6){
-			System.out.println("cuowu=-----");
-		}else{
-			Integer m = Integer.valueOf(mm.substring(mm.length()-2, mm.length()));
-			System.out.println(m);
-			if(m>12 || m<0){
-				System.out.println("月份不对------");
-			}else{
-				Integer re = Integer.valueOf(mm);
-				if(re>m){
-					System.out.println(re);
-				}else{
-					String ym = new SimpleDateFormat("yyyy").format(new Date()) + m;
-					System.out.println(ym);
-				}
-			}
-			
-			
-			
-		}
-	}
 	
 	
 	public  Set<OrderReportBo> parseOrderExcel(String excelPath) throws IOException{

+ 0 - 4
src/main/java/com/goafanti/common/utils/SendEmailUtil.java

@@ -142,9 +142,5 @@ public class SendEmailUtil {
         Matcher m = p.matcher(email);
         return m.matches();
     }
-
-	/*public static void main(String[] args) {
-		System.out.println(isEmail("anderx@dingtalk.com"));
-	}*/
 	
 }

+ 66 - 0
src/main/java/com/goafanti/order/bo/TChangeDunOut.java

@@ -0,0 +1,66 @@
+package com.goafanti.order.bo;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.order.enums.NewOrderDunType;
+
+public class TChangeDunOut extends TChangeDun{
+	private String dunTypeName;
+	private String commodityName;
+	private String startDate;
+	private BigDecimal setUpAmount;
+	public String getDunTypeName() {
+		if(super.getDunType()!=null&&super.getProjectType()!=null) {
+			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()));
+		}
+		return dunTypeName;
+	}
+	public String getCommodityName() {
+		return commodityName;
+	}
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+	public String getStartDate() {
+		//会员显示到期时间
+		if(super.getCreateTime()!=null&&super.getEffectiveCount()!=null) {
+			Calendar calendar=Calendar.getInstance();   
+	  		calendar.setTime(super.getCreateTime());
+	  		calendar.add(Calendar.DATE, super.getEffectiveCount()*180);
+	  		return DateUtils.formatDate(calendar.getTime(), AFTConstants.YYYYMMDD);
+		}
+		//财税显示催款时间 大于9则年份+2,小于10年份+1
+		if (super.getDunType()==2&&super.getProjectType()==5) {
+			Calendar calendar=Calendar.getInstance();   
+	  		calendar.setTime(super.getCreateTime());
+	  		int year = calendar.get(Calendar.YEAR);  
+		        //获取月份,0表示1月份
+		        int month = calendar.get(Calendar.MONTH) + 1;
+		        if(month<10)year=year+1;
+		        if(month>9)year=year+2;
+		        calendar.set(year, 5, 1);
+		        return DateUtils.formatDate(calendar.getTime(), AFTConstants.YYYYMMDD);
+		}
+		return startDate;
+	}
+	public BigDecimal getMoney() {
+		if(getDunType()!=null&&getProjectType()!=null){
+			if(Integer.valueOf(""+getProjectType()+getDunType())==33&&
+					super.getMoney()==null&&
+					super.getAppropriationRatio()!=null&&getSetUpAmount()!=null) {
+				return super.getAppropriationRatio().multiply(getSetUpAmount());
+			}
+		}
+		return super.getMoney();
+	}
+	public BigDecimal getSetUpAmount() {
+		return setUpAmount;
+	}
+	public void setSetUpAmount(BigDecimal setUpAmount) {
+		this.setUpAmount = setUpAmount;
+	}
+}

+ 22 - 0
src/main/java/com/goafanti/order/bo/TChangeTaskOut.java

@@ -0,0 +1,22 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TChangeTask;
+
+public class TChangeTaskOut extends TChangeTask{
+	private String cname;
+	private Integer cSort;
+	public Integer getcSort() {
+		return cSort;
+	}
+	public void setcSort(Integer cSort) {
+		this.cSort = cSort;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	
+	
+}

+ 26 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -1,6 +1,7 @@
 package com.goafanti.order.bo;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -47,6 +48,13 @@ public class TOrderNewBo extends TOrderNew{
 	private BigDecimal appropriationRatio;
 	private BigDecimal setUpAmount;
 	
+	private List<?> dunList;
+	private List<?> taskList;
+	/**
+	 * 是否变更 0否 1是
+	 */
+	private Integer ischange;
+	
 	public String getDunSubject() {
 		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
 		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
@@ -335,5 +343,23 @@ public class TOrderNewBo extends TOrderNew{
 	public void setSetUpAmount(BigDecimal setUpAmount) {
 		this.setUpAmount = setUpAmount;
 	}
+	public Integer getIschange() {
+		return ischange;
+	}
+	public void setIschange(Integer ischange) {
+		this.ischange = ischange;
+	}
+	public List<?> getDunList() {
+		return dunList;
+	}
+	public void setDunList(List<?> dunList) {
+		this.dunList = dunList;
+	}
+	public List<?> getTaskList() {
+		return taskList;
+	}
+	public void setTaskList(List<?> taskList) {
+		this.taskList = taskList;
+	}
 	
 }

+ 4 - 3
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -671,14 +671,15 @@ public class AdminOrderApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 发起订单变更
+	 * 发起订单变更(作废)
 	 * @param orderNo
 	 * @param changeComment
 	 * @return
 	 */
 	@RequestMapping(value = "/addOrderChange",method = RequestMethod.POST)
-	public Result addOrderChange(String orderNo,String changeComment){
+	public Result addOrderChange(String orderNo,String changeComment,String taskList,String dunList){
 		Result res = new Result();
+		//此订单变更为原订单变更已经确定不再使用。
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
@@ -687,7 +688,7 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更说明"));
 			return res;
 		}
-		orderServiceImpl.addOrderChange(orderNo,changeComment);
+		orderServiceImpl.addOrderChange(orderNo,changeComment,taskList,dunList);
 		return res;
 	}
 	

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

@@ -15,6 +15,8 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.OrderRefundInvoice;
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
@@ -44,8 +46,141 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.setData(orderChangeService.addOrderChange(t,startRemarks));
 		return res;
 	}
+	
+	@RequestMapping(value = "/addChangeTask", method = RequestMethod.POST)
+	public Result addChangeTask(TChangeTask t){
+		Result res = new Result();
+		if(StringUtils.isBlank(t.getCommodityId())){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目"));
+			return res;
+		}
+		if(null==t.getCommodityPrice()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目金额"));
+			return res;
+		}
+		if(null==t.getCommodityQuantity()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目数量"));
+			return res;
+		}
+		if(StringUtils.isBlank(t.getOrderNo())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		if(null==t.getCid()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更编号"));
+			return res;
+		}
+		res.setData(orderChangeService.addChangeTask(t));
+		return res;
+	}
+	
+	/**
+	 *  变更项目列表
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/selectChangeTask", method = RequestMethod.GET)
+	public Result selectChangeTask(Integer id){
+		Result res = new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
+			return res;
+		}
+		res.setData(orderChangeService.selectChangeTask(id));
+		return res;
+	}
 	/**
-	 *    订单查看变更详情
+	 *  变更催款列表
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/selectChangeDun", method = RequestMethod.GET)
+	public Result selectChangeDun(Integer id){
+		Result res = new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
+			return res;
+		}
+		res.setData(orderChangeService.selectChangeDun(id));
+		return res;
+	}
+	/**
+	 *  删除变更项目
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteChangeTask", method = RequestMethod.POST)
+	public Result deleteChangeTask(TChangeTask t){
+		Result res = new Result();
+		if (null==t.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
+			return res;
+		}
+		res.setData(orderChangeService.deleteChangeTask(t.getId()));
+		return res;
+	}
+	
+	/**
+	 *  修改变更项目
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/updateChangeTask", method = RequestMethod.POST)
+	public Result updateChangeTask(TChangeTask t){
+		Result res = new Result();
+		if (null==t.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));
+			return res;
+		}
+		res.setData(orderChangeService.updateChangeTask(t));
+		return res;
+	}
+	/**
+	  *     修改变更催款
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/updateChangeDun", method = RequestMethod.POST)
+	public Result updateChangeDun(TChangeDun t){
+		Result res = new Result();
+		if (null==t.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更任务id"));
+			return res;
+		}
+		res.setData(orderChangeService.updateChangeDun(t));
+		return res;
+	}
+	/**
+	 *  删除变更催款
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteChangeDun", method = RequestMethod.POST)
+	public Result deleteChangeDun(TChangeDun t){
+		Result res = new Result();
+		if (null==t.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更任务id"));
+			return res;
+		}
+		res.setData(orderChangeService.deleteChangeDun(t.getId()));
+		return res;
+	}
+	@RequestMapping(value = "/addChangeDun", method = RequestMethod.POST)
+	public Result addChangeDun(TChangeDun d){
+		Result res = new Result();
+		if(StringUtils.isBlank(d.getOrderNo())||null==d.getCtid()) {
+			res.getError().add(buildError("", "订单编号与项目编号必须指定"));
+			return res;
+		}
+		if(null==d.getProjectType()||null==d.getDunType()) {
+			res.getError().add(buildError("", "项目分类和催款分类必须指定"));
+			return res;
+		}
+		res.setData(orderChangeService.addChangeDun(d));
+		return res;
+	}
+	/**
+	 *    订单查看变更列表
 	 */
 	@RequestMapping(value = "/orderChangeDetails", method = RequestMethod.GET)
 	public Result orderChangeDetails(String orderNo){
@@ -58,6 +193,19 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 	/**
+	 *    订单查看变更原订单
+	 */
+	@RequestMapping(value = "/orderChangeUsed", method = RequestMethod.GET)
+	public Result orderChangeUsed(String orderNo){
+		Result res = new Result();
+		if(null==orderNo){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单编号"));
+			return res;
+		}
+		res.setData(orderChangeService.orderChangeUsed( orderNo));
+		return res;
+	}
+	/**
 	 *    id查看变更详情
 	 */
 	@RequestMapping(value = "/orderChangeDetailsById", method = RequestMethod.GET)
@@ -155,6 +303,20 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.data(orderChangeService.addOrderRefundInvoice(o));
 		return res;
 	}
+	
+	/**
+	 *  新增回收发票
+	 */
+	@RequestMapping(value ="/getOrderChange",method = RequestMethod.GET)
+	public Result getOrderChange(String  orderNo) {
+		Result res =new Result();
+		if (StringUtils.isBlank(orderNo)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "订单编号", "订单编号"));
+			return res;
+		}
+		res.data(orderChangeService.getOrderChange(orderNo));
+		return res;
+	}
 	/**
 	 *  删除回收发票
 	 */

+ 1 - 1
src/main/java/com/goafanti/order/enums/OrderChangeType.java

@@ -10,7 +10,7 @@ public enum OrderChangeType {
 	JXMBG(2,"仅项目变更"),
 	JJEBG(3,"仅金额变更"),
 	CB(4,"重报"),
-	ZC(5,"赠送"),
+	ZS(5,"赠送"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
 	

+ 26 - 2
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -7,17 +7,22 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.goafanti.common.model.OrderRefundInvoice;
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.model.TChangeTask;
+import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
-import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
+import com.goafanti.order.bo.TChangeDunOut;
+import com.goafanti.order.bo.TChangeTaskOut;
+import com.goafanti.order.bo.TOrderNewBo;
 
 public interface OrderChangeService {
 
 	int addOrderChange(NewOrderChangeBo t, String startRemarks);
 
-	NewOrderChangeBo orderChangeDetails(String orderNo);
+	List<NewOrderChangeBo> orderChangeDetails(String orderNo);
 
 	int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState, Integer rejectState);
 
@@ -46,8 +51,27 @@ public interface OrderChangeService {
 			String startTime, String endTime, String depId, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
 			Integer pageNo) throws IOException ;
 
+
+
+	int addChangeTask(TChangeTask t);
+
+	int addChangeDun(TChangeDun d);
+
+	int deleteChangeTask(Integer id);
+
+	int deleteChangeDun(Integer id);
+
+	List<TChangeTaskOut> selectChangeTask(Integer cid);
 	
+	List<TChangeDunOut> selectChangeDun(Integer cid);
+
+	int updateChangeTask(TChangeTask t);
+
+	int updateChangeDun(TChangeDun t);
+
+	List<TOrderNewBo> orderChangeUsed(String orderNo);
 
+	List<Map<String, String>> getOrderChange(String orderNo);
 
 
 }

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

@@ -452,9 +452,11 @@ public interface OrderService {
 	 * 添加变更记录
 	 * @param orderNo
 	 * @param changeComment
+	 * @param dunList 
+	 * @param taskList 
 	 * @return
 	 */
-	int addOrderChange(String orderNo, String changeComment);
+	int addOrderChange(String orderNo, String changeComment, String taskList, String dunList);
 
 	/**
 	 * 查看变更记录列表

+ 236 - 35
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -30,6 +30,8 @@ import com.goafanti.common.dao.OrderChangeLogMapper;
 import com.goafanti.common.dao.OrderExamineMapper;
 import com.goafanti.common.dao.OrderRefundInvoiceMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
+import com.goafanti.common.dao.TChangeDunMapper;
+import com.goafanti.common.dao.TChangeTaskMapper;
 import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderDunMapper;
 import com.goafanti.common.dao.TOrderInvoiceMapper;
@@ -41,10 +43,14 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.OrderChangeLog;
 import com.goafanti.common.model.OrderExamine;
 import com.goafanti.common.model.OrderRefundInvoice;
+import com.goafanti.common.model.TChangeDun;
+import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.NewOrderChange;
+import com.goafanti.common.model.NewOrderDun;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -57,14 +63,19 @@ import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
+import com.goafanti.order.bo.TChangeDunOut;
+import com.goafanti.order.bo.TChangeTaskOut;
 import com.goafanti.order.bo.TOrderLogBo;
+import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.enums.OrderChangeType;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.OrderType;
+import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
+
 @Service
 public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
 	@Autowired
@@ -99,14 +110,18 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	private AdminMapper	adminMapper;
 	@Autowired
 	private OrderNewService	orderNewService;
-	
+	@Autowired
+	private NewOrderDunService	newOrderDunService;
+	@Autowired
+	private TChangeTaskMapper	TChangeTaskMapper;
+	@Autowired
+	private TChangeDunMapper	TChangeDunMapper;
 	
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
 		TOrderNew ton=new TOrderNew();
 		ton.setOrderNo(t.getOrderNo());
 		ton.setDeleteSign(2);//将订单置为锁定
-		t.setProcessState(1);//设置营销管理员来审核
 		tOrderNewMapper.updateByPrimaryKeySelective(ton);
 		BigDecimal invoiceAmount=tOrderInvoiceMapper.conutAmountByOrderNo(t.getOrderNo());
 		t.setInvoiceAmount(invoiceAmount);//开票金额
@@ -116,17 +131,60 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		BigDecimal estimateCost=new BigDecimal(tOrderTaskMapper.selectEstimateCost(t.getOrderNo()));
 		t.setEstimateCost(estimateCost);
 		t.setEstimateRefundable(paymentAmount.subtract(estimateCost));
-		
+		t.setZxsRemarks(startRemarks);
 		newOrderChangeMapper.insertSelective(t);
-		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNo(t.getOrderNo());
-		OrderChangeLog ocl=new OrderChangeLog();
-		ocl.setAuditor(TokenManager.getAdminId());
-		ocl.setOrderNo(t.getOrderNo());
-		ocl.setRemarks(startRemarks);
-		ocl.setChangeId(ncb.getId());
-		ocl.setStatus(0);
-		sendNotice(0, t);//设置与通过一样发送信息
-		orderChangeLogMapper.insertSelective(ocl);
+		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNoAndStatus(t.getOrderNo());
+
+			List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null,null);
+			List<TChangeDun> listcd=new ArrayList<>();
+			if (listDun!=null&&!listDun.isEmpty()) {
+				for (OutNewOrderDunBo d : listDun) {
+					TChangeDun cd=new TChangeDun();
+					cd.setOrderNo(d.getOrderNo());
+					cd.setAid(d.getAid());
+					cd.setAppropriationRatio(d.getAppropriationRatio());
+					cd.setCid(ncb.getId());
+					cd.setDid(d.getId());
+					cd.setTid(d.getTid());
+					cd.setProjectType(d.getProjectType());
+					cd.setDunType(d.getDunType());
+					cd.setMoney(d.getMoney());
+					cd.setWaitDay(d.getWaitDay());
+					cd.setStartTime(d.getStartTime());
+					cd.setEffectiveCount(d.getEffectiveCount());
+					listcd.add(cd);
+				}
+				TChangeDunMapper.insertSelectiveList(listcd);
+			}
+			List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
+			List<TChangeTask> listck=new ArrayList<>();
+			if (listTask!=null&&!listTask.isEmpty()) {
+				for (TOrderTaskBo tt : listTask) {
+					TChangeTask ck=new TChangeTask();
+					ck.setOrderNo(tt.getOrderNo());
+					ck.setCid(ncb.getId());
+					ck.setCommodityId(tt.getCommodityId());
+					ck.setOrderNo(tt.getOrderNo());
+					ck.setCommodityName(tt.getCommodityName());
+					ck.setCommodityPrice(tt.getCommodityPrice());
+					ck.setCommodityQuantity(tt.getCommodityQuantity());
+					ck.setTaskComment(tt.getTaskComment());
+					ck.setMain(tt.getMain());
+					ck.setTid(tt.getId());
+					listck.add(ck);
+				}
+				TChangeTaskMapper.insertSelectiveList(listck);
+			}
+			if (t.getType()==OrderChangeType.TDTK.getCode()) {
+				OrderChangeLog ocl=new OrderChangeLog();
+				ocl.setAuditor(TokenManager.getAdminId());
+				ocl.setOrderNo(t.getOrderNo());
+				ocl.setRemarks(startRemarks);
+				ocl.setChangeId(ncb.getId());
+				ocl.setStatus(0);
+				sendNotice(0, t);//设置与通过一样发送信息
+				orderChangeLogMapper.insertSelective(ocl);
+			}
 		return 1;
 	}
 	
@@ -160,9 +218,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	@Override
-	public NewOrderChangeBo orderChangeDetails(String orderNo) {
-		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
-		return nb;
+	public List<NewOrderChangeBo> orderChangeDetails(String orderNo) {
+		List<NewOrderChangeBo> list=newOrderChangeMapper.selectByorderNo(orderNo);
+		return list;
 	}
 	@Override
 	public NewOrderChangeBo orderChangeDetailsById(Integer id) {
@@ -177,7 +235,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 	@Override
 	public int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState,Integer rejectState) {
-		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
+		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNoAndStatus(orderNo);
 		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
 			throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
 		}
@@ -202,7 +260,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				 if(nb.getProcessState()==1){//营销管理通过则设置技术管理员通过表
 					 if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
 						 insertOrderExamine(orderNo);
-					 } 
+					 } else {
+						 orderExamineMapper.updateByOrderNo(orderNo,null);
+					 }
 					 nb.setProcessState(nb.getProcessState()+1);
 					}
 				 //必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
@@ -335,7 +395,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		
 	}
 	
-	private void changgeAdopt(NewOrderChangeBo nb) {
+	/**
+	 * 变更完成复制出原订单镜像
+	 */
+	private void changeAdopt(NewOrderChangeBo nb) {
 		TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
 		List<TOrderDun> td1=tOrderDunMapper.selectByOrderNo(nb.getOrderNo());
 		List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(), null, null);
@@ -343,6 +406,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
 		String newOrderNo=idGenerator.generateId().toString();
 		t1.setOrderNo(newOrderNo);
+		nb.setUsedOrder(newOrderNo);
 		t1.setDeleteSign(1);//将原订单作废,只能查看
 		tOrderNewMapper.insertSelective(t1);
 		for (TOrderTaskBo tOrderTaskBo : tt1) {
@@ -368,22 +432,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		nb.setStatus(4);
 		//将订单恢复正常
 		TOrderNew orderNew =new TOrderNew();
-		TOrderNew additionalOrder =new TOrderNew();
-		String additionalOrderNo;
 		orderNew.setOrderNo(nb.getOrderNo());
-		orderNew.setDeleteSign(3);//设置为变更中
+		orderNew.setDeleteSign(0);
 		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.setContractNo(t1.getContractNo());
-			additionalOrder.setSalesmanId(t1.getSalesmanId());
-			additionalOrder.setOrderType(t1.getOrderType());
-			additionalOrder.setBuyerId(t1.getBuyerId());	
-			tOrderNewMapper.insertSelective(additionalOrder);
-		}
 		tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 		
 	}
@@ -426,6 +477,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Override
 	public int updateOrderChange(NewOrderChangeBo t,Integer changeType,String startRemarks) {
 		NewOrderChange  noc=new NewOrderChange();
+		t.setProcessState(1);
 		noc.setId(t.getId());
 		if (changeType==0) {
 			noc.setRemarks(t.getRemarks());
@@ -471,14 +523,91 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 	@Override
 	public int pushCompleteOrderChange(NewOrderChangeBo nb) {
-		changgeAdopt(nb);
+		changeAdopt(nb);
+		TOrderNew o=pushChange(nb);
 		List<String> alist = new ArrayList<>();
-		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
 		alist.add(o.getSalesmanId());
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
 		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), TokenManager.getAdminId(),0);
 		return 1;
 	}
+	/**
+	 * 修改订单数据
+	 * @param nb
+	 */
+	private TOrderNew pushChange(NewOrderChangeBo nb) {
+		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		NewOrderChangeBo nob=newOrderChangeMapper.selectById(nb.getId());
+//		变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
+		//退单退款不需改变内容
+		if (nob.getType()==OrderChangeType.XMJJEBG.getCode()) {
+			o.setTotalAmount(nob.getTotalAmount());
+			//处理项目及催款
+			pushTaskAndDun(nob.getId(),nob.getOrderNo());
+		}else if (nob.getType()==OrderChangeType.JXMBG.getCode()) {
+			pushTaskAndDun(nob.getId(),nob.getOrderNo());
+		}else if (nob.getType()==OrderChangeType.JJEBG.getCode()) {
+			o.setTotalAmount(nob.getTotalAmount());
+		}else if (nob.getType()==OrderChangeType.CB.getCode()||nob.getType()==OrderChangeType.ZS.getCode()) {
+			pushTaskAndDun(nob.getId(),nob.getOrderNo());
+		}
+		tOrderNewMapper.updateByPrimaryKeySelective(o);
+		return o; 
+	}
+
+	private void pushTaskAndDun(Integer id,String orderNo) {
+		List<TChangeTaskOut> listct=TChangeTaskMapper.selectByCid(id);
+		for (TChangeTaskOut cd : listct) {
+			TOrderTask ot=new TOrderTask();
+			if (cd.getType()==1) {
+			ot.setOrderNo(cd.getOrderNo());
+			ot.setCommodityId(cd.getCommodityId());
+			ot.setOrderNo(cd.getOrderNo());
+			ot.setCommodityName(cd.getCommodityName());
+			ot.setCommodityPrice(cd.getCommodityPrice());
+			ot.setCommodityQuantity(cd.getCommodityQuantity());
+			ot.setTaskComment(cd.getTaskComment());
+			ot.setMain(cd.getMain());
+			ot.setTaskStatus(0);
+			tOrderTaskMapper.insertSelective(ot);
+			cd.setTid(ot.getId());
+			TChangeTaskMapper.updateByPrimaryKeySelective(cd);
+			}else if (cd.getType()==2) {
+				ot.setId(cd.getTid());
+				ot.setCommodityPrice(cd.getCommodityPrice());
+				tOrderTaskMapper.updateByPrimaryKeySelective(ot);
+			}else if(cd.getType()==3) {
+				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
+			}
+		}
+		List<TChangeDunOut> listcd=TChangeDunMapper.selectByCid(id);
+		for (TChangeDunOut cd : listcd) {
+			NewOrderDun nd=new NewOrderDun();
+			if (cd.getType()==1) {
+			nd.setOrderNo(cd.getOrderNo());
+			nd.setAid(cd.getAid());
+			nd.setAppropriationRatio(cd.getAppropriationRatio());
+			nd.setTid(cd.getTid());
+			nd.setProjectType(cd.getProjectType());
+			nd.setDunType(cd.getDunType());
+			nd.setMoney(cd.getMoney());
+			nd.setWaitDay(cd.getWaitDay());
+			nd.setStartTime(cd.getStartTime());
+			nd.setEffectiveCount(cd.getEffectiveCount());
+			newOrderDunMapper.insertSelective(nd);
+			}else if (cd.getType()==2) {
+				nd.setId(cd.getTid());
+				nd.setMoney(cd.getMoney());
+				newOrderDunMapper.updateByPrimaryKeySelective(nd);
+			}else if(cd.getType()==3) {
+				newOrderDunMapper.deleteByPrimaryKey(cd.getDid());
+			}
+		}
+		
+
+		
+	}
+
 	@Override
 	public Map<String, Object> listOrderInvoiceAndBill(String orderNo) {
 		Map<String, Object> map=new HashMap<>();
@@ -593,6 +722,78 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				      return str + num;
 				    }
 			}
-		
 
+
+			@Override
+			public int addChangeTask(TChangeTask t) {
+				t.setType(1);
+				return TChangeTaskMapper.insertSelective(t);
+			}
+
+			@Override
+			public int addChangeDun(TChangeDun d) {
+				d.setAid(TokenManager.getAdminId());
+				d.setType(1);
+				return TChangeDunMapper.insertSelective(d);
+			}
+
+			@Override
+			public int deleteChangeTask(Integer id) {
+				return TChangeTaskMapper.deleteByPrimaryKey(id);
+			}
+
+			@Override
+			public int deleteChangeDun(Integer id) {
+				return TChangeDunMapper.deleteByPrimaryKey(id);
+			}
+
+			@Override
+			public List<TChangeTaskOut> selectChangeTask(Integer cid) {
+				return TChangeTaskMapper.selectByCid(cid);
+			}
+
+			@Override
+			public List<TChangeDunOut> selectChangeDun(Integer cid) {
+				return TChangeDunMapper.selectByCid(cid);
+			}
+
+			@Override
+			public int updateChangeTask(TChangeTask t) {
+				//有tid是订单复制项目
+				if(t.getTid()!=null) {
+					//type 0正常 1新增 2修改 3删除
+					if (t.getType()==3) {
+						TChangeDunMapper.updateByTid(t.getTid(),3);
+					}else if(t.getType()==2){
+						TChangeDunMapper.updateByTid(t.getTid(),2);
+					}
+				}else {
+					if (t.getType()==3) {
+						TChangeDunMapper.deleteByTid(t.getTid());
+					}
+				}
+				return TChangeTaskMapper.updateByPrimaryKeySelective(t);
+			}
+
+			@Override
+			public int updateChangeDun(TChangeDun t) {
+				return TChangeDunMapper.updateByPrimaryKeySelective(t);
+			}
+
+			@Override
+			public List<TOrderNewBo> orderChangeUsed(String orderNo) {
+				List<TOrderNewBo> list=tOrderNewMapper.selectUsedOrderByOrder(orderNo);
+				for (TOrderNewBo t : list) {
+					t.setDunList(newOrderDunService.selectListNewOrderDun(orderNo));
+					t.setTaskList(orderNewService.selectOrderTask(orderNo));
+				}
+				return list;
+			}
+
+			@Override
+			public List<Map<String, String>> getOrderChange(String orderNo) {
+				List<Map<String, String>> list=new ArrayList<>();
+				list =newOrderChangeMapper.getOrderChange(orderNo);
+				return list;
+			}
 }

+ 5 - 7
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -229,8 +229,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public List<TOrderTaskBo> selectOrderTask(String orderNo) {
-		List<TOrderTaskBo> list=new ArrayList<>();
-		list=tOrderTaskMapper.selectOrderTask(orderNo);
+		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
 		if (TokenManager.hasRole(AFTConstants.SALESMAN)) {
 			for (TOrderTaskBo t : list) {
 				t.setOutsourceName("****");
@@ -650,11 +649,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		ob.setBackStatus(0);//待处理
 		ob.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		ob.setAccept(tOrder.getSalesmanId());
-		/*try {
-			addNoticAndSendEmail(orderNo, null, NoticeStatus.ORDER_BACK.getCode());
-		} catch (UnsupportedEncodingException | MessagingException e) {
-			LoggerUtils.error(getClass(), "发送邮件失败", e);
-		}*/
+		TOrderLog tl=new TOrderLog();
+		tl.setOrderNo(orderNo);
+		tl.setProcess(OrderLogProcess.BH.getCode());
+		addOrderLog(tl,null);
 		tOrderBackMapper.insertSelective(ob);
 	}
 

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -1887,14 +1888,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	@Transactional
-	public int addOrderChange(String orderNo, String changeComment) {
+	public int addOrderChange(String orderNo, String changeComment,String taskList,String dunList) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		tOrder.setChangeStatus(ChangeState.CHANGING.getCode());
 		TOrderChange change = new TOrderChange();
 		change.setCreaterId(TokenManager.getAdminId());
 		change.setCreateTime(new Date());
 		change.setOrderNo(orderNo);
-		change.setId(UUID.randomUUID().toString());
+		String id=UUID.randomUUID().toString();
+		change.setId(id);
 		change.setChangeComment(changeComment);
 		change.setChangeStatus(ChangeState.CHANGING.getCode());
 		change.setDeleteSign(DeleteStatus.UNDELETE.getCode());

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.29
+#static.host=//sb.jishutao.com/1.1.30
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.29
+static.host=//static.jishutao.com/1.1.30
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.29
+static.host=//static.jishutao.com/1.1.30
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload