Merge branch 'develop' into release_temp

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

@@ -241,12 +241,12 @@ 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 {
-        tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
-        tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
+    public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO,@LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception {
+        //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
+        //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
         formDTO.setIsPage(false);
-        formDTO.setStatus("all");
-        formDTO.setCategoryCode("0102");
+        //formDTO.setStatus("all");
+        //formDTO.setCategoryCode("0102");
         ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class);
         PageCategoryProjectListResultDTO data = screenProjectService.selectCategoryProjectList(formDTO,tokenDto);
         String templatePath = "excel/project_temp.xlsx";