From 326aac61779ebdf55d7cc4c0af44d702bf65d154 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 28 May 2023 09:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=B1=BA=E6=99=82=E9=96=93=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E4=B8=80=E8=87=B4=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/core/thread/ManualAthensThread.java  |  5 +-
 .../mapper/TDxCustomsRecordMapper.xml         | 48 +++++++++++++++++--
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
index 5f620fa0..fedadc85 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
@@ -188,11 +188,10 @@ public class ManualAthensThread extends BaseThread {
                     pramsMap.put("cjjsyf", DateUtils.getNight(DateUtils.strToDate(cjjsyf)));
                 }
                 if (prams.get("kpksrq") != null && !"".equals(prams.get("kpksrq"))) {
-                    pramsMap.put("kpksrq",
-                            DateUtils.getMorning(DateUtils.strToDate(prams.get("kpksrq").toString())));
+                    pramsMap.put("kpksrq",prams.getString("kpksrq"));
                 }
                 if (prams.get("kpjsrq") != null && !"".equals(prams.get("kpjsrq"))) {
-                    pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(prams.get("kpjsrq").toString())));
+                    pramsMap.put("kpjsrq",prams.getString("kpjsrq"));
                 }
                 if (prams.get("skssq") != null && !"".equals(prams.get("skssq")) && "1".equals(prams.get("rzzt"))) {
                     pramsMap.put("skssq", prams.get("skssq").toString().replace("-", ""));
diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
index 047d24c8..5a56efe0 100644
--- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
@@ -436,7 +436,13 @@
         p.rzh_belong_date as rzhBelongDate,
         p.cxrz_status as cxrzStatus,
         p.bdk_status as bdkStatus,
-        p.dept_name as businessName
+        p.dept_name as businessName,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber
         FROM
         t_dx_customs_record p
         where
@@ -449,6 +455,23 @@
                 #{item,jdbcType=VARCHAR}
             </foreach>
         </if>
+        <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
+            and p.bzdh = #{queryParams.bzdh}
+        </if>
+
+        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null' and queryParams.inAccountStatus != '99'">
+            and p.inaccount_status = #{queryParams.inAccountStatus}
+        </if>
+
+        <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
+            and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
+        </if>
+        <if test="queryParams.imageNumber != null and queryParams.imageNumber != '' and queryParams.imageNumber != 'null' and queryParams.imageNumber != '99'">
+            and p.image_id = #{queryParams.imageNumber}
+        </if>
+        <if test="queryParams.accountPeriod != null and queryParams.accountPeriod != '' and queryParams.accountPeriod != 'null' and queryParams.accountPeriod != '99'">
+            and p.account_period = #{queryParams.accountPeriod}
+        </if>
 
         <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
             and p.gf_tax_no = #{queryParams.gfsh}
@@ -466,17 +489,29 @@
             and p.auth_status = #{queryParams.authStatus}
         </if>
 
+        <!--
         <if test="queryParams.confirmUser!=null and queryParams.confirmUser!=''">
             and p.confirm_user = #{queryParams.confirmUser}
         </if>
+        -->
+        <if test="queryParams.confirmUserList != null and queryParams.confirmUserList.size() > 0">
+            and p.confirm_user in
+            <foreach collection="queryParams.confirmUserList" index="index" item="item"
+                     open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="queryParams.rzlx!=null and queryParams.rzlx!=''">
             and p.bdk_status = #{queryParams.rzlx}
         </if>
 
-        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and  queryParams.rzhYesorno != 3">
             and p.rzh_yesorno = #{queryParams.rzhYesorno}
         </if>
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and  queryParams.rzhYesorno == 3">
+            and (p.rzh_yesorno = '1' or p.rzh_yesorno = '2')
+        </if>
 
         <if test="queryParams.rzhDateStart!=null and queryParams.rzhDateStart!=''">
             and p.rzh_date &gt;= #{queryParams.rzhDateStart}
@@ -528,15 +563,18 @@
         <if test="queryParams.qsDateEnd!=null and queryParams.qsDateEnd!=''">
             and p.qs_date &lt;= #{queryParams.qsDateEnd}
         </if>
-        <if test="queryParams.businessCode != '99' and queryParams.businessCode != null and queryParams.businessCode != '' and queryParams.businessCode != 'null' ">
+        <if
+                test="queryParams.businessCode != '99' and queryParams.businessCode != null and queryParams.businessCode != '' and queryParams.businessCode != 'null' ">
             and p.dept_id = #{queryParams.businessCode}
         </if>
         <if test="queryParams.businessCode==''">
             and (p.dept_id is null or p.dept_id='' or p.dept_id='99')
         </if>
-        <if test='queryParams.businessCode == "99" and queryParams.business!=null and queryParams.business.size()>0'>
+        <if
+                test='queryParams.businessCode == "99" and queryParams.business!=null and queryParams.business.size()>0'>
             and (p.dept_id in
-            <foreach collection="queryParams.business" index="index" item="item" open="(" separator="," close="">
+            <foreach close="" collection="queryParams.business" index="index" item="item" open="("
+                     separator=",">
                 #{item.businessCode}
             </foreach>
             ) or (p.dept_id is null or p.dept_id='' or p.dept_id='99'))