开票导出和筛选项修改

src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoiceExport.java

@@ -303,7 +303,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.money = money;
 	}
 
-	@ExcelField(title="开票总金额(元)", align=2, sort=7)
+	@ExcelField(title="开票总金额(元)", align=2, sort=7, fieldType=Double.class)
 	public String getMoneyStr() {
 		return moneyStr;
 	}
@@ -607,7 +607,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.widNumber = widNumber;
 	}
 
-	@ExcelField(title="发票金额(元)", align=2, sort=10)
+	@ExcelField(title="发票金额(元)", align=2, sort=10, fieldType=Double.class)
 	public String getWidTotalMoney() {
 		return widTotalMoney;
 	}

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -503,6 +503,9 @@
 			<if test="isInvalid != null and isInvalid != ''">
 				AND a.is_invalid = #{isInvalid}
 			</if>
+			<if test="billingContent != null and billingContent != ''">
+				AND a.billing_content = #{billingContent}
+			</if>
 			<if test="area != null and area.id != null and area.id != ''">
 				AND a.area_parent_id LIKE
 				<if test="dbName == 'oracle'">'%'||#{area.id}||'%'</if>
@@ -848,6 +851,9 @@
 			<if test="isInvalid != null and isInvalid != ''">
 				AND a.is_invalid = #{isInvalid}
 			</if>
+			<if test="billingContent != null and billingContent != ''">
+				AND a.billing_content = #{billingContent}
+			</if>
 			<if test="area != null and area.id != null and area.id != ''">
 				AND a.area_parent_id LIKE
 				<if test="dbName == 'oracle'">'%'||#{area.id}||'%'</if>
@@ -968,6 +974,9 @@
 			<if test="office != null and office.id != null and office.id != ''">
 				AND a.office_id = #{office.id}
 			</if>
+			<if test="billingContent != null and billingContent != ''">
+				AND a.billing_content = #{billingContent}
+			</if>
 			<if test="invoiceNumber != null and invoiceNumber != ''">
 				AND a.invoice_number LIKE
 				<if test="dbName == 'oracle'">'%'||#{invoiceNumber}||'%'</if>