From 1cbc31001aa738ddb41db4fba63f96bfd7040a75 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 25 Jul 2024 20:20:10 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisBaseInvoiceChInfoMapper.xml     | 2 +-
 .../main/resources/mapper/EmisBaseInvoiceInfoMapper.xml  | 2 +-
 .../resources/mapper/EmisCustomerInvoiceInfoMapper.xml   | 2 +-
 .../src/main/resources/mapper/EmisSettleBillMapper.xml   | 2 +-
 .../resources/mapper/EmisSettleInvoiceChRecordMapper.xml | 2 +-
 .../resources/mapper/EmisSettleSubBillFeeitemMapper.xml  | 2 +-
 .../main/resources/mapper/EmisSettleSubBillMapper.xml    | 9 +++++++++
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisBaseInvoiceChInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseInvoiceChInfoMapper.xml
index 643cbe2ee..09e4f0a18 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseInvoiceChInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseInvoiceChInfoMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisBaseInvoiceChInfoMapper">
     
-    <resultMap type="EmisBaseInvoiceChInfo" id="EmisBaseInvoiceChInfoResult">
+    <resultMap type="EmisBaseInvoiceChInfo" id="EmisBaseInvoiceChInfoResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="chId"    column="ch_id"    />
         <result property="chName"    column="ch_name"    />
diff --git a/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
index 6928f93ba..f73b665b7 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisBaseInvoiceInfoMapper">
 
-    <resultMap type="EmisBaseInvoiceInfo" id="EmisBaseInvoiceInfoResult">
+    <resultMap type="EmisBaseInvoiceInfo" id="EmisBaseInvoiceInfoResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="comCode"    column="com_code"    />
         <result property="companyName"    column="company_name"    />
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
index b0eaab8e3..f109d2ae3 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisCustomerInvoiceInfoMapper">
 
-    <resultMap type="EmisCustomerInvoiceInfo" id="EmisCustomerInvoiceInfoResult">
+    <resultMap type="EmisCustomerInvoiceInfo" id="EmisCustomerInvoiceInfoResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="companyName"    column="company_name"    />
         <result property="companyTaxNo"    column="company_tax_no"    />
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 454345078..3a03968b0 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisSettleBillMapper">
 
-    <resultMap type="EmisSettleBill" id="EmisSettleBillResult">
+    <resultMap type="EmisSettleBill" id="EmisSettleBillResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="settleBillNo"    column="settle_bill_no"    />
         <result property="settleBillName"    column="settle_bill_name"    />
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 4591c4a32..5ce16b756 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisSettleInvoiceChRecordMapper">
     
-    <resultMap type="EmisSettleInvoiceChRecord" id="EmisSettleInvoiceChRecordResult">
+    <resultMap type="EmisSettleInvoiceChRecord" id="EmisSettleInvoiceChRecordResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="reqNo"    column="req_no"    />
         <result property="applySeqNo"    column="apply_seq_no"    />
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml
index a4a0da045..12881077d 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisSettleSubBillFeeitemMapper">
     
-    <resultMap type="EmisSettleSubBillFeeitem" id="EmisSettleSubBillFeeitemResult">
+    <resultMap type="EmisSettleSubBillFeeitem" id="EmisSettleSubBillFeeitemResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="subBillNo"    column="sub_bill_no"    />
         <result property="billCode"    column="bill_code"    />
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 60474faf9..dd4064c44 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -127,10 +127,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and b.bl_confirm_site='1'
             </if>
 
+            <if test="params.transLineType != null and params.transLineType != ''">
+                and a.trans_line_type =  #{params.transLineType}
+            </if>
+
+            <if test="params.productType != null and params.productType != ''">
+                and a.product_type =  #{params.productType}
+            </if>
+
             <if test="params.payee != null and params.payee != ''">
                 and a.payee =  #{params.payee}
             </if>
 
+
             <if test="params.salesmen != null and params.salesmen != ''">
                 and a.salesmen =  #{params.salesmen}
             </if>