From 0e1e5740fb5c5f73a2ff9769deb2fa6c48c92777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Fri, 8 Dec 2023 17:04:45 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseInvoiceManualCheckServiceImpl.java    | 11 +++++++++
 .../resources/mapper/BaseSggxcxMapper.xml     |  3 ++-
 .../export/impl/RzFpxxServiceImpl.java        | 24 +++++++++++++------
 .../dxhy/core/thread/ManualAthensThread.java  |  2 +-
 .../src/main/resources/mapper/FpZhMapper.xml  |  3 ++-
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index 91a797c7..b7a03ff0 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -173,6 +173,17 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                         }
                     }
 
+                    String authStatus = pageList.get(i).getAuthStatus();
+                    if ("0".equals(authStatus) || "6".equals(authStatus)){
+                        vo.setRzzt("未认证");
+                    }
+                    if ("1".equals(authStatus) || "2".equals(authStatus) || "3".equals(authStatus)){
+                        vo.setRzzt("认证中");
+                    }
+                    if ("5".equals(authStatus)){
+                        vo.setRzzt("认证失败");
+                    }
+
                     String businessCode = pageList.get(i).getDeptId();
                     String businessName = this.getBusinessName(businessCode, businessList);
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index d37d8305..4bad8a0d 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -36,6 +36,7 @@
         <result column="suspend_date" property="suspendDate"/>
         <result column="bzr" property="bzr"/>
         <result column="uuid" property="uuid"/>
+        <result column="auth_status" property="authStatus"/>
     </resultMap>
     <resultMap id="hjResultMap"
                type="com.dxhy.base.entity.BaseTDxRecordInvoice">
@@ -79,7 +80,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.suspend_status,t.suspend_date,
+        else 2 end authStatus,t.bzdh,t.suspend_status,t.suspend_date,t.auth_status,
         t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no,t.tax_rate
         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
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 e90e8518..0ed8d721 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
@@ -72,7 +72,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[26];
+                        String[] dataArray = new String[27];
                         dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                         dataArray[1] = pageList.get(i).getInvoiceCode();
                         dataArray[2] = pageList.get(i).getInvoiceNo();
@@ -108,16 +108,26 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                         }else {
                             dataArray[21] = "未入账";
                         }
+                        String authStatus = pageList.get(i).getAuthStatus();
+                        if ("0".equals(authStatus) || "6".equals(authStatus)){
+                            dataArray[22] = "未认证";
+                        }
+                        if ("1".equals(authStatus) || "2".equals(authStatus) || "3".equals(authStatus)){
+                            dataArray[22] = "认证中";
+                        }
+                        if ("5".equals(authStatus)){
+                            dataArray[22] = "认证失败";
+                        }
 
-                        dataArray[22] = pageList.get(i).getCompCode();
+                        dataArray[23] = pageList.get(i).getCompCode();
                         if ("1".equals(pageList.get(i).getSuspendStatus())){
-                            dataArray[23] = "是";
-                            dataArray[24] = pageList.get(i).getSuspendDate();
+                            dataArray[24] = "是";
+                            dataArray[25] = pageList.get(i).getSuspendDate();
                         }else {
-                            dataArray[23] = "否";
-                            dataArray[24] = "";
+                            dataArray[24] = "否";
+                            dataArray[25] = "";
                         }
-                        dataArray[25] = pageList.get(i).getTaxRate();
+                        dataArray[26] = pageList.get(i).getTaxRate();
 
 
 
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 a9af7e2f..3c3b4261 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
@@ -67,7 +67,7 @@ public class ManualAthensThread extends BaseThread {
      * 导出excel的列名
      */
     private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
-            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","所属组织"
+            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","认证状态","所属组织"
     ,"暂挂状态","暂挂区间","税率"};
 
 
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 1248423f..4a87c1e2 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -540,6 +540,7 @@
         <result column="suspend_date" property="suspendDate"/>
         <result column="comp_code" property="compCode"/>
         <result column="tax_rate" property="taxRate"/>
+        <result column="auth_status" property="authStatus"/>
     </resultMap>
     <select id="selectByparams"  parameterType="java.util.Map"
             resultMap="SggxcxResultMap" databaseId="mysql">
@@ -549,7 +550,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,t.suspend_status,t.suspend_date,t.tax_rate,
+        else 2 end authStatus,t.bzdh,t.bzr,t.suspend_status,t.suspend_date,t.tax_rate,t.auth_status,
         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

From 4b7eee4642619164d045781969cc276bfb4e235b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Fri, 8 Dec 2023 17:38:29 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/thread/ManualAthensThread.java   | 14 +++++++++-----
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 11 ++++++++++-
 2 files changed, 19 insertions(+), 6 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 3c3b4261..6065edef 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
@@ -13,6 +13,7 @@ import com.dxhy.common.util.CustomCellWriteHandler;
 import com.dxhy.common.util.ExceptionUtil;
 import com.dxhy.common.util.StringHelper;
 import com.dxhy.common.utils.DateUtils;
+import com.dxhy.common.utils.R;
 import com.dxhy.core.entity.TDxExcelExportlog;
 import com.dxhy.core.feign.IFeginWebsocket;
 import com.dxhy.core.rabbitmq.Sender;
