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

新增咨询师审核信息与财务审核信息

anderx лет назад: 6
Родитель
Сommit
3102c65de0

+ 1 - 1
GeneratorConfig.xml

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

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

@@ -11,68 +11,68 @@ public interface NewOrderChangeMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	long countByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	int deleteByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	int insert(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	int insertSelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	List<NewOrderChange> selectByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	NewOrderChange selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") NewOrderChange record,
 			@Param("example") NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	int updateByExample(@Param("record") NewOrderChange record, @Param("example") NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	int updateByPrimaryKeySelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	int updateByPrimaryKey(NewOrderChange record);
 

+ 206 - 25
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 Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -20,12 +20,23 @@
     <result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
     <result column="applicant" jdbcType="VARCHAR" property="applicant" />
     <result column="dep_name" jdbcType="VARCHAR" property="depName" />
+    <result column="project_state" jdbcType="VARCHAR" property="projectState" />
+    <result column="zxs_cost" jdbcType="DECIMAL" property="zxsCost" />
+    <result column="zxs_remarks" jdbcType="VARCHAR" property="zxsRemarks" />
+    <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime" />
+    <result column="payment_amount" jdbcType="DECIMAL" property="paymentAmount" />
+    <result column="invoice_time" jdbcType="TIMESTAMP" property="invoiceTime" />
+    <result column="invoice_amount" jdbcType="DECIMAL" property="invoiceAmount" />
+    <result column="invoice_type" jdbcType="VARCHAR" property="invoiceType" />
+    <result column="cw_cost" jdbcType="DECIMAL" property="cwCost" />
+    <result column="refundable_amount" jdbcType="DECIMAL" property="refundableAmount" />
+    <result column="cw_remarks" jdbcType="VARCHAR" property="cwRemarks" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +70,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,16 +104,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     id, order_no, process_state, status, type, create_time, remarks, voucher_url, total_amount, 
-    settlement_amount, change_amount, applicant, dep_name
+    settlement_amount, change_amount, applicant, dep_name, project_state, zxs_cost, zxs_remarks, 
+    payment_time, payment_amount, invoice_time, invoice_amount, invoice_type, cw_cost, 
+    refundable_amount, cw_remarks
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     select
     <if test="distinct">
@@ -121,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -132,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     delete from new_order_change
     where id = #{id,jdbcType=INTEGER}
@@ -141,7 +154,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     delete from new_order_change
     <if test="_parameter != null">
@@ -152,24 +165,32 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     insert into new_order_change (id, order_no, process_state, 
       status, type, create_time, 
       remarks, voucher_url, total_amount, 
       settlement_amount, change_amount, applicant, 
-      dep_name)
+      dep_name, project_state, zxs_cost, 
+      zxs_remarks, payment_time, payment_amount, 
+      invoice_time, invoice_amount, invoice_type, 
+      cw_cost, refundable_amount, cw_remarks
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{processState,jdbcType=INTEGER}, 
       #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{remarks,jdbcType=VARCHAR}, #{voucherUrl,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
       #{settlementAmount,jdbcType=DECIMAL}, #{changeAmount,jdbcType=DECIMAL}, #{applicant,jdbcType=VARCHAR}, 
-      #{depName,jdbcType=VARCHAR})
+      #{depName,jdbcType=VARCHAR}, #{projectState,jdbcType=VARCHAR}, #{zxsCost,jdbcType=DECIMAL}, 
+      #{zxsRemarks,jdbcType=VARCHAR}, #{paymentTime,jdbcType=TIMESTAMP}, #{paymentAmount,jdbcType=DECIMAL}, 
+      #{invoiceTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL}, #{invoiceType,jdbcType=VARCHAR}, 
+      #{cwCost,jdbcType=DECIMAL}, #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderChange">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     insert into new_order_change
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -212,6 +233,39 @@
       <if test="depName != null">
         dep_name,
       </if>
+      <if test="projectState != null">
+        project_state,
+      </if>
+      <if test="zxsCost != null">
+        zxs_cost,
+      </if>
+      <if test="zxsRemarks != null">
+        zxs_remarks,
+      </if>
+      <if test="paymentTime != null">
+        payment_time,
+      </if>
+      <if test="paymentAmount != null">
+        payment_amount,
+      </if>
+      <if test="invoiceTime != null">
+        invoice_time,
+      </if>
+      <if test="invoiceAmount != null">
+        invoice_amount,
+      </if>
+      <if test="invoiceType != null">
+        invoice_type,
+      </if>
+      <if test="cwCost != null">
+        cw_cost,
+      </if>
+      <if test="refundableAmount != null">
+        refundable_amount,
+      </if>
+      <if test="cwRemarks != null">
+        cw_remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -253,13 +307,46 @@
       <if test="depName != null">
         #{depName,jdbcType=VARCHAR},
       </if>
+      <if test="projectState != null">
+        #{projectState,jdbcType=VARCHAR},
+      </if>
+      <if test="zxsCost != null">
+        #{zxsCost,jdbcType=DECIMAL},
+      </if>
+      <if test="zxsRemarks != null">
+        #{zxsRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTime != null">
+        #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentAmount != null">
+        #{paymentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="invoiceTime != null">
+        #{invoiceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="invoiceAmount != null">
+        #{invoiceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="invoiceType != null">
+        #{invoiceType,jdbcType=VARCHAR},
+      </if>
+      <if test="cwCost != null">
+        #{cwCost,jdbcType=DECIMAL},
+      </if>
+      <if test="refundableAmount != null">
+        #{refundableAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="cwRemarks != null">
+        #{cwRemarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     select count(*) from new_order_change
     <if test="_parameter != null">
@@ -270,7 +357,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     update new_order_change
     <set>
@@ -313,6 +400,39 @@
       <if test="record.depName != null">
         dep_name = #{record.depName,jdbcType=VARCHAR},
       </if>
+      <if test="record.projectState != null">
+        project_state = #{record.projectState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zxsCost != null">
+        zxs_cost = #{record.zxsCost,jdbcType=DECIMAL},
+      </if>
+      <if test="record.zxsRemarks != null">
+        zxs_remarks = #{record.zxsRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.paymentTime != null">
+        payment_time = #{record.paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.paymentAmount != null">
+        payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.invoiceTime != null">
+        invoice_time = #{record.invoiceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.invoiceAmount != null">
+        invoice_amount = #{record.invoiceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.invoiceType != null">
+        invoice_type = #{record.invoiceType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cwCost != null">
+        cw_cost = #{record.cwCost,jdbcType=DECIMAL},
+      </if>
+      <if test="record.refundableAmount != null">
+        refundable_amount = #{record.refundableAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.cwRemarks != null">
+        cw_remarks = #{record.cwRemarks,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -322,7 +442,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     update new_order_change
     set id = #{record.id,jdbcType=INTEGER},
@@ -337,7 +457,18 @@
       settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
       change_amount = #{record.changeAmount,jdbcType=DECIMAL},
       applicant = #{record.applicant,jdbcType=VARCHAR},
-      dep_name = #{record.depName,jdbcType=VARCHAR}
+      dep_name = #{record.depName,jdbcType=VARCHAR},
+      project_state = #{record.projectState,jdbcType=VARCHAR},
+      zxs_cost = #{record.zxsCost,jdbcType=DECIMAL},
+      zxs_remarks = #{record.zxsRemarks,jdbcType=VARCHAR},
+      payment_time = #{record.paymentTime,jdbcType=TIMESTAMP},
+      payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
+      invoice_time = #{record.invoiceTime,jdbcType=TIMESTAMP},
+      invoice_amount = #{record.invoiceAmount,jdbcType=DECIMAL},
+      invoice_type = #{record.invoiceType,jdbcType=VARCHAR},
+      cw_cost = #{record.cwCost,jdbcType=DECIMAL},
+      refundable_amount = #{record.refundableAmount,jdbcType=DECIMAL},
+      cw_remarks = #{record.cwRemarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -346,7 +477,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     update new_order_change
     <set>
@@ -386,6 +517,39 @@
       <if test="depName != null">
         dep_name = #{depName,jdbcType=VARCHAR},
       </if>
+      <if test="projectState != null">
+        project_state = #{projectState,jdbcType=VARCHAR},
+      </if>
+      <if test="zxsCost != null">
+        zxs_cost = #{zxsCost,jdbcType=DECIMAL},
+      </if>
+      <if test="zxsRemarks != null">
+        zxs_remarks = #{zxsRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTime != null">
+        payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentAmount != null">
+        payment_amount = #{paymentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="invoiceTime != null">
+        invoice_time = #{invoiceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="invoiceAmount != null">
+        invoice_amount = #{invoiceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="invoiceType != null">
+        invoice_type = #{invoiceType,jdbcType=VARCHAR},
+      </if>
+      <if test="cwCost != null">
+        cw_cost = #{cwCost,jdbcType=DECIMAL},
+      </if>
+      <if test="refundableAmount != null">
+        refundable_amount = #{refundableAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="cwRemarks != null">
+        cw_remarks = #{cwRemarks,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -393,7 +557,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Aug 16 10:18:23 CST 2019.
+      This element was generated on Thu Aug 22 09:48:19 CST 2019.
     -->
     update new_order_change
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -407,14 +571,28 @@
       settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
       change_amount = #{changeAmount,jdbcType=DECIMAL},
       applicant = #{applicant,jdbcType=VARCHAR},
-      dep_name = #{depName,jdbcType=VARCHAR}
+      dep_name = #{depName,jdbcType=VARCHAR},
+      project_state = #{projectState,jdbcType=VARCHAR},
+      zxs_cost = #{zxsCost,jdbcType=DECIMAL},
+      zxs_remarks = #{zxsRemarks,jdbcType=VARCHAR},
+      payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      payment_amount = #{paymentAmount,jdbcType=DECIMAL},
+      invoice_time = #{invoiceTime,jdbcType=TIMESTAMP},
+      invoice_amount = #{invoiceAmount,jdbcType=DECIMAL},
+      invoice_type = #{invoiceType,jdbcType=VARCHAR},
+      cw_cost = #{cwCost,jdbcType=DECIMAL},
+      refundable_amount = #{refundableAmount,jdbcType=DECIMAL},
+      cw_remarks = #{cwRemarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">
-  select a.id,a.order_no orderNo,a.process_state processState,a.status,a.`type`,date_format(a.create_time,'%Y-%m-%d %H:%I:%S')createTimes,
-	a.remarks,a.voucher_url voucherUrl,a.total_amount totalAmount,a.settlement_amount settlementAmount,a.change_amount changeAmount,a.applicant,a.dep_name depName
-	from new_order_change a  where 1=1
-	and order_no= #{orderNo}
+  select a.id,a.order_no orderNo,a.process_state processState,a.status,a.`type`,date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes, a.remarks,
+a.voucher_url voucherUrl,a.total_amount totalAmount,a.settlement_amount settlementAmount,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_cost cwCost,a.refundable_amount refundableAmount,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>
@@ -520,9 +698,12 @@
 	<if test="complete ==0">
 	 and a.process_state &gt;= #{processState}
 	</if>
-	<if test="complete ==1">
+	<if test="complete ==1 and processState != 5">
 	 and a.process_state = #{processState}
 	</if>
+	<if test="complete ==1 and processState == 5">
+	 and a.process_state in(#{processState},9)  and a.status !=4
+	</if>
 	<if test="complete ==2">
 	 and a.process_state &gt; #{processState}
 	</if>

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

@@ -1202,7 +1202,7 @@
 where super_id is null )  e on e.order_no=a.order_no
   	left join admin f on e.task_receiver=f.id
   	</if>
-  	where a.delete_sign = 0
+  	where a.delete_sign != 1
   	<if test="outsource != null">
   	and a.outsource= #{outsource,jdbcType=INTEGER}
   	</if>

+ 292 - 39
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -7,74 +7,129 @@ public class NewOrderChange {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.id
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.order_no
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.process_state
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private Integer processState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.status
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.type
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.create_time
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.remarks
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.voucher_url
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private String voucherUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.total_amount
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.settlement_amount
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private BigDecimal settlementAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.change_amount
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private BigDecimal changeAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.applicant
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private String applicant;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.dep_name
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	private String depName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.project_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String projectState;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal zxsCost;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String zxsRemarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Date paymentTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal paymentAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private Date invoiceTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal invoiceAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String invoiceType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal cwCost;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refundable_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private BigDecimal refundableAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	private String cwRemarks;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.id
 	 * @return  the value of new_order_change.id
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -83,7 +138,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -92,7 +147,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -101,7 +156,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -110,7 +165,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public Integer getProcessState() {
 		return processState;
@@ -119,7 +174,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setProcessState(Integer processState) {
 		this.processState = processState;
@@ -128,7 +183,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -137,7 +192,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -146,7 +201,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public Integer getType() {
 		return type;
@@ -155,7 +210,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -164,7 +219,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -173,7 +228,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -182,7 +237,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -191,7 +246,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -200,7 +255,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public String getVoucherUrl() {
 		return voucherUrl;
@@ -209,7 +264,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setVoucherUrl(String voucherUrl) {
 		this.voucherUrl = voucherUrl;
@@ -218,7 +273,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -227,7 +282,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -236,7 +291,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -245,7 +300,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -254,7 +309,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public BigDecimal getChangeAmount() {
 		return changeAmount;
@@ -263,7 +318,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setChangeAmount(BigDecimal changeAmount) {
 		this.changeAmount = changeAmount;
@@ -272,7 +327,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -281,7 +336,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant;
@@ -290,7 +345,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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public String getDepName() {
 		return depName;
@@ -299,9 +354,207 @@ 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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public void setDepName(String depName) {
 		this.depName = depName;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.project_state
+	 * @return  the value of new_order_change.project_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getProjectState() {
+		return projectState;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.project_state
+	 * @param projectState  the value for new_order_change.project_state
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setProjectState(String projectState) {
+		this.projectState = projectState;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.zxs_cost
+	 * @return  the value of new_order_change.zxs_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getZxsCost() {
+		return zxsCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.zxs_cost
+	 * @param zxsCost  the value for new_order_change.zxs_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setZxsCost(BigDecimal zxsCost) {
+		this.zxsCost = zxsCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.zxs_remarks
+	 * @return  the value of new_order_change.zxs_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getZxsRemarks() {
+		return zxsRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.zxs_remarks
+	 * @param zxsRemarks  the value for new_order_change.zxs_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setZxsRemarks(String zxsRemarks) {
+		this.zxsRemarks = zxsRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.payment_time
+	 * @return  the value of new_order_change.payment_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Date getPaymentTime() {
+		return paymentTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.payment_time
+	 * @param paymentTime  the value for new_order_change.payment_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setPaymentTime(Date paymentTime) {
+		this.paymentTime = paymentTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.payment_amount
+	 * @return  the value of new_order_change.payment_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getPaymentAmount() {
+		return paymentAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.payment_amount
+	 * @param paymentAmount  the value for new_order_change.payment_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setPaymentAmount(BigDecimal paymentAmount) {
+		this.paymentAmount = paymentAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_time
+	 * @return  the value of new_order_change.invoice_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public Date getInvoiceTime() {
+		return invoiceTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_time
+	 * @param invoiceTime  the value for new_order_change.invoice_time
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setInvoiceTime(Date invoiceTime) {
+		this.invoiceTime = invoiceTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_amount
+	 * @return  the value of new_order_change.invoice_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getInvoiceAmount() {
+		return invoiceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_amount
+	 * @param invoiceAmount  the value for new_order_change.invoice_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
+		this.invoiceAmount = invoiceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_type
+	 * @return  the value of new_order_change.invoice_type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getInvoiceType() {
+		return invoiceType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_type
+	 * @param invoiceType  the value for new_order_change.invoice_type
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setInvoiceType(String invoiceType) {
+		this.invoiceType = invoiceType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.cw_cost
+	 * @return  the value of new_order_change.cw_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getCwCost() {
+		return cwCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.cw_cost
+	 * @param cwCost  the value for new_order_change.cw_cost
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setCwCost(BigDecimal cwCost) {
+		this.cwCost = cwCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refundable_amount
+	 * @return  the value of new_order_change.refundable_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public BigDecimal getRefundableAmount() {
+		return refundableAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refundable_amount
+	 * @param refundableAmount  the value for new_order_change.refundable_amount
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setRefundableAmount(BigDecimal refundableAmount) {
+		this.refundableAmount = refundableAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.cw_remarks
+	 * @return  the value of new_order_change.cw_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public String getCwRemarks() {
+		return cwRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.cw_remarks
+	 * @param cwRemarks  the value for new_order_change.cw_remarks
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 */
+	public void setCwRemarks(String cwRemarks) {
+		this.cwRemarks = cwRemarks;
+	}
 }

+ 716 - 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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	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  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -993,11 +993,711 @@ public class NewOrderChangeExample {
 			addCriterion("dep_name not between", value1, value2, "depName");
 			return (Criteria) this;
 		}
+
+		public Criteria andProjectStateIsNull() {
+			addCriterion("project_state is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateIsNotNull() {
+			addCriterion("project_state is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateEqualTo(String value) {
+			addCriterion("project_state =", value, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateNotEqualTo(String value) {
+			addCriterion("project_state <>", value, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateGreaterThan(String value) {
+			addCriterion("project_state >", value, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateGreaterThanOrEqualTo(String value) {
+			addCriterion("project_state >=", value, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateLessThan(String value) {
+			addCriterion("project_state <", value, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateLessThanOrEqualTo(String value) {
+			addCriterion("project_state <=", value, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateLike(String value) {
+			addCriterion("project_state like", value, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateNotLike(String value) {
+			addCriterion("project_state not like", value, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateIn(List<String> values) {
+			addCriterion("project_state in", values, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateNotIn(List<String> values) {
+			addCriterion("project_state not in", values, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateBetween(String value1, String value2) {
+			addCriterion("project_state between", value1, value2, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectStateNotBetween(String value1, String value2) {
+			addCriterion("project_state not between", value1, value2, "projectState");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostIsNull() {
+			addCriterion("zxs_cost is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostIsNotNull() {
+			addCriterion("zxs_cost is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostEqualTo(BigDecimal value) {
+			addCriterion("zxs_cost =", value, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostNotEqualTo(BigDecimal value) {
+			addCriterion("zxs_cost <>", value, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostGreaterThan(BigDecimal value) {
+			addCriterion("zxs_cost >", value, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("zxs_cost >=", value, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostLessThan(BigDecimal value) {
+			addCriterion("zxs_cost <", value, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("zxs_cost <=", value, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostIn(List<BigDecimal> values) {
+			addCriterion("zxs_cost in", values, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostNotIn(List<BigDecimal> values) {
+			addCriterion("zxs_cost not in", values, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("zxs_cost between", value1, value2, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsCostNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("zxs_cost not between", value1, value2, "zxsCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksIsNull() {
+			addCriterion("zxs_remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksIsNotNull() {
+			addCriterion("zxs_remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksEqualTo(String value) {
+			addCriterion("zxs_remarks =", value, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksNotEqualTo(String value) {
+			addCriterion("zxs_remarks <>", value, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksGreaterThan(String value) {
+			addCriterion("zxs_remarks >", value, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("zxs_remarks >=", value, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksLessThan(String value) {
+			addCriterion("zxs_remarks <", value, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksLessThanOrEqualTo(String value) {
+			addCriterion("zxs_remarks <=", value, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksLike(String value) {
+			addCriterion("zxs_remarks like", value, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksNotLike(String value) {
+			addCriterion("zxs_remarks not like", value, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksIn(List<String> values) {
+			addCriterion("zxs_remarks in", values, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksNotIn(List<String> values) {
+			addCriterion("zxs_remarks not in", values, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksBetween(String value1, String value2) {
+			addCriterion("zxs_remarks between", value1, value2, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andZxsRemarksNotBetween(String value1, String value2) {
+			addCriterion("zxs_remarks not between", value1, value2, "zxsRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeIsNull() {
+			addCriterion("payment_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeIsNotNull() {
+			addCriterion("payment_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeEqualTo(Date value) {
+			addCriterion("payment_time =", value, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeNotEqualTo(Date value) {
+			addCriterion("payment_time <>", value, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeGreaterThan(Date value) {
+			addCriterion("payment_time >", value, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("payment_time >=", value, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeLessThan(Date value) {
+			addCriterion("payment_time <", value, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeLessThanOrEqualTo(Date value) {
+			addCriterion("payment_time <=", value, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeIn(List<Date> values) {
+			addCriterion("payment_time in", values, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeNotIn(List<Date> values) {
+			addCriterion("payment_time not in", values, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeBetween(Date value1, Date value2) {
+			addCriterion("payment_time between", value1, value2, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentTimeNotBetween(Date value1, Date value2) {
+			addCriterion("payment_time not between", value1, value2, "paymentTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountIsNull() {
+			addCriterion("payment_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountIsNotNull() {
+			addCriterion("payment_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountEqualTo(BigDecimal value) {
+			addCriterion("payment_amount =", value, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountNotEqualTo(BigDecimal value) {
+			addCriterion("payment_amount <>", value, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountGreaterThan(BigDecimal value) {
+			addCriterion("payment_amount >", value, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("payment_amount >=", value, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountLessThan(BigDecimal value) {
+			addCriterion("payment_amount <", value, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("payment_amount <=", value, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountIn(List<BigDecimal> values) {
+			addCriterion("payment_amount in", values, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountNotIn(List<BigDecimal> values) {
+			addCriterion("payment_amount not in", values, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("payment_amount between", value1, value2, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("payment_amount not between", value1, value2, "paymentAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeIsNull() {
+			addCriterion("invoice_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeIsNotNull() {
+			addCriterion("invoice_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeEqualTo(Date value) {
+			addCriterion("invoice_time =", value, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeNotEqualTo(Date value) {
+			addCriterion("invoice_time <>", value, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeGreaterThan(Date value) {
+			addCriterion("invoice_time >", value, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("invoice_time >=", value, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeLessThan(Date value) {
+			addCriterion("invoice_time <", value, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeLessThanOrEqualTo(Date value) {
+			addCriterion("invoice_time <=", value, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeIn(List<Date> values) {
+			addCriterion("invoice_time in", values, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeNotIn(List<Date> values) {
+			addCriterion("invoice_time not in", values, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeBetween(Date value1, Date value2) {
+			addCriterion("invoice_time between", value1, value2, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTimeNotBetween(Date value1, Date value2) {
+			addCriterion("invoice_time not between", value1, value2, "invoiceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountIsNull() {
+			addCriterion("invoice_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountIsNotNull() {
+			addCriterion("invoice_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountEqualTo(BigDecimal value) {
+			addCriterion("invoice_amount =", value, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountNotEqualTo(BigDecimal value) {
+			addCriterion("invoice_amount <>", value, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountGreaterThan(BigDecimal value) {
+			addCriterion("invoice_amount >", value, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("invoice_amount >=", value, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountLessThan(BigDecimal value) {
+			addCriterion("invoice_amount <", value, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("invoice_amount <=", value, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountIn(List<BigDecimal> values) {
+			addCriterion("invoice_amount in", values, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountNotIn(List<BigDecimal> values) {
+			addCriterion("invoice_amount not in", values, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("invoice_amount between", value1, value2, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("invoice_amount not between", value1, value2, "invoiceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeIsNull() {
+			addCriterion("invoice_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeIsNotNull() {
+			addCriterion("invoice_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeEqualTo(String value) {
+			addCriterion("invoice_type =", value, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeNotEqualTo(String value) {
+			addCriterion("invoice_type <>", value, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeGreaterThan(String value) {
+			addCriterion("invoice_type >", value, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeGreaterThanOrEqualTo(String value) {
+			addCriterion("invoice_type >=", value, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeLessThan(String value) {
+			addCriterion("invoice_type <", value, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeLessThanOrEqualTo(String value) {
+			addCriterion("invoice_type <=", value, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeLike(String value) {
+			addCriterion("invoice_type like", value, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeNotLike(String value) {
+			addCriterion("invoice_type not like", value, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeIn(List<String> values) {
+			addCriterion("invoice_type in", values, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeNotIn(List<String> values) {
+			addCriterion("invoice_type not in", values, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeBetween(String value1, String value2) {
+			addCriterion("invoice_type between", value1, value2, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andInvoiceTypeNotBetween(String value1, String value2) {
+			addCriterion("invoice_type not between", value1, value2, "invoiceType");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostIsNull() {
+			addCriterion("cw_cost is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostIsNotNull() {
+			addCriterion("cw_cost is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostEqualTo(BigDecimal value) {
+			addCriterion("cw_cost =", value, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostNotEqualTo(BigDecimal value) {
+			addCriterion("cw_cost <>", value, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostGreaterThan(BigDecimal value) {
+			addCriterion("cw_cost >", value, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("cw_cost >=", value, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostLessThan(BigDecimal value) {
+			addCriterion("cw_cost <", value, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("cw_cost <=", value, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostIn(List<BigDecimal> values) {
+			addCriterion("cw_cost in", values, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostNotIn(List<BigDecimal> values) {
+			addCriterion("cw_cost not in", values, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("cw_cost between", value1, value2, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwCostNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("cw_cost not between", value1, value2, "cwCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountIsNull() {
+			addCriterion("refundable_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountIsNotNull() {
+			addCriterion("refundable_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountEqualTo(BigDecimal value) {
+			addCriterion("refundable_amount =", value, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountNotEqualTo(BigDecimal value) {
+			addCriterion("refundable_amount <>", value, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountGreaterThan(BigDecimal value) {
+			addCriterion("refundable_amount >", value, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("refundable_amount >=", value, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountLessThan(BigDecimal value) {
+			addCriterion("refundable_amount <", value, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("refundable_amount <=", value, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountIn(List<BigDecimal> values) {
+			addCriterion("refundable_amount in", values, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountNotIn(List<BigDecimal> values) {
+			addCriterion("refundable_amount not in", values, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("refundable_amount between", value1, value2, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundableAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("refundable_amount not between", value1, value2, "refundableAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksIsNull() {
+			addCriterion("cw_remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksIsNotNull() {
+			addCriterion("cw_remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksEqualTo(String value) {
+			addCriterion("cw_remarks =", value, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksNotEqualTo(String value) {
+			addCriterion("cw_remarks <>", value, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksGreaterThan(String value) {
+			addCriterion("cw_remarks >", value, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("cw_remarks >=", value, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksLessThan(String value) {
+			addCriterion("cw_remarks <", value, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksLessThanOrEqualTo(String value) {
+			addCriterion("cw_remarks <=", value, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksLike(String value) {
+			addCriterion("cw_remarks like", value, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksNotLike(String value) {
+			addCriterion("cw_remarks not like", value, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksIn(List<String> values) {
+			addCriterion("cw_remarks in", values, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksNotIn(List<String> values) {
+			addCriterion("cw_remarks not in", values, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksBetween(String value1, String value2) {
+			addCriterion("cw_remarks between", value1, value2, "cwRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andCwRemarksNotBetween(String value1, String value2) {
+			addCriterion("cw_remarks not between", value1, value2, "cwRemarks");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Fri Aug 16 10:18:23 CST 2019
+	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

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

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

+ 31 - 1
src/main/java/com/goafanti/order/bo/NewOrderChangeBo.java

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

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

@@ -14,7 +14,6 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.order.bo.NewOrderChangeBo;
-import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
 @RestController
@@ -56,6 +55,23 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 	/**
+	 * 变更修改
+	 */
+	@RequestMapping(value = "/updateOrderChange", method = RequestMethod.POST)
+	public Result orderChangeDetails(NewOrderChangeBo t ,Integer changeType){
+		Result res = new Result();
+		if(null==t.getId()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单变更id"));
+			return res;
+		}
+		if (changeType==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "修改变更类型"));
+			return res;
+		}
+		res.setData(orderChangeService.updateOrderChange(t,changeType));
+		return res;
+	}
+	/**
 	 *   变更审核
 	 */
 	@RequestMapping(value = "/orderChangeAudit", method = RequestMethod.POST)

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

@@ -21,5 +21,8 @@ public interface OrderChangeService {
 	Pagination<NewOrderChangeBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
 			String depId,String salesmanName,Integer complete,Integer pageSize, Integer pageNo);
 
+	int updateOrderChange(NewOrderChangeBo t, Integer changeType);
+
+
 
 }

+ 11 - 0
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.EmailBo;
+import com.goafanti.common.bo.Error;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.TOrderBackMapper;
@@ -100,6 +101,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if(approval != ApprovalNewState.TG.getCode() && approval != ApprovalNewState.FTP.getCode()){//特批未通过 2 0
 			return -1;
 		}
+		checkDeleteSign(orderNo);
 		TOrderNew onew = new TOrderNew();
 		TOrderNew torder=tOrderNewMapper.selectByPrimaryKey(orderNo);
 		onew.setOrderNo(orderNo);
@@ -127,6 +129,12 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		return r;
 	}
 	
+	private TOrderNew checkDeleteSign(String orderNo) {
+		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		if(t.getDeleteSign()==3)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
+		return t;
+	}
+
 	public void addOrderLog(String orderNo, Integer code) {
 		TOrderLog tl=new TOrderLog();
 		tl.setOrderNo(orderNo);
@@ -150,6 +158,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public Integer updateReject(TOrderBack back) {
 		// 是否已经收款
+		checkDeleteSign(back.getOrderNo());
 		BigDecimal bd = billNewMapper.getAmountByOid(back.getOrderNo());
 		if(bd.compareTo(new BigDecimal(0.0)) == 1){
 			return 0;//已经收款不能驳回
@@ -395,6 +404,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public Integer addRefundFlow(TOrderBillNew billNew) {
 		// 查看收款总金额流水
+		
 		BigDecimal bd = billNewMapper.getAmountByOid(billNew.getOrderNo());
 		billNew.setTransactionAmount(billNew.getTransactionAmount().abs());//绝对值
 		int lstaus = 3;
@@ -491,6 +501,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public int updateFinanceApproval(String orderNo) {
 		TOrderNew t=new TOrderNew();
+		checkDeleteSign(orderNo);
 		t.setOrderNo(orderNo);
 		t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);

+ 38 - 3
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.order.service.impl;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -10,23 +11,24 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.Error;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.NewOrderChangeMapper;
 import com.goafanti.common.dao.OrderChangeLogMapper;
 import com.goafanti.common.dao.TOrderDunMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.OrderChangeLog;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.NewOrderChange;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.NewOrderChangeBo;
-import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.service.OrderChangeService;
@@ -166,13 +168,46 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (null!=timeType) parameter.put("timeType", timeType);
 		if (StringUtils.isNotBlank(startTime)) parameter.put("startTime", startTime);
 		if (StringUtils.isNotBlank(endTime)) parameter.put("endTime", endTime+" 23:59:59");
-		if (StringUtils.isNotBlank(depId)) parameter.put("depid", depId);
+		if (StringUtils.isNotBlank(depId)) parameter.put("depId", depId);
 		if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
 		parameter.put("aid", TokenManager.getAdminId());
 		parameter.put("deps", orderService.selectMyDeps());
 		Pagination<NewOrderChangeBo> data = (Pagination<NewOrderChangeBo>)findPage("selectOrderChangeList", "selectOrderChangeCount", parameter, pageNo, pageSize);
 		return data;
 	}
+	@Override
+	public int updateOrderChange(NewOrderChangeBo t,Integer changeType) {
+		NewOrderChange  noc=new NewOrderChange();
+		noc.setId(t.getId());
+		if (changeType==0) {
+			noc.setRemarks(t.getRemarks());
+			noc.setType(t.getType());
+			noc.setVoucherUrl(t.getVoucherUrl());
+			noc.setTotalAmount(t.getTotalAmount());
+			noc.setSettlementAmount(t.getSettlementAmount());
+			noc.setChangeAmount(t.getChangeAmount());
+			noc.setApplicant(t.getApplicant());
+			noc.setDepName(t.getDepName());
+		}else if(changeType==1) {
+			noc.setProjectState(t.getProjectState());
+			noc.setZxsCost(t.getZxsCost());
+			noc.setZxsRemarks(t.getZxsRemarks());
+		}else if (changeType==2) {
+			try {
+				noc.setPaymentTime(DateUtils.StringToDate(t.getPaymentTimes(), AFTConstants.YYYYMMDD));
+				noc.setInvoiceTime(DateUtils.StringToDate(t.getInvoiceTimes(), AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			noc.setPaymentAmount(t.getPaymentAmount());
+			noc.setInvoiceAmount(t.getInvoiceAmount());
+			noc.setInvoiceType(t.getInvoiceType());
+			noc.setCwCost(t.getCwCost());
+			noc.setRefundableAmount(t.getRefundableAmount());
+			noc.setCwRemarks(t.getCwRemarks());
+		}
+		return newOrderChangeMapper.updateByPrimaryKeySelective(noc);
+	}
 	
 
 }

+ 17 - 6
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -208,8 +208,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateServiceOrder(TOrderNew t, Integer isSubmit) {
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
-		if(t2.getDeleteSign()==3)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
+		TOrderNew t2=checkDeleteSign(t.getOrderNo());
 		//判断手机号码是否存在
 		if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&
 				organizationContactBookMapper.checkContacts(t2.getBuyerId(), t2.getContactMobile(),TokenManager.getAdminId()==null?"1":TokenManager.getAdminId() )>0) {
@@ -420,7 +419,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int updateOrderNew(String orderNo, Integer orderStatus,String reason,Integer outsource, TOrderOutsource o) {
 		TOrderNew t= new TOrderNew();
-		TOrderNew t2= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t2= checkDeleteSign(orderNo);
+		if(t2.getDeleteSign()!=0)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
 		t.setOrderNo(orderNo);
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
 			if (t2.getApproval()==ApprovalNewState.FTP.getCode()||t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
@@ -528,7 +528,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int addOrderRefund(TOrderRefundWithBLOBs t) {
-		TOrderNew order =tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew order =checkDeleteSign(t.getOrderNo());
+		if(order.getDeleteSign()!=0)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
 		t.setRefundStatus(refundState.DSH.getCode());
 		t.setCreateTime(new Date());
 		t.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
@@ -548,7 +549,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int updateApprovalOrder(String orderNo,Integer confirm,String reason) {
 		TOrderNew t=new TOrderNew();
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t2=checkDeleteSign(orderNo);
 		t.setOrderNo(orderNo);
 		if (confirm==2) {
 			t.setApproval(2);
@@ -731,6 +732,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateOrderRefund(TOrderRefundWithBLOBs t) {
+		checkDeleteSign(t.getOrderNo());
 		return tOrderRefundMapper.updateByPrimaryKeySelective(t);
 	}
 
@@ -738,7 +740,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updatetechnicianBackOrder(String orderNo,String reason) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t = checkDeleteSign(orderNo);
 		if (t.getSettlementAmount().compareTo(new BigDecimal(0))!=0||
 				t.getProcessStatus()>ProcessStatus.YPZXSGLY.getCode()) {
 			return -1;
@@ -749,6 +751,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		addBackOrder(orderNo, reason);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
+
+
+
+	private TOrderNew checkDeleteSign(String orderNo) {
+		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		if(t.getDeleteSign()==3)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
+		return t;
+	}
 	
 	@Override
 	public List<OrderDunTaskBo> selectAllOrderDun() {
@@ -812,6 +822,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateFinance(String orderNo, String newFinance) {
+		checkDeleteSign(orderNo);
 		String aid=TokenManager.getAdminId();
 		return tOrderNewMapper.updateFinance(aid,orderNo,newFinance);