diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index 4a1c0d70..ad8167aa 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -139,7 +139,8 @@ public class Crdn02Controller extends ApplicationController { .cell(4, 0) .values(list, CellDef.values(cellDefs)); - return new ModelAndView("xlsView").addObject("xls", xlsx); + return new ModelAndView("xlsView").addObject("xls", xlsx) + .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"",""); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java index f6497730..6a50ede1 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -110,7 +110,8 @@ public class Crdn03Controller extends ApplicationController { .cell(4, 0) .values(list, CellDef.values(cellDefs)); - return new ModelAndView("xlsView").addObject("xls", xlsx); + return new ModelAndView("xlsView").addObject("xls", xlsx) + .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"",""); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 8a506006..a3f41c9d 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -165,7 +165,8 @@ public class Crdn06Controller extends ApplicationController { .cell(4, 0) .values(list, CellDef.values(cellDefs)); - return new ModelAndView("xlsView").addObject("xls", xlsx); + return new ModelAndView("xlsView").addObject("xls", xlsx) + .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"",""); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java index fc8ca521..36b8336f 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java @@ -113,7 +113,8 @@ public class Crdn08Controller extends ApplicationController { .cell(4, 0) .values(list, CellDef.values(cellDefs)); - return new ModelAndView("xlsView").addObject("xls", xlsx); + return new ModelAndView("xlsView").addObject("xls", xlsx) + .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } setFetchSize(query); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index 1e54e85f..be78b681 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -160,7 +160,8 @@ public class Cvlc01Controller extends ApplicationController { .cell(4, 0) .values(list, CellDef.values(cellDefs)); - return new ModelAndView("xlsView").addObject("xls", xlsx); + return new ModelAndView("xlsView").addObject("xls", xlsx) + .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query),"",""); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index 8801d37b..4fce3351 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -168,7 +168,8 @@ public class Cvlc02Controller extends ApplicationController { .cell(4, 0) .values(list, CellDef.values(cellDefs)); - return new ModelAndView("xlsView").addObject("xls", xlsx); + return new ModelAndView("xlsView").addObject("xls", xlsx) + .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query),"",""); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index ff88ba43..2c6cdf1e 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -125,7 +125,8 @@ public class Cvlc03Controller extends ApplicationController { .cell(4, 0) .values(list, CellDef.values(cellDefs)); - return new ModelAndView("xlsView").addObject("xls", xlsx); + return new ModelAndView("xlsView").addObject("xls", xlsx) + .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } return setCollectionInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCivilComplaintList(query),"",""); diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index 713bd419..3a8a3fe4 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -272,7 +272,8 @@ public class Sprt01Controller extends ApplicationController { .cell(4, 0) .values(listForExcel, CellDef.values(cellDefs)); - return new ModelAndView("xlsView").addObject("xls", xlsx); + return new ModelAndView("xlsView").addObject("xls", xlsx) + .addObject("downloadData", listForExcel).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } mav.addObject("upList", upList);