Browse Source

订单审核负责人开发

anderx 3 years ago
parent
commit
d57be3becf

+ 12 - 67
src/main/java/com/goafanti/common/dao/TOrderInvoiceMapper.java

@@ -11,82 +11,27 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TOrderInvoiceMapper {
+    int deleteByPrimaryKey(Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	long countByExample(TOrderInvoiceExample example);
+    int insert(TOrderInvoice record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	int deleteByExample(TOrderInvoiceExample example);
+    int insertSelective(TOrderInvoice record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	int deleteByPrimaryKey(Integer id);
+    TOrderInvoice selectByPrimaryKey(Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	int insert(TOrderInvoice record);
+    int updateByPrimaryKeySelective(TOrderInvoice record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	int insertSelective(TOrderInvoice record);
+    int updateByPrimaryKey(TOrderInvoice record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	List<TOrderInvoice> selectByExample(TOrderInvoiceExample example);
+    String checkApplyAmount(@Param("orderNo")String orderNo,@Param("id")Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	TOrderInvoice selectByPrimaryKey(Integer id);
+    TOrderInvoiceDetails selectByInvoiceDitails(Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	int updateByExampleSelective(@Param("record") TOrderInvoice record, @Param("example") TOrderInvoiceExample example);
+    BigDecimal conutAmountByOrderNo(String orderNo);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	int updateByExample(@Param("record") TOrderInvoice record, @Param("example") TOrderInvoiceExample example);
+    List<InvoiceBo> selectByOrderNo(String orderNo);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	int updateByPrimaryKeySelective(TOrderInvoice record);
+    TOrderInvoiceDetails getInvoiceDetails(String orderNo);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_invoice
-	 * @mbg.generated  Fri May 17 09:46:50 CST 2019
-	 */
-	int updateByPrimaryKey(TOrderInvoice record);
-
-	String checkApplyAmount(@Param("orderNo")String orderNo,@Param("id")Integer id);
-
-	TOrderInvoiceDetails selectByInvoiceDitails(Integer id);
-
-	 BigDecimal conutAmountByOrderNo(String orderNo);
-
-	List<InvoiceBo> selectByOrderNo(String orderNo);
-
-	TOrderInvoiceDetails getInvoiceDetails(String orderNo);
-
-	List<OutInvoiceLog>  selectInvoiceLog(Integer id);
+    List<OutInvoiceLog>  selectInvoiceLog(Integer id);
 }

+ 42 - 317
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.TOrderInvoiceMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderInvoice">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="type" jdbcType="INTEGER" property="type" />
@@ -34,182 +29,57 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="approval" jdbcType="INTEGER" property="approval" />
     <result column="already_amount" jdbcType="DECIMAL" property="alreadyAmount" />
+    <result column="examine_name" jdbcType="VARCHAR" property="examineName" />
   </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 May 17 09:46:50 CST 2019.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
-    id, order_no, type, status, reject_reason, remarks, invoice_type, unit_name, tax_number,
-    amount, banks, content, unit_address, invoice_remarks, unit_mobile, voucher_url,
+    id, order_no, `type`, `status`, reject_reason, remarks, invoice_type, unit_name,
+    tax_number, amount, banks, content, unit_address, invoice_remarks, unit_mobile, voucher_url,
     post, addressee, addressee_mobile, addressee_province, addressee_city, addressee_area,
-    recipient_address, create_time, update_time, approval, already_amount
+    recipient_address, create_time, update_time, approval, already_amount, examine_name
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderInvoiceExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_order_invoice
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
     select
     <include refid="Base_Column_List" />
     from t_order_invoice
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
     delete from t_order_invoice
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderInvoiceExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
-    delete from t_order_invoice
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TOrderInvoice">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
-    insert into t_order_invoice (id, order_no, type,
-      status, reject_reason, remarks,
-      invoice_type, unit_name, tax_number,
-      amount, banks, content,
-      unit_address, invoice_remarks, unit_mobile,
-      voucher_url, post, addressee,
-      addressee_mobile, addressee_province, addressee_city,
-      addressee_area, recipient_address, create_time,
-      update_time, approval, already_amount
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderInvoice" useGeneratedKeys="true">
+    insert into t_order_invoice (order_no, `type`, `status`,
+      reject_reason, remarks, invoice_type,
+      unit_name, tax_number, amount,
+      banks, content, unit_address,
+      invoice_remarks, unit_mobile, voucher_url,
+      post, addressee, addressee_mobile,
+      addressee_province, addressee_city, addressee_area,
+      recipient_address, create_time, update_time,
+      approval, already_amount, examine_name
       )
-    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER},
-      #{status,jdbcType=INTEGER}, #{rejectReason,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR},
-      #{invoiceType,jdbcType=INTEGER}, #{unitName,jdbcType=VARCHAR}, #{taxNumber,jdbcType=VARCHAR},
-      #{amount,jdbcType=DECIMAL}, #{banks,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR},
-      #{unitAddress,jdbcType=VARCHAR}, #{invoiceRemarks,jdbcType=VARCHAR}, #{unitMobile,jdbcType=VARCHAR},
-      #{voucherUrl,jdbcType=VARCHAR}, #{post,jdbcType=INTEGER}, #{addressee,jdbcType=VARCHAR},
-      #{addresseeMobile,jdbcType=VARCHAR}, #{addresseeProvince,jdbcType=INTEGER}, #{addresseeCity,jdbcType=INTEGER},
-      #{addresseeArea,jdbcType=INTEGER}, #{recipientAddress,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
-      #{updateTime,jdbcType=TIMESTAMP}, #{approval,jdbcType=INTEGER}, #{alreadyAmount,jdbcType=DECIMAL}
+    values (#{orderNo,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
+      #{rejectReason,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{invoiceType,jdbcType=INTEGER},
+      #{unitName,jdbcType=VARCHAR}, #{taxNumber,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL},
+      #{banks,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{unitAddress,jdbcType=VARCHAR},
+      #{invoiceRemarks,jdbcType=VARCHAR}, #{unitMobile,jdbcType=VARCHAR}, #{voucherUrl,jdbcType=VARCHAR},
+      #{post,jdbcType=INTEGER}, #{addressee,jdbcType=VARCHAR}, #{addresseeMobile,jdbcType=VARCHAR},
+      #{addresseeProvince,jdbcType=INTEGER}, #{addresseeCity,jdbcType=INTEGER}, #{addresseeArea,jdbcType=INTEGER},
+      #{recipientAddress,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
+      #{approval,jdbcType=INTEGER}, #{alreadyAmount,jdbcType=DECIMAL}, #{examineName,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderInvoice" keyColumn="id" keyProperty="id"  useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderInvoice" useGeneratedKeys="true">
     insert into t_order_invoice
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="orderNo != null">
         order_no,
       </if>
       <if test="type != null">
-        type,
+        `type`,
       </if>
       <if test="status != null">
-        status,
+        `status`,
       </if>
       <if test="rejectReason != null">
         reject_reason,
@@ -280,11 +150,11 @@
       <if test="alreadyAmount != null">
         already_amount,
       </if>
+      <if test="examineName != null">
+        examine_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="orderNo != null">
         #{orderNo,jdbcType=VARCHAR},
       </if>
@@ -363,167 +233,22 @@
       <if test="alreadyAmount != null">
         #{alreadyAmount,jdbcType=DECIMAL},
       </if>
+      <if test="examineName != null">
+        #{examineName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderInvoiceExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
-    select count(*) from t_order_invoice
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
-    update t_order_invoice
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.orderNo != null">
-        order_no = #{record.orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.rejectReason != null">
-        reject_reason = #{record.rejectReason,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="record.invoiceType != null">
-        invoice_type = #{record.invoiceType,jdbcType=INTEGER},
-      </if>
-      <if test="record.unitName != null">
-        unit_name = #{record.unitName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taxNumber != null">
-        tax_number = #{record.taxNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.amount != null">
-        amount = #{record.amount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.banks != null">
-        banks = #{record.banks,jdbcType=VARCHAR},
-      </if>
-      <if test="record.content != null">
-        content = #{record.content,jdbcType=VARCHAR},
-      </if>
-      <if test="record.unitAddress != null">
-        unit_address = #{record.unitAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="record.invoiceRemarks != null">
-        invoice_remarks = #{record.invoiceRemarks,jdbcType=VARCHAR},
-      </if>
-      <if test="record.unitMobile != null">
-        unit_mobile = #{record.unitMobile,jdbcType=VARCHAR},
-      </if>
-      <if test="record.voucherUrl != null">
-        voucher_url = #{record.voucherUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.post != null">
-        post = #{record.post,jdbcType=INTEGER},
-      </if>
-      <if test="record.addressee != null">
-        addressee = #{record.addressee,jdbcType=VARCHAR},
-      </if>
-      <if test="record.addresseeMobile != null">
-        addressee_mobile = #{record.addresseeMobile,jdbcType=VARCHAR},
-      </if>
-      <if test="record.addresseeProvince != null">
-        addressee_province = #{record.addresseeProvince,jdbcType=INTEGER},
-      </if>
-      <if test="record.addresseeCity != null">
-        addressee_city = #{record.addresseeCity,jdbcType=INTEGER},
-      </if>
-      <if test="record.addresseeArea != null">
-        addressee_area = #{record.addresseeArea,jdbcType=INTEGER},
-      </if>
-      <if test="record.recipientAddress != null">
-        recipient_address = #{record.recipientAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.approval != null">
-        approval = #{record.approval,jdbcType=INTEGER},
-      </if>
-      <if test="record.alreadyAmount != null">
-        already_amount = #{record.alreadyAmount,jdbcType=DECIMAL},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
-    update t_order_invoice
-    set id = #{record.id,jdbcType=INTEGER},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
-      type = #{record.type,jdbcType=INTEGER},
-      status = #{record.status,jdbcType=INTEGER},
-      reject_reason = #{record.rejectReason,jdbcType=VARCHAR},
-      remarks = #{record.remarks,jdbcType=VARCHAR},
-      invoice_type = #{record.invoiceType,jdbcType=INTEGER},
-      unit_name = #{record.unitName,jdbcType=VARCHAR},
-      tax_number = #{record.taxNumber,jdbcType=VARCHAR},
-      amount = #{record.amount,jdbcType=DECIMAL},
-      banks = #{record.banks,jdbcType=VARCHAR},
-      content = #{record.content,jdbcType=VARCHAR},
-      unit_address = #{record.unitAddress,jdbcType=VARCHAR},
-      invoice_remarks = #{record.invoiceRemarks,jdbcType=VARCHAR},
-      unit_mobile = #{record.unitMobile,jdbcType=VARCHAR},
-      voucher_url = #{record.voucherUrl,jdbcType=VARCHAR},
-      post = #{record.post,jdbcType=INTEGER},
-      addressee = #{record.addressee,jdbcType=VARCHAR},
-      addressee_mobile = #{record.addresseeMobile,jdbcType=VARCHAR},
-      addressee_province = #{record.addresseeProvince,jdbcType=INTEGER},
-      addressee_city = #{record.addresseeCity,jdbcType=INTEGER},
-      addressee_area = #{record.addresseeArea,jdbcType=INTEGER},
-      recipient_address = #{record.recipientAddress,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      approval = #{record.approval,jdbcType=INTEGER},
-      already_amount = #{record.alreadyAmount,jdbcType=DECIMAL}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderInvoice">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
     update t_order_invoice
     <set>
       <if test="orderNo != null">
         order_no = #{orderNo,jdbcType=VARCHAR},
       </if>
       <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+        `type` = #{type,jdbcType=INTEGER},
       </if>
       <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+        `status` = #{status,jdbcType=INTEGER},
       </if>
       <if test="rejectReason != null">
         reject_reason = #{rejectReason,jdbcType=VARCHAR},
@@ -594,19 +319,17 @@
       <if test="alreadyAmount != null">
         already_amount = #{alreadyAmount,jdbcType=DECIMAL},
       </if>
+      <if test="examineName != null">
+        examine_name = #{examineName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderInvoice">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 17 09:46:50 CST 2019.
-    -->
     update t_order_invoice
     set order_no = #{orderNo,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
-      status = #{status,jdbcType=INTEGER},
+      `type` = #{type,jdbcType=INTEGER},
+      `status` = #{status,jdbcType=INTEGER},
       reject_reason = #{rejectReason,jdbcType=VARCHAR},
       remarks = #{remarks,jdbcType=VARCHAR},
       invoice_type = #{invoiceType,jdbcType=INTEGER},
@@ -629,9 +352,11 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       approval = #{approval,jdbcType=INTEGER},
-      already_amount = #{alreadyAmount,jdbcType=DECIMAL}
+      already_amount = #{alreadyAmount,jdbcType=DECIMAL},
+      examine_name = #{examineName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
   <select id="checkApplyAmount" resultType="java.lang.String">
   select ifnull(sum(amount),0) from t_order_invoice
 	where order_no= #{orderNo,jdbcType=VARCHAR}  and status !=4

File diff suppressed because it is too large
+ 376 - 639
src/main/java/com/goafanti/common/model/TOrderInvoice.java