ソースを参照

发票数据导出发票类型展示bug处理

user5 3 年 前
コミット
7a322bc00e

+ 2 - 1
src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoiceExport.java

@@ -312,6 +312,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.moneyStr = moneyStr;
 	}
 
+	@ExcelField(title="发票类型",dictType="invoice_type", align=2, sort=8)
 	public String getInvoiceType() {
 		return invoiceType;
 	}
@@ -319,7 +320,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 	public void setInvoiceType(String invoiceType) {
 		this.invoiceType = invoiceType;
 	}
-	@ExcelField(title="发票类型",dictType="invoice_type", align=2, sort=8)
+
 	public String getChargeType() {
 		return chargeType;
 	}

+ 1 - 1
src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -96,7 +96,7 @@
 		a.project_id as projectId,
 		a.project_name as "projectName",
 		a.money as "money",
-		a.invoice_type as "project_name",
+		a.invoice_type as "invoiceType",
 		(case when a.invoice_type = '1' then '专票' when a.invoice_type = '2' then '普票' else '' end) as 'invoiceTypeStr',
 		a.charge_type AS "chargeType",
 		a.content AS "content",