diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java index 356a2792..6e382ea4 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java @@ -187,4 +187,13 @@ public class TDxInvoice implements Serializable { private String voucherNumber; + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxRecordInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxRecordInvoice.java index b1c2fe1c..e42f6283 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxRecordInvoice.java +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxRecordInvoice.java @@ -428,4 +428,13 @@ public class TDxRecordInvoice implements Serializable { //触发企业管控规则 0-否 1-是 private String illegalEnterprise; private String bdkMessage; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/AuthenticationCheckListVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/AuthenticationCheckListVO.java index 0c868a12..013c3656 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/AuthenticationCheckListVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/AuthenticationCheckListVO.java @@ -85,4 +85,28 @@ public class AuthenticationCheckListVO implements Serializable { @ApiModelProperty("业务部门") private String deptId; + @ApiModelProperty("凭证号") + private String snVoucherNumber; + + @ApiModelProperty("过账日期") + private String postingTime; + + @ApiModelProperty("影像id") + private String imageId; + + @ApiModelProperty("账期") + private String accountPeriod; + + @ApiModelProperty("所属组织") + private String compCode; + + @ApiModelProperty("入账状态") + private String inaccountStatus; + + @ApiModelProperty("报账单号") + private String bzdh; + + @ApiModelProperty("报账人") + private String bzr; + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java index bfac8680..d41e3712 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java @@ -37,4 +37,13 @@ public class CustomsCollectVO { private String remark; private String deptName; + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java index c2cc54f8..bf7c14fa 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java @@ -37,4 +37,13 @@ public class CustomsRecordVO { private String confirmUser; private String rzhBelongDate; private String deptName; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRzcxVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRzcxVO.java index ea338543..fb1c927a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRzcxVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRzcxVO.java @@ -30,4 +30,13 @@ public class CustomsRzcxVO { private String cxrzStatus; private String bdkStatus; private String businessName; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ExceptionInvoiceVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/ExceptionInvoiceVo.java index cb2d73c3..674d6db3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/ExceptionInvoiceVo.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/ExceptionInvoiceVo.java @@ -23,4 +23,13 @@ public class ExceptionInvoiceVo { private String qsDate; private String qsStatusName; private String noTaxAmount; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java index 4fadfcaf..3be7a7e1 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java @@ -33,4 +33,13 @@ public class ExportCustomsRzcxVO { private String exportTaxAmount; private String yxExportTaxAmount; + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java index 36d6d7c5..8c77333b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java @@ -32,4 +32,13 @@ public class ExportInvoiceRzcxVO { private String cxbdkStatus; private String cxrzStatus; + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceOutVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceOutVO.java index fcd16f0d..13997126 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceOutVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceOutVO.java @@ -28,4 +28,13 @@ public class InvoiceOutVO { private String invoiceType; private String invoiceStatusName; + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java index 52b45d7c..ed1d1d72 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java @@ -100,4 +100,13 @@ public class QssbRespVO implements Serializable { */ private String businessName; private String deptName; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java index 9b6e64bf..c36e3818 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java @@ -104,4 +104,14 @@ public class QstjbRespVO implements Serializable { */ private String businessName; private String deptName; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ReceiptInvoiceView.java b/dxhy-core/src/main/java/com/dxhy/core/model/ReceiptInvoiceView.java index e16b5ffc..f30e4287 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/ReceiptInvoiceView.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/ReceiptInvoiceView.java @@ -121,4 +121,13 @@ public class ReceiptInvoiceView implements Serializable { private String certDate; private String outBelongDate; + + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java index be8d4b2b..8ebcdfad 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java @@ -38,4 +38,13 @@ public class SignQueryVO { private String qsType; private String voucherNumber; + private String snVoucherNumber; + private String postingTime; + private String imageId; + private String accountPeriod; + private String compCode; + private String inaccountStatus; + private String bzdh; + private String bzr; + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java index 4bfb21f1..324adf03 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java @@ -67,6 +67,14 @@ public class SgqsServiceImpl extends MpBaseServiceImpl impl vo.setXfTaxNo(pageList.get(i).getXfTaxNo()); vo.setInvoiceAmount(MathUtil.round(pageList.get(i).getInvoiceAmount().toPlainString())); vo.setTaxAmount(MathUtil.round(pageList.get(i).getTaxAmount().toPlainString())); + vo.setSnVoucherNumber(pageList.get(i).getSnVoucherNumber()); + vo.setPostingTime(pageList.get(i).getPostingTime()); + vo.setImageId(pageList.get(i).getImageId()); + vo.setAccountPeriod(pageList.get(i).getAccountPeriod()); + vo.setCompCode(pageList.get(i).getCompCode()); + vo.setInaccountStatus(pageList.get(i).getInaccountStatus()); + vo.setBzr(pageList.get(i).getBzr()); + vo.setBzdh(pageList.get(i).getBzdh()); returnList.add(vo); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java index 4fbba164..55646440 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java @@ -68,7 +68,7 @@ public class CautionExportAnomalyThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = - {"序号", "异常日期", "发票类型", "发票代码", "发票号码", "开票日期", "异常状态", "购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额"}; + {"序号", "异常日期", "发票类型", "发票代码", "发票号码", "开票日期", "异常状态", "购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final List exportLogs; diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java index eac751b7..36a0c226 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java @@ -61,7 +61,7 @@ public class CustomsManualSignThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = - {"序号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "税款金额", "来源", "管理状态", "稽核结果", "是否申请核对", "核对结果", "是否录入不符项"}; + {"序号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "税款金额", "来源", "管理状态", "稽核结果", "是否申请核对", "核对结果", "是否录入不符项","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; /** * 缓存合计数量 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java index 138056ca..090b5e94 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java @@ -62,7 +62,7 @@ public class CustomsRefundVeriThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "管理状态", "税款金额", "税款所属期", "签收状态", - "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "业务单元"}; + "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; /** * 缓存合计数量 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java index 525b0d79..194a4453 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java @@ -59,7 +59,7 @@ public class CustomsRzcxExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "缴款书号码", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "管理状态", "来源", - "签收状态", "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元"}; + "签收状态", "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; /** * 缓存合计数量 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java index b41cec8b..1ec1a777 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java @@ -62,7 +62,8 @@ public class CustomsSignQueryThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "签收描述", "签收日期", "签收状态", "签收人", "签收方式", "来源", "管理状态", "缴款书号码", "填发日期", - "缴款单位税号", "缴款单位名称", "税款金额", "稽核结果", "是否申请核对", "核对结果", "备注", "业务单元"}; + "缴款单位税号", "缴款单位名称", "税款金额", "稽核结果", "是否申请核对", "核对结果", "备注", "业务单元","凭证号","过账时间","影像号","账期","报账单号", + "报账人","入账状态","所属组织"}; /** * 缓存合计数量 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java index 6ae92d34..24dfa96e 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java @@ -62,7 +62,8 @@ public class ExportCustomsQueryThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "转内销证明编号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "转内销税款金额", "转内销抵扣税款金额", - "管理状态", "来源", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期"}; + "管理状态", "来源", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态", + "所属组织","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; /** * 缓存合计数量 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java index b8555472..89f9152b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java @@ -57,7 +57,7 @@ public class ExportCustomsRzcxExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "转内销证明编号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "转内销税款金额", "转内销抵扣税款金额", - "管理状态", "来源", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态"}; + "管理状态", "来源", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; /** * 缓存合计数量 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java index 9df8b380..fc067875 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java @@ -64,7 +64,7 @@ public class ExportInvoiceQueryThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "转内销证明编号", "发票代码", "发票号码", "发票类型", "发票状态", "开票日期", "购方税号", "购方名称", - "销方税号", "销方名称", "转内销金额", "转内销税额", "转内销抵扣税额", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期"}; + "销方税号", "销方名称", "转内销金额", "转内销税额", "转内销抵扣税额", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; /** * 缓存合计数量 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java index 058f39c5..090bc1c6 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java @@ -56,7 +56,8 @@ public class ExportInvoiceRzcxExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "转内销证明编号", "发票代码", "发票号码", "发票类型", "发票状态", "开票日期", "购方税号", "购方名称", - "销方税号", "销方名称", "转内销金额", "转内销税额", "转内销抵扣税额", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态"}; + "销方税号", "销方名称", "转内销金额", "转内销税额", "转内销抵扣税额", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", + "撤销认证处理状态","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; /** * 缓存合计数量 diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java index bbde2546..6b5a4351 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java @@ -77,7 +77,7 @@ public class InvoiceOutExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "转出日期", "发票代码", "发票号码", "发票类型", "开票日期", "发票状态", "购方税号", "购方名称", "销方名称", - "金额", "税额", "转出金额", "转出税额", "转出属期", "转出原因", "转出备注"}; + "金额", "税额", "转出金额", "转出税额", "转出属期", "转出原因", "转出备注","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final List exportLogs; @@ -324,6 +324,15 @@ public class InvoiceOutExportThread extends BaseThread { // 转出备注 vo.setRemark(view.getOutRemark()); + vo.setSnVoucherNumber(view.getSnVoucherNumber()); + vo.setPostingTime(view.getPostingTime()); + vo.setImageId(view.getImageId()); + vo.setAccountPeriod(view.getAccountPeriod()); + vo.setCompCode(view.getCompCode()); + vo.setInaccountStatus(view.getInaccountStatus()); + vo.setBzr(view.getBzr()); + vo.setBzdh(view.getBzdh()); + // 数组构建完毕放入list中 dataList.add(vo); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java index 1f629a79..b0ee510f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java @@ -59,7 +59,7 @@ public class QssbExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "签收日期", "签收方式", "签收人", "发票代码", "发票号码", "发票类型", "开票日期", "购方税号", "购方名称", - "销方税号", "销方名称", "金额", "税额", "业务单元"}; + "销方税号", "销方名称", "金额", "税额", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java index a536918a..df54e276 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java @@ -59,7 +59,7 @@ public class QstjbExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "签收日期", "签收状态", "签收方式", "签收人", "发票代码", "发票号码", "发票类型", "开票日期", "购方税号", - "购方名称", "销方税号", "销方名称", "金额", "税额", "业务单元"}; + "购方名称", "销方税号", "销方名称", "金额", "税额", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java index 7a2812bb..092d2b0c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java @@ -57,7 +57,7 @@ public class RzjgqdExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = - {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "销方税号", "销方名称", "金额", "税额", "抵扣税额", "认证日期", "抵扣类型"}; + {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "销方税号", "销方名称", "金额", "税额", "抵扣税额", "认证日期", "抵扣类型","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java index 8417bbb3..a6f6a5bc 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java @@ -58,7 +58,7 @@ public class SgqsExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = - {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额"}; + {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java index f7cffd3c..9b3693d7 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java @@ -61,7 +61,8 @@ public class TaxRebateAuthenticationThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型", "发票状态", "开票日期", "购方税号", "购方名称", "销方税号", "销方名称", - "金额", "税额", "签收状态", "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "业务单元"}; + "金额", "税额", "签收状态", "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "业务单元", + "凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java index 4031a288..bde9b9d0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java @@ -59,7 +59,7 @@ public class YqswrzExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "签收日期", "签收方式", "签收人", "发票代码", "发票号码", "发票类型", "开票日期", "购方税号", "购方名称", - "销方税号", "销方名称", "金额", "税额", "业务单元"}; + "销方税号", "销方名称", "金额", "税额", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 4fac446c..d85bf11b 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -79,7 +79,7 @@ - t.id,invoice_code,invoice_no,invoice_type,invoice_status,DATE_FORMAT(invoice_date,'%Y-%m-%d') invoice_date,gf_tax_no,gf_name,xf_tax_no,xf_name,invoice_amount,tax_amount,qs_status,date_format(qs_date,'%Y-%m-%d') qs_date,qs_type,qs_name,date_format(rzh_date,'%Y-%m-%d') rzh_date,rzh_yesorno,auth_status,rzlx,gx_user_name,rzh_belong_date,b.business_name dept_id + t.id,invoice_code,invoice_no,invoice_type,invoice_status,DATE_FORMAT(invoice_date,'%Y-%m-%d') invoice_date,gf_tax_no,gf_name,xf_tax_no,xf_name,invoice_amount,tax_amount,qs_status,date_format(qs_date,'%Y-%m-%d') qs_date,qs_type,qs_name,date_format(rzh_date,'%Y-%m-%d') rzh_date,rzh_yesorno,auth_status,rzlx,gx_user_name,rzh_belong_date,b.business_name dept_id,sn_voucher_number,posting_time,image_id,account_period,bzdh,bzr,inaccount_status,comp_code