From 8c4fef7c8cdb392bb547accce3a6d6f15b0e5ded Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 22 May 2023 21:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E5=B7=A5=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=8A=A0=E4=B8=8A=E6=9A=82?=
 =?UTF-8?q?=E6=8C=82=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/core/model/FpRzRespVO.java   |  4 ++++
 .../core/service/export/impl/RzFpxxServiceImpl.java |  5 ++++-
 .../com/dxhy/core/thread/ManualAthensThread.java    |  7 ++++++-
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml  | 13 ++++++++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
index 52199b45..7b4bbfdc 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
@@ -225,4 +225,8 @@ public class FpRzRespVO implements Serializable {
     private String accountPeriod;
 
     private String bzr;
+
+    private String suspendStatus;
+
+    private String suspendDate;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
index b01ef5f3..e6e2c49b 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
@@ -71,7 +71,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                 List<String[]> returnList = new ArrayList<>();
                 if (resultList != null && resultList.size() > 0) {
                     for (int i = 0; i < pageList.size(); i++) {
-                        String[] dataArray = new String[23];
+                        String[] dataArray = new String[25];
                         dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                         dataArray[1] = pageList.get(i).getInvoiceCode();
                         dataArray[2] = pageList.get(i).getInvoiceNo();
@@ -97,6 +97,8 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                         dataArray[19] = pageList.get(i).getBzdh();
                         dataArray[20] = pageList.get(i).getBzr();
                         dataArray[21] = pageList.get(i).getCompCode();
+                        dataArray[22] = pageList.get(i).getSuspendStatus();
+                        dataArray[23] = pageList.get(i).getSuspendDate();
 
                         returnList.add(dataArray);
                     }
@@ -199,6 +201,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
 
     @Override
     public JSONObject selectByPramsMap(Map<String, Object> pramsMap, int curr, int size) {
+        log.info("认证查询导出查询入参为{}",pramsMap);
         DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
         JSONObject json = new JSONObject();
         try {
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 01c803ff..e4a1cfcb 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
@@ -66,7 +66,8 @@ public class ManualAthensThread extends BaseThread {
      * 导出excel的列名
      */
     private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
-            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","所属组织"};
+            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","所属组织"
+    ,"暂挂状态","暂挂区间"};
 
 
     /**
@@ -148,6 +149,8 @@ public class ManualAthensThread extends BaseThread {
                 String cjjsyf = prams.getString("cjjsyf");
                 String gfTaxNo = prams.getString("gfTaxNo");
                 String bzr = prams.getString("bzr");
+                String suspendStatus = prams.getString("suspendStastus");
+                String suspendDate = prams.getString("suspendDate");
                 String inAccountStatus = prams.getString("inAccountStatus");
                 String inAccountMonth = prams.getString("inAccountMonth");
                 JSONArray companyCodeArray = prams.getJSONArray("companyCodes");
@@ -158,6 +161,8 @@ public class ManualAthensThread extends BaseThread {
                 pramsMap.put("bzdh",bzdh);
                 pramsMap.put("bzr",bzr);
                 pramsMap.put("businessCode",businessCode);
+                pramsMap.put("suspendStatus",suspendStatus);
+                pramsMap.put("suspendDate",suspendDate);
                 List<String> gfshList = new ArrayList<>();
                 if (!StringHelper.isBlank(gfsh)) {
                     gfshList = StringHelper.stringToList(gfsh);
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index b066e363..e1c114df 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -487,6 +487,8 @@
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
         <result column="bzdh" property="bzdh"/>
         <result column="bzr" property="bzr"/>
+        <result column="suspend_status" property="suspendStatus"/>
+        <result column="suspend_date" property="suspendDate"/>
         <result column="comp_code" property="compCode"/>
     </resultMap>
     <select id="selectByparams"  parameterType="java.util.Map"
@@ -497,7 +499,7 @@
         ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,
         case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when
         true then 1
-        else 2 end authStatus,t.bzdh,t.bzr,
+        else 2 end authStatus,t.bzdh,t.bzr,t.suspend_status,t.suspend_date,
         t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
         from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
         left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq
@@ -541,6 +543,15 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
+        <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
+            and t.suspend_status = '1'
+        </if>
+        <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '0'.toString()">
+            and (t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0')
+        </if>
+        <if test="suspendDate != null and suspendDate != '' and suspendDate != 'null' ">
+            and t.suspend_date = #{suspendDate}
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
             and t.inaccount_status = #{inAccountStatus}
         </if>