发票导出功能添加发票金额

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -648,6 +648,11 @@ public class ProjectFilingBatchController extends BaseController {
                     map.put("msg","未查询到报告号："+ reportNumber + " 的项目信息");
                     return map;
                 }
+                if(StringUtils.isBlank(records.getSubmitMoney()) || !"1".equals(records.getSubmitMoney())){
+                    map.put("success",false);
+                    map.put("msg","报告号："+ reportNumber + " 的项目信息不是B类项目，无法进行批量归档");
+                    return map;
+                }
                 //判断项目登记人是否为当前登陆人
                 if(!UserUtils.getUser().getId().equals(records.getCreateBy().getId())){
                     map.put("success",false);

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

@@ -310,7 +310,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 		this.money = money;
 	}
 
-	@ExcelField(title="开票金额", align=2, sort=10)
+	@ExcelField(title="开票总金额", align=2, sort=10)
 	public String getMoneyStr() {
 		return moneyStr;
 	}

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

@@ -145,7 +145,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.bankNumber = bankNumber;
 	}
 
-	@ExcelField(title="发票状态", align=2, sort=11,dictType = "invoice_audit_state")
+	@ExcelField(title="发票状态", align=2, sort=12,dictType = "invoice_audit_state")
 	public String getInvoiceState() {
 		return invoiceState;
 	}
@@ -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)
 	public String getMoneyStr() {
 		return moneyStr;
 	}
@@ -366,7 +366,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 	}
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="开票日期", align=2, sort=10)
+	@ExcelField(title="开票日期", align=2, sort=11)
 	public Date getInvoiceDate() {
 		return invoiceDate;
 	}
@@ -484,7 +484,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 	}
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="收款日期", align=2, sort=12)
+	@ExcelField(title="收款日期", align=2, sort=13)
 	public Date getReceiptMoneyDate() {
 		return receiptMoneyDate;
 	}
@@ -493,7 +493,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.receiptMoneyDate = receiptMoneyDate;
 	}
 
-	@ExcelField(title="是否收款", align=2, sort=13)
+	@ExcelField(title="是否收款", align=2, sort=14)
 	public String getReceiptMoney() {
 		return receiptMoney;
 	}
@@ -606,6 +606,8 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 	public void setWidNumber(String widNumber) {
 		this.widNumber = widNumber;
 	}
+
+	@ExcelField(title="发票金额(元)", align=2, sort=10)
 	public String getWidTotalMoney() {
 		return widTotalMoney;
 	}