Merge remote-tracking branch 'origin/0803-add_column' into 0803-add_column

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;
+
 }

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;
 }

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;
+
 }

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;
+
 }

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;
 }

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;
 }

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;
 }

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;
+
 }

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;
+
 }

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;
+
 }

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;
 }

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;
+
 }

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;
 }

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;
+
 }

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/SgqsServiceImpl.java

@@ -67,6 +67,14 @@ public class SgqsServiceImpl extends MpBaseServiceImpl<SgqsDao, TDxInvoice> 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);
                     }
                 }

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<TDxExcelExportlog> exportLogs;
 

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 =
-        {"序号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "税款金额", "来源", "管理状态", "稽核结果", "是否申请核对", "核对结果", "是否录入不符项"};
+        {"序号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "税款金额", "来源", "管理状态", "稽核结果", "是否申请核对", "核对结果", "是否录入不符项","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     /**
      * 缓存合计数量

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 = {"序号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "管理状态", "税款金额", "税款所属期", "签收状态",
-        "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "业务单元"};
+        "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     /**
      * 缓存合计数量

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 = {"序号", "缴款书号码", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "管理状态", "来源",
-        "签收状态", "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元"};
+        "签收状态", "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     /**
      * 缓存合计数量

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 = {"序号", "签收描述", "签收日期", "签收状态", "签收人", "签收方式", "来源", "管理状态", "缴款书号码", "填发日期",
-        "缴款单位税号", "缴款单位名称", "税款金额", "稽核结果", "是否申请核对", "核对结果", "备注", "业务单元"};
+        "缴款单位税号", "缴款单位名称", "税款金额", "稽核结果", "是否申请核对", "核对结果", "备注", "业务单元","凭证号","过账时间","影像号","账期","报账单号",
+            "报账人","入账状态","所属组织"};
 
     /**
      * 缓存合计数量

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 = {"序号", "转内销证明编号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "转内销税款金额", "转内销抵扣税款金额",
-        "管理状态", "来源", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期"};
+        "管理状态", "来源", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态",
+            "所属组织","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     /**
      * 缓存合计数量

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 = {"序号", "转内销证明编号", "缴款书号码", "填发日期", "缴款单位税号", "缴款单位名称", "转内销税款金额", "转内销抵扣税款金额",
-        "管理状态", "来源", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态"};
+        "管理状态", "来源", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     /**
      * 缓存合计数量

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 = {"序号", "转内销证明编号", "发票代码", "发票号码", "发票类型", "发票状态", "开票日期", "购方税号", "购方名称",
-        "销方税号", "销方名称", "转内销金额", "转内销税额", "转内销抵扣税额", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期"};
+        "销方税号", "销方名称", "转内销金额", "转内销税额", "转内销抵扣税额", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     /**
      * 缓存合计数量

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 = {"序号", "转内销证明编号", "发票代码", "发票号码", "发票类型", "发票状态", "开票日期", "购方税号", "购方名称",
-        "销方税号", "销方名称", "转内销金额", "转内销税额", "转内销抵扣税额", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态"};
+        "销方税号", "销方名称", "转内销金额", "转内销税额", "转内销抵扣税额", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期",
+            "撤销认证处理状态","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     /**
      * 缓存合计数量

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<TDxExcelExportlog> 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);
         }

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

dxhy-core/src/main/resources/mapper/FpZhMapper.xml

@@ -79,7 +79,7 @@
     </resultMap>
 
     <sql id="Authentication_Check_Column_List">
-        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
     </sql>
 
     <select id="selectByPramsMap" parameterType="java.util.Map"

dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml

@@ -93,7 +93,14 @@
         SELECT
         <include refid="Base_Column_List"/>
         , b.gf_tax_no,b.gf_name,b.xf_name,b.invoice_date,b.invoice_status,b.invoice_amount,b.tax_amount
-        , b.rzh_date,b.invoice_type
+        , b.rzh_date,b.invoice_type,b.sn_voucher_number as snVoucherNumber,
+        b.posting_time as postingTime,
+        b.image_id as imageId,
+        b.account_period as account_period,
+        b.bzdh,
+        b.bzr,
+        b.inaccount_status as inaccountStatus,
+        b.comp_code as compCode
         FROM t_dx_record_invoice_out a
         LEFT JOIN t_dx_record_invoice b ON a.uuid = b.uuid
         <where>

dxhy-core/src/main/resources/mapper/QssbMapper.xml

@@ -29,7 +29,8 @@
         t.invoice_code fpdm, t.invoice_type invoiceType,t.invoice_no fphm,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')
         kprq,t.gf_tax_no gfsh,t.gf_name gfmc,
         t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.dept_name deptName
-        from t_dx_invoice t
+        ,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,bzr,r.inaccount_status,r.comp_code
+        from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid
         where t.qs_status = '0'
         and t.qs_date between #{qsrqq} and #{qsrqz}
         and t.gf_tax_no in

dxhy-core/src/main/resources/mapper/QstjbMapper.xml

@@ -28,7 +28,8 @@
         t.invoice_code fpdm,t.invoice_no fphm,t.invoice_type invoiceType,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')
         kprq,t.gf_tax_no gfsh,t.gf_name gfmc,
         t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.user_name qsr,t.dept_name deptName
-        from t_dx_invoice t
+        ,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,bzr,r.inaccount_status,r.comp_code
+        from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid
         where
         t.qs_date between #{qsrqq} and #{qsrqz}
         and t.valid = '1'
@@ -133,7 +134,14 @@
         select t.id id,t.uuid uuid,date_format(t.qs_date,'%Y-%m-%d') qsrq,t.qs_status qszt,t.qs_type qsfs,t.qs_name qsr,
         t.invoice_code fpdm,t.invoice_no fphm,t.invoice_type invoiceType,date_format(t.invoice_date,'%Y-%m-%d')
         kprq,t.gf_tax_no gfsh,t.gf_name gfmc,
-        t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.dept_name deptName
+        t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.dept_name deptName,t.sn_voucher_number as snVoucherNumber,
+        t.posting_time as postingTime,
+        t.image_id as imageId,
+        t.account_period as account_period,
+        t.bzdh,
+        t.bzr,
+        t.inaccount_status as inaccountStatus,
+        t.comp_code as compCode
         from t_dx_record_invoice t
         where t.qs_status = '1'
         and t.rzh_yesorno = '0'

dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml

@@ -24,7 +24,14 @@
         date_format(t.invoice_date,'%Y-%m-%d') kprq,
         t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.dk_tax_amount
         dkse,date_format(t.rzh_date,'%Y-%m-%d') rzrq,
-        t.invoice_type,t.rzh_yesorno dklx
+        t.invoice_type,t.rzh_yesorno dklx,t.sn_voucher_number as snVoucherNumber,
+        t.posting_time as postingTime,
+        t.image_id as imageId,
+        t.account_period as account_period,
+        t.bzdh,
+        t.bzr,
+        t.inaccount_status as inaccountStatus,
+        t.comp_code as compCode
         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.gf_tax_no in

dxhy-core/src/main/resources/mapper/SgqsMapper.xml

@@ -24,6 +24,7 @@
             resultMap="BaseResultMap" databaseId="mysql">
         select
         qs_status,invoice_code,invoice_no,ele_invoice_no,invoice_date,invoice_type,gf_name,xf_name,gf_tax_no,xf_tax_no,invoice_amount,tax_amount,dept_name
+        ,sn_voucher_number,posting_time,image_id,account_period,bzdh,bzr,inaccount_status,comp_code
         from t_dx_record_invoice t
         where
         qs_status = '0' and source_system='0'

dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml

@@ -437,12 +437,14 @@
         p.cxrz_status as cxrzStatus,
         p.bdk_status as bdkStatus,
         p.dept_name as businessName,
-        p.inaccount_status as inAccountStatus,
-        p.bzdh as bzdh,
-        p.image_id as imageNumber,
-        p.account_period as accountPeriod,
-        p.posting_time as postingTime,
-        p.sn_voucher_number as snVoucherNumber
+        t.sn_voucher_number as snVoucherNumber,
+        t.posting_time as postingTime,
+        t.image_id as imageId,
+        t.account_period as account_period,
+        t.bzdh,
+        t.bzr,
+        t.inaccount_status as inaccountStatus,
+        t.comp_code as compCode
         FROM
         t_dx_customs_record p
         where
@@ -843,7 +845,15 @@
         t.audit_status as auditStatus,
         t.apply_check as applyCheck,
         t.check_status as checkStatus,
-        t.entry_discrepancy as entryDiscrepancy
+        t.entry_discrepancy as entryDiscrepancy,
+        t.sn_voucher_number as snVoucherNumber,
+        t.posting_time as postingTime,
+        t.image_id as imageId,
+        t.account_period as account_period,
+        t.bzdh,
+        t.bzr,
+        t.inaccount_status as inaccountStatus,
+        t.comp_code as compCode
         FROM
         t_dx_customs_record t
         where t.qs_status = '0'
@@ -1012,8 +1022,16 @@
         t.scan_id AS scanId,
         t.data_sources as dataSources,
         t.dept_name as deptName
+        r.sn_voucher_number as snVoucherNumber,
+        r.posting_time as postingTime,
+        r.image_id as imageId,
+        r.account_period as account_period,
+        r.bzdh,
+        r.bzr,
+        r.inaccount_status as inaccountStatus,
+        r.comp_code as compCode
         FROM
-        t_dx_customs t
+        t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code
         where t.user_account = #{queryParams.userAccount}
         <if test="queryParams.gfTaxNoList!=null  and queryParams.gfTaxNoList.size>0">
             and t.gf_tax_no in
@@ -1171,6 +1189,14 @@
         confirm_user as confirmUser,
         rzh_belong_date as rzhBelongDate,
         dept_name as deptName
+        sn_voucher_number as snVoucherNumber,
+        posting_time as postingTime,
+        image_id as imageId,
+        account_period as account_period,
+        bzdh,
+        bzr,
+        inaccount_status as inaccountStatus,
+        comp_code as compCode
         from t_dx_customs_record
         where
         <include refid="queryCustomsRefundConfirm_sql"/>

dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml

@@ -172,6 +172,14 @@
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
         p.cxrz_status as cxrzStatus
+        p.sn_voucher_number as snVoucherNumber,
+        p.posting_time as postingTime,
+        p.image_id as imageId,
+        p.account_period as account_period,
+        p.bzdh,
+        p.bzr,
+        p.inaccount_status as inaccountStatus,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         where
@@ -359,6 +367,14 @@
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
         p.cxrz_status as cxrzStatus
+        p.sn_voucher_number as snVoucherNumber,
+        p.posting_time as postingTime,
+        p.image_id as imageId,
+        p.account_period as account_period,
+        p.bzdh,
+        p.bzr,
+        p.inaccount_status as inaccountStatus,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         where

dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml

@@ -75,6 +75,14 @@
         p.rzh_belong_date as rzhBelongDate,
         p.cxbdk_status as cxbdkStatus,
         p.cxrz_status as cxrzStatus
+        p.sn_voucher_number as snVoucherNumber,
+        p.posting_time as postingTime,
+        p.image_id as imageId,
+        p.account_period as account_period,
+        p.bzdh,
+        p.bzr,
+        p.inaccount_status as inaccountStatus,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where
@@ -358,6 +366,14 @@
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
         p.cxbdk_status as cxbdkStatus
+        p.sn_voucher_number as snVoucherNumber,
+        p.posting_time as postingTime,
+        p.image_id as imageId,
+        p.account_period as account_period,
+        p.bzdh,
+        p.bzr,
+        p.inaccount_status as inaccountStatus,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where 1=1