diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java index 3adf42ac..76777b12 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java @@ -266,4 +266,10 @@ public class ExtAddTaxInvoice implements Serializable { private String systemName; private String collectDate; private String collectFrom; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/entity/TDxRecordInvoiceDetail.java b/dxhy-core/src/main/java/com/dxhy/core/job/entity/TDxRecordInvoiceDetail.java index 41fe4dc9..9f74da79 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/entity/TDxRecordInvoiceDetail.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/entity/TDxRecordInvoiceDetail.java @@ -63,6 +63,10 @@ public class TDxRecordInvoiceDetail implements Serializable { * 税率 */ private String taxRate; + /** + * 税码 + */ + private String taxCode; /** * 税额 */ diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/JkszhcxRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/JkszhcxRespVO.java index b8b7d0a5..8d6ac70a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/JkszhcxRespVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/JkszhcxRespVO.java @@ -153,4 +153,10 @@ public class JkszhcxRespVO implements Serializable { * 认证方式 */ private String rzhType; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java index 95d29c56..4ea097a2 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java @@ -50,7 +50,7 @@ public class CustomsServiceImpl extends MpBaseServiceImpl returnList = new ArrayList<>(); String[] titleColumns = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对", "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", - "签收日期", "签收人", "入账月份", "入账状态", "凭证号", "业务单元", "入池时间"}; + "签收日期", "签收人", "入账月份", "入账状态", "凭证号", "业务单元", "入池时间","凭证号","入账时间","账期","影像id"}; // 用于页面返回list对象 if (pageList.size() > 0) { for (int i = 0; i < pageList.size(); i++) { @@ -119,6 +119,10 @@ public class CustomsServiceImpl extends MpBaseServiceImpl 0) { for (int i = 0; i < pageList.size(); i++) { - String[] dataArray = new String[32]; + String[] dataArray = new String[36]; dataArray[0] = String.valueOf((curr - 1) * size + i + 1); // 发票类型 dataArray[1] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType()); @@ -298,6 +298,10 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl and DATE_FORMAT(t.qs_date, '%Y-%m') like CONCAT(#{skssq},'%') + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + + order by t.fill_in_date desc diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml index 1f6d0c4c..ae8d3fe1 100644 --- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml +++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml @@ -173,6 +173,10 @@ t.source_system sourceSystem, t.is_sale_list listStatus, t.remark remark, + t.sn_voucher_number snVoucherName, + t.postingTime, + t.image_id imageId, + t.account_period accountPeriod, t.document_number documentNumber, DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate, t.collect_from collectFrom @@ -235,6 +239,18 @@ and t.invoice_source = #{invoiceSource} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + @@ -222,6 +234,18 @@ and DATE_FORMAT(t.qs_date, '%Y-%m') like CONCAT(#{skssq},'%') + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 624598e3..1a610eeb 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -109,6 +109,15 @@ and t.qs_type = #{qsfs} + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + and t.payment_status = #{inAccountStatus} @@ -218,6 +227,15 @@ test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'"> and t.payment_status = #{inAccountStatus} + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth} @@ -319,6 +337,18 @@ AND qs_type = #{qsfs} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + GROUP BY uuid having min(create_date) ORDER BY create_date DESC @@ -383,6 +413,18 @@ and t.invoice_source = #{invoiceSource} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + @@ -102,5 +114,17 @@ and t.company = #{company} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} +