From cc0371a10db52b0571025ebe79db98a0826bb3d2 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sat, 5 Aug 2023 08:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=BB=93=E6=9E=9C=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/vo/AuthenticationCheckListVO.java   | 19 ++++++++++++++++++
 .../DomesticCustomsRefundServiceImpl.java     | 11 ++++++++++
 .../DomesticInvoiceDrawbackServiceImpl.java   |  5 +++++
 .../mapper/DomesticCustomsRecordMapper.xml    | 20 +++++++++++++++++--
 .../mapper/DomesticRecordInvoiceMapper.xml    |  9 +++++++++
 .../dxhy/extend/model/ExtRzjgqdRespVO.java    | 19 ++++++++++++++++++
 .../tjbb/impl/ExtRzjgqdServiceImpl.java       |  6 ++++++
 .../main/resources/mapper/ExtRzjgqdMapper.xml |  9 +++++++++
 8 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/vo/AuthenticationCheckListVO.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/vo/AuthenticationCheckListVO.java
index 39d62d0c..6b025c0a 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/vo/AuthenticationCheckListVO.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/vo/AuthenticationCheckListVO.java
@@ -85,4 +85,23 @@ public class AuthenticationCheckListVO implements Serializable {
     @ApiModelProperty("业务单元")
     private String businessName;
 
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
+
 }
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java
index 6259a14e..0be78d53 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java
@@ -108,6 +108,12 @@ public class DomesticCustomsRefundServiceImpl extends MpBaseServiceImpl<Domestic
                 String qsType = (String)map.get("qsType");
                 map.put("qsType", dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 if (map.get("fillInDate") != null) {
 //                    map.put("fillInDate", sdf.format(map.get("fillInDate")));
                     map.put("fillInDate",map.get("fillInDate") );
@@ -514,6 +520,11 @@ public class DomesticCustomsRefundServiceImpl extends MpBaseServiceImpl<Domestic
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, authStatus));
                 String rzlx = (String)map.get("rzlx");
                 map.put("rzlx", dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, rzlx));
+                if("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
 
                 if (map.get("fillInDate") != null) {
                     map.put("fillInDate", map.get("fillInDate"));
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java
index 11a44534..248d7b92 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java
@@ -368,6 +368,11 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
                 dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, result.getAuthenticationType()));
             result.setAuthenticationDetailStatus(
                 dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, result.getAuthenticationDetailStatus()));
+            if ("1".equals(result.getInAccountStatus())){
+                result.setInAccountStatus("已入账");
+            }else {
+                result.setInAccountStatus("未入账");
+            }
         });
         if (dto.getCurrentPage() == 1) {
             QuerySummaryDTO querySummaryDTO = domesticRecordInvoiceDao.selectTotalAmountByAuthenticationCheck(dto);
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticCustomsRecordMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticCustomsRecordMapper.xml
index a5907caf..9745a3e6 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticCustomsRecordMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticCustomsRecordMapper.xml
@@ -107,7 +107,15 @@
         rzh_belong_date as rzhBelongDate,
         glzt as glzt,
         entry_discrepancy as entryDiscrepancy,
-        dept_name as deptName
+        dept_name as deptName,
+        sn_voucher_number as snVoucherNumber,
+        posting_time as postingTime,
+        image_id as imageNumber,
+        account_period as accountPeriod,
+        bzdh,
+        bzr,
+        inaccount_status as inAccountStatus,
+        comp_code as compCode
         from t_dx_customs_record
         where
         <include refid="queryManualConfirm_mysql"/>
@@ -145,7 +153,15 @@
         auth_status as authStatus,
         confirm_user as confirmUser,
         rzh_belong_date as rzhBelongDate,
-        dept_name as deptName
+        dept_name as deptName,
+        sn_voucher_number as snVoucherNumber,
+        posting_time as postingTime,
+        image_id as imageNumber,
+        account_period as accountPeriod,
+        bzdh,
+        bzr,
+        inaccount_status as inAccountStatus,
+        comp_code as compCode
         from t_dx_customs_record
         where
         <include refid="queryCustomsRefundConfirm_mysql"/>
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
index 2b1adeda..264e92a9 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
@@ -1502,6 +1502,14 @@
         <result column="gx_user_name" jdbcType="VARCHAR" property="authenticationPerson"/>
         <result column="rzh_belong_date" jdbcType="VARCHAR" property="taxPeriod"/>
         <result column="business_name" jdbcType="VARCHAR" property="businessName"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <select databaseId="mysql" id="selectByPrimaryKey" parameterType="java.lang.Long"
@@ -1688,6 +1696,7 @@
             resultMap="authenticationCheckListMap">
         select
         <include refid="Authentication_Check_Column_List"/>
+        ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code
         from t_dx_record_invoice t
         left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code
         WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{invoiceStartTime} and #{invoiceEndTime}
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtRzjgqdRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtRzjgqdRespVO.java
index 0ec2ed5c..f17379e1 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtRzjgqdRespVO.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtRzjgqdRespVO.java
@@ -89,4 +89,23 @@ public class ExtRzjgqdRespVO implements Serializable {
      */
     private String dklx;
 
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
+
 }
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtRzjgqdServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtRzjgqdServiceImpl.java
index 252e05fd..08ff41c4 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtRzjgqdServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtRzjgqdServiceImpl.java
@@ -112,6 +112,12 @@ public class ExtRzjgqdServiceImpl extends MpBaseServiceImpl<ExtRzjgqdDao, ExtRzj
                 String dklx = resultList.get(i).getDklx();
                 resultList.get(i).setDklx(dictdetaServcice.queryDictName(DictConstant.FPDK_TYPE,dklx));
 
+                if ("1".equals(resultList.get(i).getInAccountStatus())){
+                    resultList.get(i).setInAccountStatus("已入账");
+                }else {
+                    resultList.get(i).setInAccountStatus("未入账");
+                }
+
                 resultList.get(i).setXh(String.valueOf(start + i));
             }
         }
diff --git a/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml
index cd4dee25..352ce3cc 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml
@@ -16,6 +16,14 @@
         <result column="se" property="se"/>
         <result column="dkse" property="dkse"/>
         <result column="rzrq" property="rzrq"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <resultMap id="HjxxMap" type="com.dxhy.extend.model.ExtTjbbHjxxVO">
@@ -32,6 +40,7 @@
         dkse,date_format(t.rzh_date,'%Y-%m-%d') rzrq,
         t.invoice_type,
         t.rzh_yesorno dklx
+        ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code
         from t_dx_record_invoice t
         where t.invoice_type in ('01','03','08','14','31') and t.auth_status = '4' <!--and rzh_yesorno='1'-->
         and t.company = #{company}