Browse Source

!2 问卷是否可用判断问题修复,默认提示语

* 导出功能表头并发问题
* 问卷是否可用判断问题修复,默认提示语
dev
sl 4 years ago
committed by smalljop
parent
commit
453e9feede
  1. 8
      tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
  2. 7
      tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java

8
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.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.util.Iterator; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.tduck.cloud.project.constant.ProjectRedisKeyConstants.PROJECT_RESULT_NUMBER; 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()); processData.put(UserProjectResultEntity.Fields.submitAddress, item.getSubmitAddress());
return processData; return processData;
}).collect(Collectors.toList()); }).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); allHeaderList.addAll(titleList);
return new ExportProjectResultVO(allHeaderList, resultList); return new ExportProjectResultVO(allHeaderList, resultList);
} }

7
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 com.tduck.cloud.project.service.UserProjectSettingService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Optional; import java.util.Optional;
@ -53,18 +54,18 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
//时间未开始 //时间未开始
if (timedCollectionBeginTime.isPresent() && timedCollectionBeginTime.get().isAfter(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)) { 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(); Integer timedQuantitativeQuantity = setting.getTimedQuantitativeQuantity();
if (Optional.ofNullable(timedQuantitativeQuantity).isPresent() && 0 != timedQuantitativeQuantity) { if (Optional.ofNullable(timedQuantitativeQuantity).isPresent() && 0 != timedQuantitativeQuantity) {
int resultCount = userProjectResultService.count(Wrappers.<UserProjectResultEntity>lambdaQuery().eq(UserProjectResultEntity::getProjectKey, projectKey)); int resultCount = userProjectResultService.count(Wrappers.<UserProjectResultEntity>lambdaQuery().eq(UserProjectResultEntity::getProjectKey, projectKey));
if (resultCount >= timedQuantitativeQuantity) { if (resultCount >= timedQuantitativeQuantity) {
return Result.success(setting, setting.getTimedEndPromptText()); return Result.success(setting, StringUtils.isEmpty(setting.getTimedEndPromptText())?"收集数量已达到。":setting.getTimedEndPromptText());
} }
} }
//每个人只需填写一次 根据IP判断 //每个人只需填写一次 根据IP判断

Loading…
Cancel
Save