添加字段

dxhy-base/src/main/java/com/dxhy/base/model/BaseInvoiceRespVO.java

@@ -1,5 +1,6 @@
 package com.dxhy.base.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 /**
@@ -72,4 +73,24 @@ public class BaseInvoiceRespVO extends BaseBaseRespVO {
      * 价税合计
      */
     private String totalAmount;
+
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    @TableField("image_id")
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
 }

dxhy-customs/src/main/java/com/dxhy/customs/model/JkszhcxRespVO.java

@@ -177,10 +177,22 @@ public class JkszhcxRespVO implements Serializable {
      */
     private String inAccountDate;
 
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
     /**
-     * 入账状态
+     * 组织编码
      */
-    private String inaccountStatus;
+    private String compCode;
 
-    private String bzdh;
+    private String bzr;
+
+    private String inAccountStatus;
 }

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java

@@ -116,11 +116,11 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                         AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getYxTaxAmount())));
 
                     // 字典值转换
-                    String inaccountStatus = pageList.get(i).getInaccountStatus();
+                    String inaccountStatus = pageList.get(i).getInAccountStatus();
                     if ("1".equals(inaccountStatus)){
-                        pageList.get(i).setInaccountStatus("已入账");
+                        pageList.get(i).setInAccountStatus("已入账");
                     }else if ("0".equals(inaccountStatus)) {
-                        pageList.get(i).setInaccountStatus("未入账");
+                        pageList.get(i).setInAccountStatus("未入账");
                     }
                      String auditStatus = pageList.get(i).getAuditStatus();
                     pageList.get(i)
@@ -327,12 +327,10 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
         } else {
             vo.setInAccountDate(null);
         }
-        if ("0".equals(record.getInAccountStatus())) {
-            vo.setInaccountStatus("未入账");
-        } else if ("1".equals(record.getInAccountStatus())) {
-            vo.setInaccountStatus("已入账");
+        if ("1".equals(record.getInAccountStatus())) {
+            vo.setInAccountStatus("已入账");
         } else {
-            vo.setInaccountStatus("未入账");
+            vo.setInAccountStatus("未入账");
         }
         return vo;
     }

dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml

@@ -5,8 +5,6 @@
 
     <resultMap id="BaseResultMap"
                type="com.dxhy.customs.model.JkszhcxRespVO">
-        <result column="inaccountStatus" property="inaccountStatus"/>
-        <result column="bzdh" property="bzdh"/>
         <result column="customs_code" property="customsCode"/>
         <result column="fill_in_date" property="fillInDate"/>
         <result column="gf_tax_no" property="gfTaxNo"/>
@@ -29,6 +27,14 @@
         <result column="glzt" property="glzt"/>
         <result column="customs_scan_id" property="customsScanId"/>
         <result column="businessName" 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>
     <resultMap id="HjResultMap" type="java.util.Map">
         <result column="hjsl" property="hjsl" javaType="Long"/>
@@ -42,7 +48,8 @@
         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.customs_scan_id,t.dept_name businessName,t.inaccount_status inaccountStatus ,t.bzdh bzdh
+        t.customs_scan_id,t.dept_name businessName
+        ,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_customs_record t
         where export_mark = '0' and t.gf_tax_no in
         <foreach close=")" collection="gfsh" index="index" item="item" open="(" separator=",">

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java

@@ -91,6 +91,12 @@ public class DomesticCustomsExportCountServiceImpl extends MpBaseServiceImpl<Dom
                 map.put("yxExportTaxAmount",
                     AmountFormatUtil.fmtMicrometer(MathUtil.round((String)map.get("yxExportTaxAmount"))));
                 map.put("select", true);
+
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
             }
             Map mapTj = null;
             if (dto.getCurr() == 1) {

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticInvoiceExportCountServiceImpl.java

@@ -106,6 +106,12 @@ public class DomesticInvoiceExportCountServiceImpl extends MpBaseServiceImpl<Dom
                 map.put("exportTaxAmount",
                     AmountFormatUtil.fmtMicrometer(MathUtil.round(map.get("exportTaxAmount").toString())));
                 map.put("exportYxse", AmountFormatUtil.fmtMicrometer(MathUtil.round(map.get("exportYxse").toString())));
+
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
             }
 
             Map<String, Object> mapTj = null;

dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml

@@ -542,7 +542,15 @@
         p.bdk_status as bdkStatus,
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
-        p.cxrz_status as cxrzStatus
+        p.cxrz_status as cxrzStatus,
+        p.sn_voucher_number as snVoucherNumber,
+        p.posting_time as postingTime,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.bzdh,
+        p.bzr,
+        p.inaccount_status as inAccountStatus,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         where 1=1

dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml

@@ -554,7 +554,15 @@
         p.bdk_status as bdkStatus,
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
-        p.cxbdk_status as cxbdkStatus
+        p.cxbdk_status as cxbdkStatus,
+        p.sn_voucher_number as snVoucherNumber,
+        p.posting_time as postingTime,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.bzdh,
+        p.bzr,
+        p.inaccount_status as inAccountStatus,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where p.company = #{queryParams.company}

dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtTdxRecordInvoice.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import lombok.Data;
@@ -415,7 +416,6 @@ public class ExtTdxRecordInvoice implements Serializable {
     private String company;
     private String illegalSupplier;
     private String bdkStatus;
-    private String inAccountStatus;
     private Date inAccountDate;
     private Date collectDate;
 
@@ -424,4 +424,24 @@ public class ExtTdxRecordInvoice implements Serializable {
      */
     private String illegalEnterprise;
 
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    @TableField("image_id")
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
+
 }

dxhy-extend/src/main/java/com/dxhy/extend/model/ExtCautionAbnormalRespVO.java

@@ -1,5 +1,6 @@
 package com.dxhy.extend.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -53,4 +54,23 @@ public class ExtCautionAbnormalRespVO extends ExtBaseRespVO {
      * 发票类型 01-增值税专用发票 03-机动车销售统一发票 04-增值税普通发票 10-电子发票 11-卷票 14-通行费发票
      */
     private String invoiceType;
+
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
 }

dxhy-extend/src/main/java/com/dxhy/extend/model/ExtQssbRespVO.java

@@ -104,4 +104,23 @@ public class ExtQssbRespVO implements Serializable {
 
     /** 业务单元 */
     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;
 }

dxhy-extend/src/main/java/com/dxhy/extend/model/ExtQstjbRespVO.java

@@ -105,4 +105,23 @@ public class ExtQstjbRespVO implements Serializable {
     /** 业务单元 */
     private String businessName;
     private String scanId;
+
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
 }

dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java

@@ -273,6 +273,26 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl<ExtTdxRec
         vo.setTaxAmount(MathUtil.round(record.getTaxAmount().toPlainString()));
         // 发票类型
         vo.setInvoiceType(record.getInvoiceType());
+
+        vo.setPostingTime(record.getPostingTime());
+
+        vo.setAccountPeriod(record.getAccountPeriod());
+
+        vo.setBzdh(record.getBzdh());
+
+        vo.setBzr(record.getBzr());
+
+        vo.setSnVoucherNumber(record.getSnVoucherNumber());
+
+        vo.setImageNumber(record.getImageNumber());
+
+        vo.setCompCode(record.getCompCode());
+
+        if ("1".equals(record.getInAccountStatus())){
+            vo.setInAccountStatus("已入账");
+        }else {
+            vo.setInAccountStatus("未入账");
+        }
         return vo;
     }
 

dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtQssbServiceImpl.java

@@ -102,6 +102,12 @@ public class ExtQssbServiceImpl extends MpBaseServiceImpl<ExtQssbDao, ExtQssbRes
                 resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE,qsfs));
 
                 resultList.get(i).setXh(String.valueOf(i + start));
+
+                if ("1".equals(resultList.get(i).getInAccountStatus())){
+                    resultList.get(i).setInAccountStatus("已入账");
+                }else {
+                    resultList.get(i).setInAccountStatus("未入账");
+                }
             }
         }
         if (1 == curr) {

dxhy-extend/src/main/java/com/dxhy/extend/service/tjbb/impl/ExtQstjbServiceImpl.java

@@ -107,6 +107,12 @@ public class ExtQstjbServiceImpl extends MpBaseServiceImpl<ExtQstjbDao, ExtQstjb
                 resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE,qsfs));
 
                 resultList.get(i).setXh(String.valueOf(i + start));
+
+                if("1".equals(resultList.get(i).getInAccountStatus())){
+                    resultList.get(i).setInAccountStatus("已入账");
+                }else {
+                    resultList.get(i).setInAccountStatus("未入账");
+                }
             }
         }
 
@@ -164,6 +170,12 @@ public class ExtQstjbServiceImpl extends MpBaseServiceImpl<ExtQstjbDao, ExtQstjb
                 resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE,qsfs));
 
                 resultList.get(i).setXh(String.valueOf(i + start));
+
+                if ("1".equals(resultList.get(i).getInAccountStatus())){
+                    resultList.get(i).setInAccountStatus("已入账");
+                }else {
+                    resultList.get(i).setInAccountStatus("未入账");
+                }
             }
         }
         if (1 == curr) {

dxhy-extend/src/main/resources/mapper/ExtQssbMapper.xml

@@ -20,6 +20,14 @@
         <result column="se" property="se"/>
         <result column="deptName" property="businessName"/>
         <result column="invoiceType" property="invoiceType"/>
+        <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">
@@ -117,7 +125,8 @@
         t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.invoice_type
         invoiceType,t.user_name
         qsr,t.qs_type qsfs,t.dept_name deptName
-        from t_dx_invoice t
+        ,t1.sn_voucher_number,t1.posting_time,t1.image_id,t1.account_period,t1.bzdh,t1.bzr,t1.inaccount_status,t1.comp_code
+        from t_dx_invoice t left join t_dx_record_invoice t1 on t.uuid = t1.uuid
         where t.qs_status = '0'
         and t.qs_date between #{qsrqq} and #{qsrqz}
         and t.gf_tax_no in

dxhy-extend/src/main/resources/mapper/ExtQstjbMapper.xml

@@ -21,6 +21,14 @@
         <result column="deptName" property="businessName"/>
         <result column="invoiceType" property="invoiceType"/>
         <result column="scanId" property="scanId"/>
+        <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">
@@ -136,7 +144,9 @@
         t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.invoice_type
         invoiceType,t.user_name
         qsr,t.dept_name deptName,img.scan_id scanId
+        ,i.sn_voucher_number,i.posting_time,i.image_id,i.account_period,i.bzdh,i.bzr,i.inaccount_status,i.comp_code
         from t_dx_invoice t left join  t_dx_invoice_img img on t.scan_id = img.scan_id
+        left join t_dx_record_invoice i on t.uuid = i.uuid
         where
         t.qs_date between #{qsrqq} and #{qsrqz}
         and t.valid = '1'
@@ -331,13 +341,13 @@
         t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.invoice_type
         invoiceType,t.dept_name
         deptName
+        ,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.qs_status = '1'
         and t.rzh_yesorno = '0'
-        and t.invoice_type in ('01','03','08','14')
+        and t.invoice_type in ('01','03','08','14','31')
         and t.company = #{company}
         and t.qs_date between #{qsrqq} and #{qsrqz}
-
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}