Jelajahi Sumber

开票导出,开票总金额,和发票金额都要保留

[user3] 3 tahun lalu
induk
melakukan
82977829ee

+ 7 - 7
src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoice.java

@@ -146,7 +146,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 		this.bankNumber = bankNumber;
 	}
 
-	@ExcelField(title="发票状态", align=2, sort=16 ,dictType = "invoice_audit_state")
+	@ExcelField(title="发票状态", align=2, sort=17 ,dictType = "invoice_audit_state")
 	public String getInvoiceState() {
 		return invoiceState;
 	}
@@ -325,7 +325,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 		this.invoiceType = invoiceType;
 	}
 
-	@ExcelField(title="收款类型", dictType="charge_type", align=2, sort=12)
+	@ExcelField(title="收款类型", dictType="charge_type", align=2, sort=14)
 	public String getChargeType() {
 		return chargeType;
 	}
@@ -371,7 +371,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	}
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="开票日期", align=2, sort=14)
+	@ExcelField(title="开票日期", align=2, sort=15)
 	public Date getInvoiceDate() {
 		return invoiceDate;
 	}
@@ -472,7 +472,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 		this.ext = ext;
 	}
 
-	@ExcelField(title="开票内容", mainDictType="billing_content", align=2, sort=11)
+	@ExcelField(title="开票内容", mainDictType="billing_content", align=2, sort=12)
 	public String getBillingContent() {
 		return billingContent;
 	}
@@ -490,7 +490,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	}
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="收款日期", align=2, sort=15)
+	@ExcelField(title="收款日期", align=2, sort=16)
 	public Date getReceiptMoneyDate() {
 		return receiptMoneyDate;
 	}
@@ -499,7 +499,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 		this.receiptMoneyDate = receiptMoneyDate;
 	}
 
-	@ExcelField(title="是否收款", align=2, sort=17)
+	@ExcelField(title="是否收款", align=2, sort=18)
 	public String getReceiptMoney() {
 		return receiptMoney;
 	}
@@ -612,7 +612,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setWidNumber(String widNumber) {
 		this.widNumber = widNumber;
 	}
-
+	@ExcelField(title="发票金额", align=2, sort=11)
 	public String getWidTotalMoney() {
 		return widTotalMoney;
 	}