From 081ab87b6bed1f1b6b10a7b82b02001f83457302 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Tue, 4 Jan 2022 15:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/carbasics/api/QuestionnaireController.java  | 10 +++++++++-
 .../com/ccsens/carbasics/bean/vo/OrganizationVo.java   |  1 -
 .../carbasics/bean/vo/message/RemindMessageVo.java     |  2 ++
 src/main/resources/application.yml                     |  4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java
index 1817f3c..5050ed7 100644
--- a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java
+++ b/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());
     }
diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java
index f45eb30..e143663 100644
--- a/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java
+++ b/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;
diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java
index fed9969..432bd1d 100644
--- a/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java
+++ b/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;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b6d2d10..5abf242 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: pre
-    include: common, util-pre
+    active: prod
+    include: common, util-prod