From 6c98b06ee2c8bd216ecd3a256b346c3cd5b7ed39 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 21 Jul 2024 22:35:04 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisBaseInvoiceInfo.java  | 14 +++++---
 .../emis/domain/EmisCustomerInvoiceInfo.java  | 14 +++++---
 .../emis/domain/EmisSettleInvoiceRecord.java  | 14 +++++---
 .../mapper/EmisBaseInvoiceInfoMapper.xml      | 36 ++++++++++++-------
 .../mapper/EmisCustomerInvoiceInfoMapper.xml  | 36 ++++++++++++-------
 .../mapper/EmisSettleInvoiceRecordMapper.xml  | 36 ++++++++++++-------
 6 files changed, 99 insertions(+), 51 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java
index bb1aa0439..67e9debd2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisBaseInvoiceInfo.java
  * @author linfso
- * @date 2024-07-21 13:31:27
+ * @date 2024-07-21 14:32:14
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 公司开票信息 实体类 </p>
  */
 
@@ -26,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisBaseInvoiceInfo
  * @Description 公司开票信息
  * @author linfso
- * @date 2024-07-21 13:31:27
+ * @date 2024-07-21 14:32:14
  */
- @Data
+@Data
 public class EmisBaseInvoiceInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -45,6 +45,10 @@ public class EmisBaseInvoiceInfo extends BaseEntity
     private String companyTel;
     /* 开票地址 */
     private String companyAddress;
+    /* 开户行 */
+    private String bankName;
+    /* 开户账号 */
+    private String bankAccNo;
     /* 开票类型 1-增值电子 */
     private String invoiceType;
     /* 联系人 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerInvoiceInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerInvoiceInfo.java
index 0f5b3ffea..d7004adeb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerInvoiceInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerInvoiceInfo.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisCustomerInvoiceInfo.java
  * @author linfso
- * @date 2024-07-21 13:31:25
+ * @date 2024-07-21 14:31:02
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 客户开票信息记录表 实体类 </p>
  */
 
@@ -26,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisCustomerInvoiceInfo
  * @Description 客户开票信息记录表
  * @author linfso
- * @date 2024-07-21 13:31:25
+ * @date 2024-07-21 14:31:02
  */
- @Data
+@Data
 public class EmisCustomerInvoiceInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -43,6 +43,10 @@ public class EmisCustomerInvoiceInfo extends BaseEntity
     private String companyTel;
     /* 开票地址 */
     private String companyAddress;
+    /* 开户行 */
+    private String bankName;
+    /* 开户账号 */
+    private String bankAccNo;
     /* 开票类型 1-增值电子 */
     private String invoiceType;
     /* 客户编码 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java
index 60b6755db..b7c077a31 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisSettleInvoiceRecord.java
  * @author linfso
- * @date 2024-07-21 13:31:26
+ * @date 2024-07-21 14:33:40
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 开票记录表 实体类 </p>
  */
 
@@ -26,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisSettleInvoiceRecord
  * @Description 开票记录表
  * @author linfso
- * @date 2024-07-21 13:31:26
+ * @date 2024-07-21 14:33:40
  */
- @Data
+@Data
 public class EmisSettleInvoiceRecord extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -64,6 +64,10 @@ public class EmisSettleInvoiceRecord extends BaseEntity
     private String companyTel;
     /* 开票地址 */
     private String companyAddress;
+    /* 开户行 */
+    private String bankName;
+    /* 开户账号 */
+    private String bankAccNo;
     /* 联系人 */
     private String contact;
     /* 联系电话 */
diff --git a/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
index dd8e6536f..6928f93ba 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisBaseInvoiceInfoMapper">
-    
+
     <resultMap type="EmisBaseInvoiceInfo" id="EmisBaseInvoiceInfoResult">
         <result property="id"    column="id"    />
         <result property="comCode"    column="com_code"    />
@@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="companyTaxNo"    column="company_tax_no"    />
         <result property="companyTel"    column="company_tel"    />
         <result property="companyAddress"    column="company_address"    />
