修改问卷数据导出

src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java

@@ -127,7 +127,15 @@ public class QuestionnaireController {
         // 未添加时间条件
         Workbook workbook = questionnaireService.export(export);
         log.info("导出问卷记录结束");
-        String fileName = "山西省缺血性脑卒中数据汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx";
+        String str = "";
+        if (1L == export.getQid()) {
+            str = "2021年1-6月";
+        }else if (3L == export.getQid()) {
+            str = "2021年7-11月";
+        }else if (4L == export.getQid()) {
+            str = "2021年7-12月";
+        }
+        String fileName = str+"山西省缺血性脑卒中数据汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx";
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8));
         workbook.write(response.getOutputStream());
     }

src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java

@@ -2,7 +2,6 @@ package com.ccsens.carbasics.bean.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import javafx.geometry.Pos;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java

@@ -3,7 +3,9 @@ package com.ccsens.carbasics.bean.vo.message;
 import com.ccsens.carbasics.util.Constant;
 import com.ccsens.util.message.BaseMessageDto;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class RemindMessageVo extends BaseMessageDto {
     private Data data;

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: pre
-    include: common, util-pre
+    active: prod
+    include: common, util-prod