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 allHeaderList = ExportProjectResultVO.DEFAULT_HEADER_NAME; + List allHeaderList = new ArrayList<>(); + allHeaderList.addAll(ExportProjectResultVO.DEFAULT_HEADER_NAME); allHeaderList.addAll(titleList); return new ExportProjectResultVO(allHeaderList, resultList); } 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 ServiceImpllambdaQuery().eq(UserProjectResultEntity::getProjectKey, projectKey)); if (resultCount >= timedQuantitativeQuantity) { - return Result.success(setting, setting.getTimedEndPromptText()); + return Result.success(setting, StringUtils.isEmpty(setting.getTimedEndPromptText())?"收集数量已达到。":setting.getTimedEndPromptText()); } } //每个人只需填写一次 根据IP判断