From 1269dbe7ab9a129fb63227c383e1ac2045a394f7 Mon Sep 17 00:00:00 2001
From: shenlin <Lin.SL.Shen@gds.ey.com>
Date: Fri, 25 Jun 2021 09:59:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserProjectSettingServiceImpl.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java
index d940f84..667ad54 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java
+++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java
@@ -19,6 +19,7 @@ import com.tduck.cloud.project.service.UserProjectService;
 import com.tduck.cloud.project.service.UserProjectSettingService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
 import java.util.Optional;
@@ -53,18 +54,18 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
         LocalDateTime now = LocalDateTime.now();
         //时间未开始
         if (timedCollectionBeginTime.isPresent() && timedCollectionBeginTime.get().isAfter(now)) {
-            return Result.success(null, setting.getTimedNotEnabledPromptText());
+            return Result.success(null, StringUtils.isEmpty(setting.getTimedNotEnabledPromptText())?"项目时间末开始。":setting.getTimedNotEnabledPromptText());
         }
         //时间已经结束
         if (timedCollectionEndTime.isPresent() && timedCollectionEndTime.get().isBefore(now)) {
-            return Result.success(null, setting.getTimedDeactivatePromptText());
+            return Result.success(null, StringUtils.isEmpty(setting.getTimedDeactivatePromptText())?"项目时间已结束。":setting.getTimedDeactivatePromptText());
         }
         //收集数量达到
         Integer timedQuantitativeQuantity = setting.getTimedQuantitativeQuantity();
         if (Optional.ofNullable(timedQuantitativeQuantity).isPresent() && 0 != timedQuantitativeQuantity) {
             int resultCount = userProjectResultService.count(Wrappers.<UserProjectResultEntity>lambdaQuery().eq(UserProjectResultEntity::getProjectKey, projectKey));
             if (resultCount >= timedQuantitativeQuantity) {
-                return Result.success(setting, setting.getTimedEndPromptText());
+                return Result.success(setting, StringUtils.isEmpty(setting.getTimedEndPromptText())?"收集数量已达到。":setting.getTimedEndPromptText());
             }
         }
         //每个人只需填写一次 根据IP判断

From f58ba0af717f7379caaa66b6e51b92a4c1c7e2da Mon Sep 17 00:00:00 2001
From: shenlin <Lin.SL.Shen@gds.ey.com>
Date: Fri, 25 Jun 2021 10:07:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=B9=B6=E5=8F=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserProjectResultServiceImpl.java        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
index 89808d3..9822c5e 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
+++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
@@ -35,10 +35,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.tduck.cloud.project.constant.ProjectRedisKeyConstants.PROJECT_RESULT_NUMBER;
@@ -126,7 +123,8 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
             processData.put(UserProjectResultEntity.Fields.submitAddress, item.getSubmitAddress());
             return processData;
         }).collect(Collectors.toList());
-        List<ExportProjectResultVO.ExcelHeader> allHeaderList = ExportProjectResultVO.DEFAULT_HEADER_NAME;
+        List<ExportProjectResultVO.ExcelHeader> allHeaderList = new ArrayList<>();
+        allHeaderList.addAll(ExportProjectResultVO.DEFAULT_HEADER_NAME);
         allHeaderList.addAll(titleList);
         return new ExportProjectResultVO(allHeaderList, resultList);
     }