From 917967f819f2faf6631a54039908490a577d2d5a Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 28 Aug 2023 08:57:24 +0800
Subject: [PATCH] =?UTF-8?q?test=E4=BB=A3=E7=A0=81=E8=A1=A5=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/export/impl/QssbServiceImpl.java    |  5 +++++
 .../service/export/impl/QstjbServiceImpl.java   |  5 +++++
 .../dxhy/core/thread/RzjgqdPdfExportThread.java | 17 ++++++++++-------
 .../src/main/resources/mapper/JkszhcxMapper.xml |  2 +-
 .../src/main/resources/mapper/QssbMapper.xml    |  8 ++++++++
 .../src/main/resources/mapper/QstjbMapper.xml   |  8 ++++++++
 .../resources/mapper/CustomsJkszhcxMapper.xml   |  5 ++++-
 7 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java
index b51cc9ac..42d7b57f 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java
@@ -60,6 +60,11 @@ public class QssbServiceImpl extends MpBaseServiceImpl<QssbDao, QssbRespVO> impl
                 resultList.get(i).setSe(MathUtil.round(resultList.get(i).getSe()));
 
                 //字典值转换
+                if ("1".equals(resultList.get(i).getInaccountStatus())){
+                    resultList.get(i).setInaccountStatus("已入账");
+                }else {
+                    resultList.get(i).setInaccountStatus("未入账");
+                }
                 resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE,resultList.get(i).getQsfs()));
                 resultList.get(i).setInvoiceType(dictdetaServcice.queryDictName(DictConstant.INVOICE_TYPE_VAT,resultList.get(i).getInvoiceType()));
 
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QstjbServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QstjbServiceImpl.java
index 8bf0320a..54d115b4 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QstjbServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QstjbServiceImpl.java
@@ -68,6 +68,11 @@ public class QstjbServiceImpl extends MpBaseServiceImpl<QstjbDao, QstjbRespVO> i
                 if (resultList.get(i).getSe() != null && !"".equals(resultList.get(i).getSe())) {
                     resultList.get(i).setSe(MathUtil.round(resultList.get(i).getSe()));
                 }
+                if ("1".equals(resultList.get(i).getInaccountStatus())){
+                    resultList.get(i).setInaccountStatus("已入账");
+                }else {
+                    resultList.get(i).setInaccountStatus("未入账");
+                }
             }
         }
 
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdPdfExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdPdfExportThread.java
index 57e17101..17d28a98 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdPdfExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdPdfExportThread.java
@@ -114,17 +114,20 @@ public class RzjgqdPdfExportThread extends BaseThread {
                 String company = prams.getString("company");
                 String gfmc = prams.getString("gfmc");
                 String dklx = prams.getString("dklx");
+                String companyCode = prams.getString("companyCode");
                 // 参数转换为需要的形式
                 Map<String, Object> pramsMap = new HashMap<>(16);
                 pramsMap.put("dbName", dbName);
                 pramsMap.put("userid", userid);
-                List<String> gfshList = new ArrayList<>();
-                if (!StringHelper.isBlank(gfsh)) {
-                    gfshList = StringHelper.stringToList(gfsh);
-                    pramsMap.put("gfsh", gfshList);
-                } else {
-                    pramsMap.put("gfsh", gfshList);
-                }
+//                List<String> gfshList = new ArrayList<>();
+//                if (!StringHelper.isBlank(gfsh)) {
+//                    gfshList = StringHelper.stringToList(gfsh);
+//                    pramsMap.put("gfsh", gfshList);
+//                } else {
+//                    pramsMap.put("gfsh", gfshList);
+//                }
+                pramsMap.put("gfsh", gfsh);
+                pramsMap.put("companyCode",companyCode);
                 pramsMap.put("skssq", skssq);
                 pramsMap.put("company", company);
                 pramsMap.put("gfmc", gfmc);
diff --git a/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml b/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml
index 955b1ccd..6b98f7d6 100644
--- a/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml
@@ -33,7 +33,7 @@
         <result column="account_period" property="accountPeriod"/>
         <result column="bzdh" property="bzdh"/>
         <result column="bzr" property="bzr"/>
-        <result column="comp_code" property="comp_code"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <select id="selectByPramsMap" parameterType="java.util.Map"
diff --git a/dxhy-core/src/main/resources/mapper/QssbMapper.xml b/dxhy-core/src/main/resources/mapper/QssbMapper.xml
index a5e3043f..6d436628 100644
--- a/dxhy-core/src/main/resources/mapper/QssbMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/QssbMapper.xml
@@ -20,6 +20,14 @@
         <result column="je" property="je"/>
         <result column="se" property="se"/>
         <result column="deptName" property="businessName"/>
+        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageId"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <select id="selectQssbBySmb" parameterType="java.util.Map"
diff --git a/dxhy-core/src/main/resources/mapper/QstjbMapper.xml b/dxhy-core/src/main/resources/mapper/QstjbMapper.xml
index 6f43a63f..d3f2cf5b 100644
--- a/dxhy-core/src/main/resources/mapper/QstjbMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/QstjbMapper.xml
@@ -20,6 +20,14 @@
         <result column="je" property="je"/>
         <result column="se" property="se"/>
         <result column="deptName" property="businessName"/>
+        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageId"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <select id="selectQstjbByCxtj" parameterType="java.util.Map"
diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
index 0066b880..a1993371 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
@@ -222,9 +222,12 @@
         <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' ">
+        <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 != '1' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if
                 test="fillInStartDate != null and fillInEndDate != null and fillInStartDate != '' and fillInEndDate != ''">
             and t.fill_in_date between #{fillInStartDate} and #{fillInEndDate}