diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseInvoiceRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseInvoiceRespVO.java index 0b72138a..f658382e 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseInvoiceRespVO.java +++ b/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; } diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/model/JkszhcxRespVO.java b/dxhy-customs/src/main/java/com/dxhy/customs/model/JkszhcxRespVO.java index 161dedb1..15ecc874 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/model/JkszhcxRespVO.java +++ b/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; } diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java index 61ffcfb3..3619e3f4 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java @@ -116,11 +116,11 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl - - @@ -29,6 +27,14 @@ + + + + + + + + @@ -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 diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java index c87e33f4..4f654adb 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java @@ -91,6 +91,12 @@ public class DomesticCustomsExportCountServiceImpl extends MpBaseServiceImpl mapTj = null; diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml index 7c9e30cf..b239828b 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml +++ b/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 diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml index 401f572b..3335534b 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml +++ b/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} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtTdxRecordInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtTdxRecordInvoice.java index 4fc97a21..ae0572f9 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtTdxRecordInvoice.java +++ b/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; + } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtCautionAbnormalRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtCautionAbnormalRespVO.java index fb583197..56b222c0 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtCautionAbnormalRespVO.java +++ b/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; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtQssbRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtQssbRespVO.java index 21173916..764c5059 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtQssbRespVO.java +++ b/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; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtQstjbRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtQstjbRespVO.java index 24c1a52d..743e637f 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtQstjbRespVO.java +++ b/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; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java index a0d2e063..0ced4b41 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java @@ -273,6 +273,26 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl + + + + + + + + @@ -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 diff --git a/dxhy-extend/src/main/resources/mapper/ExtQstjbMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtQstjbMapper.xml index b4a6e64e..e024275b 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtQstjbMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtQstjbMapper.xml @@ -21,6 +21,14 @@ + + + + + + + + @@ -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 #{item}