Merge branch 'dev_add_closedCount_category' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -247,12 +247,13 @@ public class ScreenProjectController {
      * @date 2021/11/4 3:38 下午
      */
     @PostMapping("selectcategoryprojectlist/export")
-    public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO, /*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception {
+    public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception {
         ExcelWriter excelWriter = null;
         try {
-            tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
-            tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
-
+            //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
+            //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
+            formDTO.setPageNo(NumConstant.ONE);
+            formDTO.setPageSize(NumConstant.ONE_THOUSAND);
             formDTO.setIsPage(false);
             ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class);
 
@@ -275,7 +276,6 @@ public class ScreenProjectController {
             WriteSheet writeSheet = EasyExcel.writerSheet().build();
             excelWriter.fill(mapData, writeSheet);
 
-            formDTO.setPageSize(NumConstant.ONE);
             PageCategoryProjectListResultDTO data = null;
             do {
                 data = screenProjectService.selectCategoryProjectList(formDTO, tokenDto);