diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayAnnualAllocateController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayAnnualAllocateController.java index 4fb1bf4..9f8ffab 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayAnnualAllocateController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayAnnualAllocateController.java @@ -68,9 +68,9 @@ public class OutlayAnnualAllocateController { for (NutMap row : rows) row.put("year", queryYear); columns.add(new ExcelExportEntity("基础经费已下拨(元)", "baseMoney", 24)); columns.add(new ExcelExportEntity("专项经费已下拨(元)", "specialMoney", 24)); - columns.add(new ExcelExportEntity("新流程合计下拨(元)", "totalMoney", 24)); + columns.add(new ExcelExportEntity("合计经费下拨(元)", "totalMoney", 24)); } else if ("history".equals(type)) { - title = "历史季度记录"; + title = "历史年度记录"; rows = outlayAnnualAllocateService.historyRecords(queryYear, unionId); Map projectNames = new HashMap<>(); for (Sys_dict dict : sysDictService.getSubListByCode("OUTLAY_QUARTERLY")) { diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/annual.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/annual.html index 826c4a2..0835864 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/annual.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/annual.html @@ -65,7 +65,7 @@ layout("/layouts/platform.html"){ - + 生成年度基础经费 @@ -86,7 +86,7 @@ layout("/layouts/platform.html"){