From 8a8664335cc927773628cbbedbd64dd42fa74a6c Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 17 May 2023 19:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BAmapper?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/CustomsMapper.xml   |  7 +++-
 .../main/resources/mapper/ExtPaperMapper.xml  | 42 ++++++++++++++++---
 .../main/resources/mapper/TicketMapper.xml    | 21 ++++++++++
 .../service/customs/CustomsServiceImpl.java   |  9 +++-
 .../main/resources/mapper/CustomsMapper.xml   |  5 ++-
 5 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
index 1872b5ee..965eecba 100644
--- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
@@ -123,9 +123,12 @@
         <if test="rzhType != null and rzhType != '' and rzhType != 'null' ">
             and t.rzh_type = #{rzhType}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.in_account_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.in_account_status = '0' or t.in_account_status = '' or t.in_account_status is null)
+        </if>
         <if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
             and t.qs_type = #{qsfs}
         </if>
@@ -140,7 +143,7 @@
             and t.posting_time = #{postingTime}
         </if>
         <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
-            and t.image_id = #{imageId}
+            and t.image_id = #{imageNumber}
         </if>
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index fdfa6ec0..37824d4a 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -134,6 +134,30 @@
         <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
             and qs_type = #{qsfs}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and sn_voucher_number = #{snVoucherNumber}
+        </if>
+
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and image_id = #{imageNumber}
+        </if>
+
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and account_period = #{accountPeriod}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and inaccount_status = #{inAccountStatus}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (inaccount_status = '0' or inaccount_status = '' or inaccount_status is null)
+        </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
+            and bzdh = #{bzdh}
+        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
             and (comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
@@ -299,8 +323,11 @@
         <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
             and t.qs_type = #{qsfs}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
-            and t.payment_status = #{inAccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
         </if>
         <if test="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
             and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}
@@ -308,14 +335,17 @@
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
             and t.invoice_source = #{invoiceSource}
         </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
+            and t.bzdh = #{bzdh}
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
-        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
-            and t.posting_time = #{postingTime}
+        <if test="postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99' and postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
         </if>
-        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
-            and t.image_id = #{imageId}
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
         </if>
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
diff --git a/dxhy-core/src/main/resources/mapper/TicketMapper.xml b/dxhy-core/src/main/resources/mapper/TicketMapper.xml
index ee19bbed..15251426 100644
--- a/dxhy-core/src/main/resources/mapper/TicketMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TicketMapper.xml
@@ -89,6 +89,27 @@
         <if test="company !=null and company !=''">
             and t.company = #{company}
         </if>
+        <if test="postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99' and postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
+            and t.bzdh = #{bzdh}
+        </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
             and (t.comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
index 9c1882b4..132cc1db 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
@@ -115,8 +115,13 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, CustomsRec
                     String rzhYesorno = pageList.get(i).getRzhYesorno();
                     pageList.get(i).setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
                     // 入账状态字段
-                    pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
-                        pageList.get(i).getInAccountStatus()));
+//                    pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
+//                        pageList.get(i).getInAccountStatus()));
+                    if ("1".equals(pageList.get(i).getInAccountStatus())){
+                        pageList.get(i).setInAccountStatus("已入账");
+                    }else {
+                        pageList.get(i).setInAccountStatus("未入账");
+                    }
                     // 采集状态
                     pageList.get(i).setCjzt(pageList.get(i).getCreateDate() == null ? "未采集" : "已采集");
                     //
diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
index 681f5a5b..c6b36c0d 100644
--- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
@@ -126,9 +126,12 @@
         <if test="rzhType != null and rzhType != '' and rzhType != 'null' ">
             and t.rzh_type = #{rzhType}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.in_account_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.in_account_status = '0' or t.in_account_status = '' or t.in_account_status is null)
+        </if>
         <if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
             and t.qs_type = #{qsfs}
         </if>