@@ -22,7 +23,8 @@ import com.dxhy.core.service.singletable.IExcelExportlogService;
 import com.dxhy.core.util.JsonResponseUtils;
 import com.dxhy.oss.service.FileService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -161,6 +163,8 @@ public class ManualAthensThread extends BaseThread {
                 String imageNumber = prams.getString("imageNumber");
                 String postingTimeEnd = prams.getString("postingTimeEnd");
                 String postingTimeStart = prams.getString("postingTimeStart");
+                String kpksrq =  prams.getString("kpksrq");
+                String kpjsrq =  prams.getString("kpjsrq");
 
                 List<String> companyCodes = companyCodeArray.toJavaList(String.class);
                 // 参数转换为需要的形式
@@ -192,11 +196,11 @@ public class ManualAthensThread extends BaseThread {
                 if (cjjsyf != null && !"".equals(cjjsyf)) {
                     pramsMap.put("cjjsyf", DateUtils.getNight(DateUtils.strToDate(cjjsyf)));
                 }
-                if (prams.get("kpksrq") != null && !"".equals(prams.get("kpksrq"))) {
-                    pramsMap.put("kpksrq",prams.getString("kpksrq"));
+                if (!StringUtils.isBlank(kpksrq)) {
+                    pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(kpksrq)));
                 }
-                if (prams.get("kpjsrq") != null && !"".equals(prams.get("kpjsrq"))) {
-                    pramsMap.put("kpjsrq",prams.getString("kpjsrq"));
+                if (!StringUtils.isBlank(kpjsrq)) {
+                    pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(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/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 4a87c1e2..7e6fff41 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -557,7 +557,7 @@
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
         and t.rzh_yesorno = '0'
-        and t.auth_status in('0','5','6')
+        and t.auth_status in('0', '2', '3', '5', '6')
         and t.export_mark = '0'
         and t.inaccount_status = '1'
         and t.company = #{company}
@@ -612,6 +612,15 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
+        <if test="rzzt == '0'.toString()">
+            and t.auth_status = #{rzzt}
+        </if>
+        <if test="rzzt == '1'.toString()">
+            and (t.auth_status = '2' or t.auth_status = '3')
+        </if>
+        <if test="rzzt == '2'.toString()">
+            and t.auth_status = '5'
+        </if>
         <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
             and t.suspend_status = '1'
         </if>

From 1864611d52e1109ed9688fc270b8d8f24c06d919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Mon, 11 Dec 2023 09:35:51 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9C=AA=E8=AE=A4=E8=AF=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=B2=E6=92=A4=E9=94=80=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 7e6fff41..d7c73271 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -613,7 +613,7 @@
             and t.bzr like concat('%',#{bzr},'%')
         </if>
         <if test="rzzt == '0'.toString()">
-            and t.auth_status = #{rzzt}
+            and t.auth_status in ('1','2')
         </if>
         <if test="rzzt == '1'.toString()">
             and (t.auth_status = '2' or t.auth_status = '3')

From 0137d0971f6c78e2b4c5978bb8f2a898b5e72ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Mon, 11 Dec 2023 10:40:15 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=AA=E8=AE=A4=E8=AF=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B7=B2=E6=92=A4=E9=94=80?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index d7c73271..0eeba763 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -613,7 +613,7 @@
             and t.bzr like concat('%',#{bzr},'%')
         </if>
         <if test="rzzt == '0'.toString()">
-            and t.auth_status in ('1','2')
+            and t.auth_status in ('1','6')
         </if>
         <if test="rzzt == '1'.toString()">
             and (t.auth_status = '2' or t.auth_status = '3')

From f4eb8b10e43dcbc08aeabee67ff3e428c445b96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 12 Dec 2023 11:14:24 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=BA=E6=9C=AA=E8=AE=A4=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +-
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 4bad8a0d..bb71ff86 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -131,7 +131,7 @@
             and t.qs_status = #{qszt}
         </if>
         <if test="rzzt == '0'.toString()">
-            and t.auth_status = #{rzzt}
+            and t.auth_status in ('0','6')
         </if>
         <if test="rzzt == '1'.toString()">
             and (t.auth_status = '2' or t.auth_status = '3')
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 0eeba763..858c2145 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -613,7 +613,7 @@
             and t.bzr like concat('%',#{bzr},'%')
         </if>
         <if test="rzzt == '0'.toString()">
-            and t.auth_status in ('1','6')
+            and t.auth_status in ('0','6')
         </if>
         <if test="rzzt == '1'.toString()">
             and (t.auth_status = '2' or t.auth_status = '3')

From 1b77523c92b757e37b8a8202aee9a661ad0232c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 12 Dec 2023 11:19:45 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=BA=E6=9C=AA=E8=AE=A4=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index bb71ff86..66881f4f 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -453,7 +453,7 @@
             and t.qs_status = #{qszt}
         </if>
         <if test="rzzt == '0'.toString()">
-            and t.auth_status = #{rzzt}
+            and t.auth_status in ('0','6')
         </if>
         <if test="rzzt == '1'.toString()">
             and (t.auth_status = '2' or t.auth_status = '3')