diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java index 31cc8cac..a1acd936 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java @@ -512,4 +512,8 @@ public class BaseTDxRecordInvoice implements Serializable { private String imageNumber; //报账单号 private String bzdh; + /** + * 组织编码 + */ + private String compCode; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index bf0ec0f1..a2ede5aa 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java @@ -207,6 +207,8 @@ public class BaseFpRzRespVO implements Serializable { private String bzdh; //组织名称 private String deptName; + //组织编码 + private String compCode; } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index d4730397..1c646673 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -49,6 +49,7 @@ + select t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no,t.gf_name,t.image_id, - t.dept_id deptId,t.dept_name deptName, + t.dept_id deptId,t.dept_name deptName,t.comp_code, t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d') rzh_date, date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id, t.gx_user_name,t.rzh_belong_date,t.inaccount_status,t.bzdh, diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 41f86dfe..775a2001 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -31,6 +31,7 @@ + @@ -57,7 +58,7 @@