diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java
index 252e0072..919988ce 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java
@@ -88,7 +88,6 @@ public class SignFpqsController extends AbstractController {
return ResponseEntity.ok(R.error("购方税号不能为空"));
}
String gfsh = (String) pramsMap.get("gfsh");
-// gfshList.add(gfsh);
pramsMap.put("gfsh", gfsh);
if (pramsMap.get("companyCode") == null || "".equals(pramsMap.get("companyCode"))){
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java b/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java
index c924fc42..d269aeb6 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java
@@ -86,5 +86,32 @@ public class QsExcelEntity {
@ExcelProperty("签收时间")
private Date qsDate;
+ //凭证号
+ @ExcelProperty("凭证号")
+ private String snVoucherNumber;
+ //账期
+ @ExcelProperty("账期")
+ private String accountPeriod;
+ //过账时间
+ @ExcelProperty("过账时间")
+ private String postingTime;
+ //影像号
+ @ExcelProperty("影像号")
+ private String imageNumber;
+ //报账单号
+ @ExcelProperty("报账单号")
+ private String bzdh;
+ /**
+ * 组织编码
+ */
+ @ExcelProperty("组织编码")
+ private String compCode;
+
+ @ExcelProperty("报账人")
+ private String bzr;
+
+ @ExcelProperty("入账状态")
+ private String inAccountStatus;
+
}
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxRecordInvoice.java b/dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxRecordInvoice.java
index b7a6223b..ddb4aef5 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxRecordInvoice.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxRecordInvoice.java
@@ -427,4 +427,24 @@ public class TDxRecordInvoice implements Serializable {
private String scanId;
private String invoiceSource;
+ //凭证号
+ 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-sign/src/main/java/com/dxhy/sign/model/SgqsWqsfpVO.java b/dxhy-sign/src/main/java/com/dxhy/sign/model/SgqsWqsfpVO.java
index 3383ebf5..477402e2 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/model/SgqsWqsfpVO.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/model/SgqsWqsfpVO.java
@@ -1,5 +1,6 @@
package com.dxhy.sign.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.io.Serializable;
@@ -81,4 +82,23 @@ public class SgqsWqsfpVO implements Serializable {
private String uuid;
+ //凭证号
+ 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-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
index fbc984e3..3f435914 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
@@ -230,6 +230,18 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl
+
+
+
+
+
+
+
+
@@ -30,7 +38,7 @@
resultMap="BaseResultMap" databaseId="mysql">
select
t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.ele_invoice_no,t.invoice_date,t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status
- ,
+ ,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.company = #{company}
and t.gf_tax_no = #{gfsh}
@@ -83,6 +91,7 @@
select
t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.invoice_date,t.total_amount,t.remark,t.qs_date,
t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status,t.qs_name
+ ,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 left join t_dx_invoice r on t.uuid = r.uuid
where 1=1