+        <result property="bankName"    column="bank_name"    />
+        <result property="bankAccNo"    column="bank_acc_no"    />
         <result property="invoiceType"    column="invoice_type"    />
         <result property="contact"    column="contact"    />
         <result property="phone"    column="phone"    />
@@ -19,19 +21,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisBaseInvoiceInfoVo">
-        select id, com_code, company_name, company_tax_no, company_tel, company_address, invoice_type, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_base_invoice_info
+        select id, com_code, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_base_invoice_info
     </sql>
 
     <select id="selectEmisBaseInvoiceInfoList" parameterType="EmisBaseInvoiceInfo" resultMap="EmisBaseInvoiceInfoResult">
         <include refid="selectEmisBaseInvoiceInfoVo"/>
-        <where>  
-             del_flag='0'
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="comCode != null  and comCode != ''"> and com_code = #{comCode}</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="companyTaxNo != null  and companyTaxNo != ''"> and company_tax_no like concat('%', #{companyTaxNo}, '%')</if>
             <if test="companyTel != null  and companyTel != ''"> and company_tel like concat('%', #{companyTel}, '%')</if>
             <if test="companyAddress != null  and companyAddress != ''"> and company_address like concat('%', #{companyAddress}, '%')</if>
+            <if test="bankName != null  and bankName != ''"> and bank_name like concat('%', #{bankName}, '%')</if>
+            <if test="bankAccNo != null  and bankAccNo != ''"> and bank_acc_no like concat('%', #{bankAccNo}, '%')</if>
             <if test="invoiceType != null  and invoiceType != ''"> and invoice_type like concat('%', #{invoiceType}, '%')</if>
             <if test="contact != null  and contact != ''"> and contact like concat('%', #{contact}, '%')</if>
             <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
@@ -58,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and company_tax_no = #{companyTaxNo}
            and company_tel = #{companyTel}
            and company_address = #{companyAddress}
+           and bank_name = #{bankName}
+           and bank_acc_no = #{bankAccNo}
            and invoice_type = #{invoiceType}
            and contact = #{contact}
            and phone = #{phone}
@@ -73,13 +79,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and update_site = #{updateSite}
 		limit 1
 	</select>
-  
+
     <select id="selectEmisBaseInvoiceInfoById" parameterType="Long" resultMap="EmisBaseInvoiceInfoResult">
-        select id, com_code, company_name, company_tax_no, company_tel, company_address, invoice_type, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, com_code, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_base_invoice_info a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisBaseInvoiceInfo" parameterType="EmisBaseInvoiceInfo" useGeneratedKeys="true" keyProperty="id">
         insert into emis_base_invoice_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -89,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null and companyTaxNo != ''">company_tax_no,</if>
             <if test="companyTel != null and companyTel != ''">company_tel,</if>
             <if test="companyAddress != null and companyAddress != ''">company_address,</if>
+            <if test="bankName != null and bankName != ''">bank_name,</if>
+            <if test="bankAccNo != null and bankAccNo != ''">bank_acc_no,</if>
             <if test="invoiceType != null and invoiceType != ''">invoice_type,</if>
             <if test="contact != null and contact != ''">contact,</if>
             <if test="phone != null and phone != ''">phone,</if>
@@ -102,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="comCode != null and comCode != ''">#{comCode},</if>
@@ -110,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null and companyTaxNo != ''">#{companyTaxNo},</if>
             <if test="companyTel != null and companyTel != ''">#{companyTel},</if>
             <if test="companyAddress != null and companyAddress != ''">#{companyAddress},</if>
+            <if test="bankName != null and bankName != ''">#{bankName},</if>
+            <if test="bankAccNo != null and bankAccNo != ''">#{bankAccNo},</if>
             <if test="invoiceType != null and invoiceType != ''">#{invoiceType},</if>
             <if test="contact != null and contact != ''">#{contact},</if>
             <if test="phone != null and phone != ''">#{phone},</if>
@@ -123,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisBaseInvoiceInfo" parameterType="EmisBaseInvoiceInfo">
@@ -134,6 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null and companyTaxNo != ''">company_tax_no = #{companyTaxNo},</if>
             <if test="companyTel != null and companyTel != ''">company_tel = #{companyTel},</if>
             <if test="companyAddress != null and companyAddress != ''">company_address = #{companyAddress},</if>
+            <if test="bankName != null and bankName != ''">bank_name = #{bankName},</if>
+            <if test="bankAccNo != null and bankAccNo != ''">bank_acc_no = #{bankAccNo},</if>
             <if test="invoiceType != null and invoiceType != ''">invoice_type = #{invoiceType},</if>
             <if test="contact != null and contact != ''">contact = #{contact},</if>
             <if test="phone != null and phone != ''">phone = #{phone},</if>
@@ -156,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisBaseInvoiceInfoByIds" parameterType="String">
-        delete from emis_base_invoice_info where id in 
+        delete from emis_base_invoice_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
index 981d5dc09..b0eaab8e3 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisCustomerInvoiceInfoMapper">
-    
+
     <resultMap type="EmisCustomerInvoiceInfo" id="EmisCustomerInvoiceInfoResult">
         <result property="id"    column="id"    />
         <result property="companyName"    column="company_name"    />
         <result property="companyTaxNo"    column="company_tax_no"    />
         <result property="companyTel"    column="company_tel"    />
         <result property="companyAddress"    column="company_address"    />
+        <result property="bankName"    column="bank_name"    />
+        <result property="bankAccNo"    column="bank_acc_no"    />
         <result property="invoiceType"    column="invoice_type"    />
         <result property="customerCode"    column="customer_code"    />
         <result property="customerName"    column="customer_name"    />
@@ -20,18 +22,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisCustomerInvoiceInfoVo">
-        select id, company_name, company_tax_no, company_tel, company_address, invoice_type, customer_code, customer_name, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_invoice_info
+        select id, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, customer_code, customer_name, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_invoice_info
     </sql>
 
     <select id="selectEmisCustomerInvoiceInfoList" parameterType="EmisCustomerInvoiceInfo" resultMap="EmisCustomerInvoiceInfoResult">
         <include refid="selectEmisCustomerInvoiceInfoVo"/>
-        <where>  
-             del_flag='0'
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="companyTaxNo != null  and companyTaxNo != ''"> and company_tax_no like concat('%', #{companyTaxNo}, '%')</if>
             <if test="companyTel != null  and companyTel != ''"> and company_tel like concat('%', #{companyTel}, '%')</if>
             <if test="companyAddress != null  and companyAddress != ''"> and company_address like concat('%', #{companyAddress}, '%')</if>
+            <if test="bankName != null  and bankName != ''"> and bank_name like concat('%', #{bankName}, '%')</if>
+            <if test="bankAccNo != null  and bankAccNo != ''"> and bank_acc_no like concat('%', #{bankAccNo}, '%')</if>
             <if test="invoiceType != null  and invoiceType != ''"> and invoice_type like concat('%', #{invoiceType}, '%')</if>
             <if test="customerCode != null  and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
@@ -59,6 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and company_tax_no = #{companyTaxNo}
            and company_tel = #{companyTel}
            and company_address = #{companyAddress}
+           and bank_name = #{bankName}
+           and bank_acc_no = #{bankAccNo}
            and invoice_type = #{invoiceType}
            and customer_code = #{customerCode}
            and customer_name = #{customerName}
@@ -76,13 +82,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and update_site = #{updateSite}
 		limit 1
 	</select>
-  
+
     <select id="selectEmisCustomerInvoiceInfoById" parameterType="Long" resultMap="EmisCustomerInvoiceInfoResult">
-        select id, company_name, company_tax_no, company_tel, company_address, invoice_type, customer_code, customer_name, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, customer_code, customer_name, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_customer_invoice_info a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisCustomerInvoiceInfo" parameterType="EmisCustomerInvoiceInfo" useGeneratedKeys="true" keyProperty="id">
         insert into emis_customer_invoice_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -91,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null and companyTaxNo != ''">company_tax_no,</if>
             <if test="companyTel != null and companyTel != ''">company_tel,</if>
             <if test="companyAddress != null and companyAddress != ''">company_address,</if>
+            <if test="bankName != null and bankName != ''">bank_name,</if>
+            <if test="bankAccNo != null and bankAccNo != ''">bank_acc_no,</if>
             <if test="invoiceType != null and invoiceType != ''">invoice_type,</if>
             <if test="customerCode != null and customerCode != ''">customer_code,</if>
             <if test="customerName != null and customerName != ''">customer_name,</if>
@@ -106,13 +114,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="companyName != null and companyName != ''">#{companyName},</if>
             <if test="companyTaxNo != null and companyTaxNo != ''">#{companyTaxNo},</if>
             <if test="companyTel != null and companyTel != ''">#{companyTel},</if>
             <if test="companyAddress != null and companyAddress != ''">#{companyAddress},</if>
+            <if test="bankName != null and bankName != ''">#{bankName},</if>
+            <if test="bankAccNo != null and bankAccNo != ''">#{bankAccNo},</if>
             <if test="invoiceType != null and invoiceType != ''">#{invoiceType},</if>
             <if test="customerCode != null and customerCode != ''">#{customerCode},</if>
             <if test="customerName != null and customerName != ''">#{customerName},</if>
@@ -128,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisCustomerInvoiceInfo" parameterType="EmisCustomerInvoiceInfo">
@@ -138,6 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null and companyTaxNo != ''">company_tax_no = #{companyTaxNo},</if>
             <if test="companyTel != null and companyTel != ''">company_tel = #{companyTel},</if>
             <if test="companyAddress != null and companyAddress != ''">company_address = #{companyAddress},</if>
+            <if test="bankName != null and bankName != ''">bank_name = #{bankName},</if>
+            <if test="bankAccNo != null and bankAccNo != ''">bank_acc_no = #{bankAccNo},</if>
             <if test="invoiceType != null and invoiceType != ''">invoice_type = #{invoiceType},</if>
             <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
             <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
@@ -162,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisCustomerInvoiceInfoByIds" parameterType="String">
-        delete from emis_customer_invoice_info where id in 
+        delete from emis_customer_invoice_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
index c715df93d..228826c0a 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisSettleInvoiceRecordMapper">
-    
+
     <resultMap type="EmisSettleInvoiceRecord" id="EmisSettleInvoiceRecordResult">
         <result property="id"    column="id"    />
         <result property="applySeqNo"    column="apply_seq_no"    />
@@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="companyTaxNo"    column="company_tax_no"    />
         <result property="companyTel"    column="company_tel"    />
         <result property="companyAddress"    column="company_address"    />
+        <result property="bankName"    column="bank_name"    />
+        <result property="bankAccNo"    column="bank_acc_no"    />
         <result property="contact"    column="contact"    />
         <result property="phone"    column="phone"    />
         <result property="realTaxType"    column="real_tax_type"    />
@@ -45,13 +47,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisSettleInvoiceRecordVo">
-        select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, company_name, company_tax_no, company_tel, company_address, contact, phone, real_tax_type, open_money_max, open_money, invoice_no, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_invoice_record
+        select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, real_tax_type, open_money_max, open_money, invoice_no, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_invoice_record
     </sql>
 
     <select id="selectEmisSettleInvoiceRecordList" parameterType="EmisSettleInvoiceRecord" resultMap="EmisSettleInvoiceRecordResult">
         <include refid="selectEmisSettleInvoiceRecordVo"/>
-        <where>  
-             del_flag='0'
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="applySeqNo != null  and applySeqNo != ''"> and apply_seq_no = #{applySeqNo}</if>
             <if test="applyDate != null "> and apply_date = #{applyDate}</if>
@@ -67,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null  and companyTaxNo != ''"> and company_tax_no = #{companyTaxNo}</if>
             <if test="companyTel != null  and companyTel != ''"> and company_tel like concat('%', #{companyTel}, '%')</if>
             <if test="companyAddress != null  and companyAddress != ''"> and company_address like concat('%', #{companyAddress}, '%')</if>
+            <if test="bankName != null  and bankName != ''"> and bank_name like concat('%', #{bankName}, '%')</if>
+            <if test="bankAccNo != null  and bankAccNo != ''"> and bank_acc_no like concat('%', #{bankAccNo}, '%')</if>
             <if test="contact != null  and contact != ''"> and contact like concat('%', #{contact}, '%')</if>
             <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
             <if test="realTaxType != null  and realTaxType != ''"> and real_tax_type = #{realTaxType}</if>
@@ -119,6 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and company_tax_no = #{companyTaxNo}
            and company_tel = #{companyTel}
            and company_address = #{companyAddress}
+           and bank_name = #{bankName}
+           and bank_acc_no = #{bankAccNo}
            and contact = #{contact}
            and phone = #{phone}
            and real_tax_type = #{realTaxType}
@@ -151,13 +157,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and update_site = #{updateSite}
 		limit 1
 	</select>
-  
+
     <select id="selectEmisSettleInvoiceRecordById" parameterType="Long" resultMap="EmisSettleInvoiceRecordResult">
-        select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, company_name, company_tax_no, company_tel, company_address, contact, phone, real_tax_type, open_money_max, open_money, invoice_no, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, real_tax_type, open_money_max, open_money, invoice_no, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_invoice_record a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisSettleInvoiceRecord" parameterType="EmisSettleInvoiceRecord" useGeneratedKeys="true" keyProperty="id">
         insert into emis_settle_invoice_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -176,6 +182,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null and companyTaxNo != ''">company_tax_no,</if>
             <if test="companyTel != null and companyTel != ''">company_tel,</if>
             <if test="companyAddress != null and companyAddress != ''">company_address,</if>
+            <if test="bankName != null and bankName != ''">bank_name,</if>
+            <if test="bankAccNo != null and bankAccNo != ''">bank_acc_no,</if>
             <if test="contact != null and contact != ''">contact,</if>
             <if test="phone != null and phone != ''">phone,</if>
             <if test="realTaxType != null and realTaxType != ''">real_tax_type,</if>
@@ -206,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="applySeqNo != null and applySeqNo != ''">#{applySeqNo},</if>
@@ -223,6 +231,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null and companyTaxNo != ''">#{companyTaxNo},</if>
             <if test="companyTel != null and companyTel != ''">#{companyTel},</if>
             <if test="companyAddress != null and companyAddress != ''">#{companyAddress},</if>
+            <if test="bankName != null and bankName != ''">#{bankName},</if>
+            <if test="bankAccNo != null and bankAccNo != ''">#{bankAccNo},</if>
             <if test="contact != null and contact != ''">#{contact},</if>
             <if test="phone != null and phone != ''">#{phone},</if>
             <if test="realTaxType != null and realTaxType != ''">#{realTaxType},</if>
@@ -253,7 +263,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisSettleInvoiceRecord" parameterType="EmisSettleInvoiceRecord">
@@ -273,6 +283,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyTaxNo != null and companyTaxNo != ''">company_tax_no = #{companyTaxNo},</if>
             <if test="companyTel != null and companyTel != ''">company_tel = #{companyTel},</if>
             <if test="companyAddress != null and companyAddress != ''">company_address = #{companyAddress},</if>
+            <if test="bankName != null and bankName != ''">bank_name = #{bankName},</if>
+            <if test="bankAccNo != null and bankAccNo != ''">bank_acc_no = #{bankAccNo},</if>
             <if test="contact != null and contact != ''">contact = #{contact},</if>
             <if test="phone != null and phone != ''">phone = #{phone},</if>
             <if test="realTaxType != null and realTaxType != ''">real_tax_type = #{realTaxType},</if>
@@ -312,7 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisSettleInvoiceRecordByIds" parameterType="String">
-        delete from emis_settle_invoice_record where id in 
+        delete from emis_settle_invoice_record where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>