Merge branch 'dev'

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

@@ -204,6 +204,7 @@ public class ScreenProjectController {
         //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
         //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
         ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class);
+        String openTime = formDTO.getStartTime();
         List<ProjectCategoryResultDTO> data = screenProjectService.selectProjectCategory(formDTO, tokenDto);
         String templatePath = "excel/project_category_temp.xlsx";
 
@@ -216,7 +217,7 @@ public class ScreenProjectController {
         Map<String,Object> mapData = new HashMap<>();
         mapData.put("list",resultDTOList);
         mapData.put("orgName", formDTO.getOrgName());
-        mapData.put("exportDate",getExportDateStr(formDTO.getStartTime(),formDTO.getEndTime()));
+        mapData.put("exportDate", getExportDateStr(openTime, formDTO.getEndTime()));
         Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData);
         response.setHeader("content-Type", "application/vnd.ms-excel");
         response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("项目分类统计.xls", "UTF-8"));

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -19,6 +19,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -218,6 +219,7 @@ public class ArticleController {
 	 * @param formDTO
 	 * @throws Exception
 	 */
+	@NoRepeatSubmit
 	@PostMapping("publish")
 	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH)
 	public Result<Boolean> publishArticle(@LoginUser TokenDto tokenDto, @RequestBody PublishArticleFormDTO formDTO) throws Exception {
@@ -234,6 +236,7 @@ public class ArticleController {
 	 * @param formDTO
 	 * @throws Exception
 	 */
+	@NoRepeatSubmit
 	@PostMapping("manualpublish")
 	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH)
 	public Result<Boolean> manualPublish(@LoginUser TokenDto tokenDto, @RequestBody PublishArticleFormDTO formDTO) throws Exception {