From bdd3e57992f7b93ab5fc4c6c3264e27ef4b962e2 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Fri, 25 Aug 2023 17:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=85=B3=E7=BC=B4=E6=AC=BE=E4=B9=A6?=
 =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA=E5=92=8C?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/export/impl/JkszhcxServiceImpl.java  |  5 +++++
 dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml | 11 ++++++++++-
 .../impl/CustomsCustomsJkszhcxServiceImpl.java        |  2 +-
 .../main/resources/mapper/CustomsJkszhcxMapper.xml    |  8 ++++----
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/JkszhcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/JkszhcxServiceImpl.java
index ea358849..3bedad09 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/JkszhcxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/JkszhcxServiceImpl.java
@@ -86,6 +86,11 @@ public class JkszhcxServiceImpl extends MpBaseServiceImpl<JkszhcxDao, JkszhcxRes
                     }
                     pageList.get(i)
                         .setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, pageList.get(i).getGlzt()));
+                    if("1".equals(pageList.get(i).getInAccountStatus())){
+                        pageList.get(i).setInAccountStatus("已入账");
+                    }else {
+                        pageList.get(i).setInAccountStatus("未入账");
+                    }
                 }
             }
             json.put("datalist", pageList);
diff --git a/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml b/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml
index 77e5039f..955b1ccd 100644
--- a/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml
@@ -26,6 +26,14 @@
         <result column="rzh_belong_date" property="rzhBelongDate"/>
         <result column="glzt" property="glzt"/>
         <result column="dept_name" property="businessName"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="image_id" property="imageId"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="comp_code" property="comp_code"/>
     </resultMap>
 
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -34,7 +42,8 @@
         t.id,t.customs_code,DATE_FORMAT(t.fill_in_date,'%Y-%m-%d')
         fill_in_date,t.gf_tax_no,t.gf_name,t.tax_amount,t.yx_tax_amount,t.audit_status,t.apply_check,t.check_status,t.qs_status,
         DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.qs_type,t.qs_user,DATE_FORMAT(t.rzh_date,'%Y-%m-%d') rzh_date,
-        t.rzh_yesorno,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,t.dept_name
+        t.rzh_yesorno,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,t.dept_name,t.inaccount_status,
+        t.sn_voucher_number,t.image_id,t.posting_time,t.account_period,t.bzdh,t.bzr,tcomp_code
         from t_dx_customs_record t
         where export_mark = '0' and t.gf_tax_no = #{gfsh}
         <if test="companyCode != null and companyCode != '' and companyCode != 'null'">
diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
index 87465e8c..76a0b2d7 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
@@ -119,7 +119,7 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     String inaccountStatus = pageList.get(i).getInAccountStatus();
                     if ("1".equals(inaccountStatus)){
                         pageList.get(i).setInAccountStatus("已入账");
-                    }else if ("0".equals(inaccountStatus)) {
+                    }else {
                         pageList.get(i).setInAccountStatus("未入账");
                     }
                      String auditStatus = pageList.get(i).getAuditStatus();
diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
index 98daaedc..0066b880 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
@@ -57,8 +57,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null' and inaccountStatus != '99' ">
-            and t.inaccount_status = #{inaccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if test="customsCode != null and customsCode != '' and customsCode != 'null'">
             and t.customs_code = #{customsCode}
@@ -222,8 +222,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null' and inaccountStatus != '99' ">
-            and t.inaccount_status = #{inaccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if
                 test="fillInStartDate != null and fillInEndDate != null and fillInStartDate != '' and fillInEndDate != ''">