|
@@ -156,7 +156,7 @@ public class WorkInvoiceAllTwoController extends BaseController {
|
|
//查询已通过的所有发票的开票金额总和
|
|
//查询已通过的所有发票的开票金额总和
|
|
String getSumMoney = workInvoiceService.getSumMoney(workInvoice);
|
|
String getSumMoney = workInvoiceService.getSumMoney(workInvoice);
|
|
List<WorkInvoice> workInvoiceList = page.getList();
|
|
List<WorkInvoice> workInvoiceList = page.getList();
|
|
- /*for (WorkInvoice invoice: workInvoiceList) {
|
|
|
|
|
|
+ for (WorkInvoice invoice: workInvoiceList) {
|
|
invoice.setWorkInvoiceProjectRelationList(invoiceService.getProjectRelation(invoice));
|
|
invoice.setWorkInvoiceProjectRelationList(invoiceService.getProjectRelation(invoice));
|
|
List<String> projectNameList = invoiceService.getProjectNameList(invoice);
|
|
List<String> projectNameList = invoiceService.getProjectNameList(invoice);
|
|
String projectNameStr = String.join(",", projectNameList);
|
|
String projectNameStr = String.join(",", projectNameList);
|
|
@@ -168,7 +168,7 @@ public class WorkInvoiceAllTwoController extends BaseController {
|
|
}
|
|
}
|
|
String reportNumberStr = String.join(",", reportNumber);
|
|
String reportNumberStr = String.join(",", reportNumber);
|
|
invoice.setReportNumber(reportNumberStr);
|
|
invoice.setReportNumber(reportNumberStr);
|
|
- }*/
|
|
|
|
|
|
+ }
|
|
model.addAttribute("page", page);
|
|
model.addAttribute("page", page);
|
|
model.addAttribute("sumMoney", getSumMoney);
|
|
model.addAttribute("sumMoney", getSumMoney);
|
|
model.addAttribute("workInvoiceShow", workInvoice);
|
|
model.addAttribute("workInvoiceShow", workInvoice);
|