Просмотр исходного кода

新增变更列表驳回

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
f04f08395b

+ 1 - 1
GeneratorConfig.xml

@@ -9,7 +9,7 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_order_task"/>
+    <table schema="aft" tableName="new_order_change"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

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

@@ -14,68 +14,68 @@ public interface NewOrderChangeMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	int updateByPrimaryKey(NewOrderChange record);
 
@@ -89,7 +89,10 @@ public interface NewOrderChangeMapper {
 
 	void subtractRefundInvoice(@Param("orderNo")String orderNo,@Param("amount")BigDecimal amount);
 
-	NewOrderChangeBo selectByorderNoAndStatus(String orderNo);
 
 	List<Map<String, String>> getOrderChange(String orderNo);
+
+	NewOrderChangeBo selectByChangeId(String changeId);
+
+	NewOrderChangeBo selectByorderNoAndStatus(String orderNo);
 }

Разница между файлами не показана из-за своего большого размера
+ 985 - 940
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml


+ 113 - 90
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -7,159 +7,164 @@ public class NewOrderChange {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.id
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 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 Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	private String usedOrder;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_status
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	private Integer refundStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_url
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	private String refundUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.back_status
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
+	 */
+	private Integer backStatus;
 
 	/**
 	 * 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -168,7 +173,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -177,7 +182,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -186,7 +191,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -195,7 +200,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public Integer getProcessState() {
 		return processState;
@@ -204,7 +209,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setProcessState(Integer processState) {
 		this.processState = processState;
@@ -213,7 +218,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -222,7 +227,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -231,7 +236,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -240,7 +245,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -249,7 +254,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -258,7 +263,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -267,7 +272,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -276,7 +281,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -285,7 +290,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getVoucherUrl() {
 		return voucherUrl;
@@ -294,7 +299,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setVoucherUrl(String voucherUrl) {
 		this.voucherUrl = voucherUrl;
@@ -303,7 +308,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -312,7 +317,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -321,7 +326,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -330,7 +335,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -339,7 +344,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getChangeAmount() {
 		return changeAmount;
@@ -348,7 +353,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setChangeAmount(BigDecimal changeAmount) {
 		this.changeAmount = changeAmount;
@@ -357,7 +362,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -366,7 +371,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant;
@@ -375,7 +380,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getDepName() {
 		return depName;
@@ -384,7 +389,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setDepName(String depName) {
 		this.depName = depName;
@@ -393,7 +398,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getProjectState() {
 		return projectState;
@@ -402,7 +407,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setProjectState(String projectState) {
 		this.projectState = projectState;
@@ -411,7 +416,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getZxsCost() {
 		return zxsCost;
@@ -420,7 +425,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setZxsCost(BigDecimal zxsCost) {
 		this.zxsCost = zxsCost;
@@ -429,7 +434,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getZxsRemarks() {
 		return zxsRemarks;
@@ -438,7 +443,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setZxsRemarks(String zxsRemarks) {
 		this.zxsRemarks = zxsRemarks;
@@ -447,7 +452,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public Date getPaymentTime() {
 		return paymentTime;
@@ -456,7 +461,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setPaymentTime(Date paymentTime) {
 		this.paymentTime = paymentTime;
@@ -465,7 +470,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
@@ -474,7 +479,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
@@ -483,7 +488,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public Date getInvoiceTime() {
 		return invoiceTime;
@@ -492,7 +497,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setInvoiceTime(Date invoiceTime) {
 		this.invoiceTime = invoiceTime;
@@ -501,7 +506,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
@@ -510,7 +515,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
@@ -519,7 +524,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getInvoiceType() {
 		return invoiceType;
@@ -528,7 +533,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setInvoiceType(String invoiceType) {
 		this.invoiceType = invoiceType;
@@ -537,7 +542,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getCwCost() {
 		return cwCost;
@@ -546,7 +551,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setCwCost(BigDecimal cwCost) {
 		this.cwCost = cwCost;
@@ -555,7 +560,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getRefundableAmount() {
 		return refundableAmount;
@@ -564,7 +569,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setRefundableAmount(BigDecimal refundableAmount) {
 		this.refundableAmount = refundableAmount;
@@ -573,7 +578,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getCwRemarks() {
 		return cwRemarks;
@@ -582,7 +587,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setCwRemarks(String cwRemarks) {
 		this.cwRemarks = cwRemarks;
@@ -591,7 +596,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getEstimateCost() {
 		return estimateCost;
@@ -600,7 +605,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setEstimateCost(BigDecimal estimateCost) {
 		this.estimateCost = estimateCost;
@@ -609,7 +614,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getEstimateRefundable() {
 		return estimateRefundable;
@@ -618,7 +623,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setEstimateRefundable(BigDecimal estimateRefundable) {
 		this.estimateRefundable = estimateRefundable;
@@ -627,7 +632,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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public BigDecimal getRefundInvoice() {
 		return refundInvoice;
@@ -636,7 +641,7 @@ 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setRefundInvoice(BigDecimal refundInvoice) {
 		this.refundInvoice = refundInvoice;
@@ -645,7 +650,7 @@ public class NewOrderChange {
 	/**
 	 * 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 Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getUsedOrder() {
 		return usedOrder;
@@ -654,7 +659,7 @@ public class NewOrderChange {
 	/**
 	 * 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 Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setUsedOrder(String usedOrder) {
 		this.usedOrder = usedOrder;
@@ -663,7 +668,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_status
 	 * @return  the value of new_order_change.refund_status
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public Integer getRefundStatus() {
 		return refundStatus;
@@ -672,7 +677,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_status
 	 * @param refundStatus  the value for new_order_change.refund_status
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setRefundStatus(Integer refundStatus) {
 		this.refundStatus = refundStatus;
@@ -681,7 +686,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_url
 	 * @return  the value of new_order_change.refund_url
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public String getRefundUrl() {
 		return refundUrl;
@@ -690,9 +695,27 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_url
 	 * @param refundUrl  the value for new_order_change.refund_url
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public void setRefundUrl(String refundUrl) {
 		this.refundUrl = refundUrl;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.back_status
+	 * @return  the value of new_order_change.back_status
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
+	 */
+	public Integer getBackStatus() {
+		return backStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.back_status
+	 * @param backStatus  the value for new_order_change.back_status
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
+	 */
+	public void setBackStatus(Integer backStatus) {
+		this.backStatus = backStatus;
+	}
 }

+ 76 - 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 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  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:09 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2073,11 +2073,71 @@ public class NewOrderChangeExample {
 			addCriterion("refund_url not between", value1, value2, "refundUrl");
 			return (Criteria) this;
 		}
+
+		public Criteria andBackStatusIsNull() {
+			addCriterion("back_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusIsNotNull() {
+			addCriterion("back_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusEqualTo(Integer value) {
+			addCriterion("back_status =", value, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusNotEqualTo(Integer value) {
+			addCriterion("back_status <>", value, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusGreaterThan(Integer value) {
+			addCriterion("back_status >", value, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("back_status >=", value, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusLessThan(Integer value) {
+			addCriterion("back_status <", value, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("back_status <=", value, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusIn(List<Integer> values) {
+			addCriterion("back_status in", values, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusNotIn(List<Integer> values) {
+			addCriterion("back_status not in", values, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusBetween(Integer value1, Integer value2) {
+			addCriterion("back_status between", value1, value2, "backStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andBackStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("back_status not between", value1, value2, "backStatus");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 * @mbg.generated  Wed Apr 01 08:39:10 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -17,6 +17,7 @@ public class NewOderCahngeListBo {
 	private String salesmanName;
 	private String depName;
 	private Integer processState;
+	private Integer backStatus;
 	public String getCreateTimes() {
 		return createTimes;
 	}
@@ -113,6 +114,12 @@ public class NewOderCahngeListBo {
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
 	}
+	public Integer getBackStatus() {
+		return backStatus;
+	}
+	public void setBackStatus(Integer backStatus) {
+		this.backStatus = backStatus;
+	}
 	
 	
 }

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

@@ -241,9 +241,9 @@ public class OrderChangeApiController extends CertifyApiController {
 	 *   变更审核
 	 */
 	@RequestMapping(value = "/orderChangeAudit", method = RequestMethod.POST)
-	public Result orderChangeAudit(String orderNo,String remarks,Integer status,Integer processState,Integer rejectState){
+	public Result orderChangeAudit(String changeId,String remarks,Integer status,Integer processState,Integer rejectState){
 		Result res = new Result();
-		if(null==orderNo){
+		if(null==changeId){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "订单编号", "订单编号"));
 			return res;
 		}
@@ -255,7 +255,7 @@ public class OrderChangeApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "审核批示", "审核批示"));
 			return res;
 		}
-		res.setData(orderChangeService.pushOrderChangeAudit( orderNo, remarks, status, processState,rejectState));
+		res.setData(orderChangeService.pushOrderChangeAudit( changeId, remarks, status, processState,rejectState));
 		return res;
 	}
 	/**

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

@@ -26,7 +26,7 @@ public interface OrderChangeService {
 
 	List<NewOrderChangeBo> orderChangeDetails(String orderNo);
 
-	int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState, Integer rejectState);
+	int pushOrderChangeAudit(String changeId, String remarks, Integer status,Integer processState, Integer rejectState);
 
 	boolean checkOderNo(String orderNo);
 

+ 11 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -249,8 +249,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return nb;
 	}
 	@Override
-	public int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState,Integer rejectState) {
-		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNoAndStatus(orderNo);
+	public int pushOrderChangeAudit(String changeId, String remarks, Integer status,Integer processState,Integer rejectState) {
+		NewOrderChangeBo nb=newOrderChangeMapper.selectByChangeId(changeId);
+		String orderNo=nb.getOrderNo();
 		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
 			throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
 		}
@@ -313,9 +314,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if(nb.getStatus()==3) {
 				nb.setStatus(1);//如果驳回数据则改为正常数据
 			}
+			//通过订单取消记录的驳回位置
+			if (processState==nb.getBackStatus()) {
+				nb.setBackStatus(0);
+			}
 		}else {
 			nb.setProcessState(rejectState);
 			nb.setStatus(3);//订单变更设置为驳回
+			//驳回订单记录驳回位置
+			if (processState>nb.getBackStatus()) {
+				nb.setBackStatus(processState);
+			}
 			//驳回位置查看有无审核人,没有则直接跳下一个
 			if (rejectState==2) {
 				if (orderExamineMapper.checkCountStatus(orderNo,0,null)<1) nb.setProcessState(nb.getProcessState()+1);