From 8e73794fa9000ae0e9651ab4deac23290932719b Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 17 May 2023 16:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E9=A1=B9=E7=A5=A8?=
 =?UTF-8?q?=E6=B1=A0inAccountStatus=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../export/impl/CustomsServiceImpl.java       | 28 +++++++++----------
 .../dxhy/core/thread/CustomExportThread.java  |  2 +-
 .../main/resources/mapper/ExtPaperMapper.xml  |  1 -
 .../companypool/TicketServiceImpl.java        |  2 +-
 .../main/resources/mapper/TicketMapper.xml    | 10 +++++--
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java
index dce573e8..5188cf72 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java
@@ -120,26 +120,26 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, JkszhcxRes
                     dataArray[23] =
                         vo.getInAccountDate() == null ? "" : vo.getInAccountDate().replaceAll("-", "").substring(0, 6);
                     // 入账状态
-                    dataArray[24] =
-                        dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, vo.getInAccountStatus());
+//                    dataArray[24] =
+//                        dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, vo.getInAccountStatus());
 
                     // 凭证号
-                    dataArray[25] = vo.getVoucherNumber();
+                    dataArray[24] = vo.getVoucherNumber();
                     // 业务单元
-                    dataArray[26] = vo.getBusinessName();
+                    dataArray[25] = vo.getBusinessName();
                     // 入池时间
-                    dataArray[27] = vo.getCreateDate() == null ? "" : vo.getCreateDate().trim().substring(0, 11);
-                    dataArray[28] = vo.getSnVoucherNumber();
-                    dataArray[29] = vo.getPostingTime();
-                    dataArray[30] = vo.getAccountPeriod();
-                    dataArray[31] = vo.getImageId();
-                    dataArray[32] = vo.getBzdh();
+                    dataArray[26] = vo.getCreateDate() == null ? "" : vo.getCreateDate().trim().substring(0, 11);
+                    dataArray[27] = vo.getSnVoucherNumber();
+                    dataArray[28] = vo.getPostingTime();
+                    dataArray[29] = vo.getAccountPeriod();
+                    dataArray[30] = vo.getImageId();
+                    dataArray[31] = vo.getBzdh();
                     if (vo.getInAccountStatus() != null && "1".equals(vo.getInAccountStatus())){
-                        dataArray[33] = "已入账";
-                    }else if (vo.getInAccountStatus() != null && "0".equals(vo.getInAccountStatus())){
-                        dataArray[33] = "未入账";
+                        dataArray[32] = "已入账";
+                    }else {
+                        dataArray[32] = "未入账";
                     }
-                    dataArray[34] = vo.getCompCode();
+                    dataArray[33] = vo.getCompCode();
                     returnList.add(dataArray);
                 }
             }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java
index f0e61b7a..5a828e79 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java
@@ -64,7 +64,7 @@ public class CustomExportThread extends BaseThread {
 
     String[] titleColumns = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对",
         "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人", "入账月份",
-        "入账状态", "凭证号", "业务单元", "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态","所属组织"};
+         "凭证号", "业务单元", "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态","所属组织"};
 
     String[] titleprop = {"xh", "customsCode", "fillInDate", "gfTaxNo", "gfName", "taxAmount", "yxTaxAmount",
         "auditStatus", "applyCheck", "checkStatus", "rzhYesorno", "bdkStatus", "rzhDate", "rzhType", "confirmUser",
diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index b7c889bc..06e7b599 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -31,7 +31,6 @@
 		DATE_FORMAT(t.qs_date,'%Y-%m-%d') qsrq,
 		t.qs_name qsr,
 		DATE_FORMAT(t.payment_date,'%Y-%m') inAccountMonth,
-		t.payment_status inAccountStatus,
 		t.voucher_number voucherNo,
 		t.amortize_status amortizeStatus,
 		t.amortize_amount amortizeAmount,
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
index 6626fe6b..dd6beeba 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
@@ -144,7 +144,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl<ExtTicketDao, ExtTicket
                     //报账单号字典值转换
                     if ("1".equals(pageList.get(i).getInAccountStatus())){
                         pageList.get(i).setInAccountStatus("已入账");
-                    }else if ("0".equals(pageList.get(i).getInAccountStatus())){
+                    }else {
                         pageList.get(i).setInAccountStatus("未入账");
                     }
                     log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
index c3f6c37e..4398774c 100644
--- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml
@@ -63,9 +63,12 @@
         <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'">
+        <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>
@@ -141,9 +144,12 @@
         <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'">
+        <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>