From 1269dbe7ab9a129fb63227c383e1ac2045a394f7 Mon Sep 17 00:00:00 2001 From: shenlin Date: Fri, 25 Jun 2021 09:59:49 +0800 Subject: [PATCH 1/3] =?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 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判断 From f58ba0af717f7379caaa66b6e51b92a4c1c7e2da Mon Sep 17 00:00:00 2001 From: shenlin Date: Fri, 25 Jun 2021 10:07:17 +0800 Subject: [PATCH 2/3] =?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 allHeaderList = ExportProjectResultVO.DEFAULT_HEADER_NAME; + List allHeaderList = new ArrayList<>(); + allHeaderList.addAll(ExportProjectResultVO.DEFAULT_HEADER_NAME); allHeaderList.addAll(titleList); return new ExportProjectResultVO(allHeaderList, resultList); } From 47688947144874c937c9a855ee70955eecbed3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=91=E6=98=AF=E7=AD=96=E8=AF=97=E6=BA=90?= Date: Thu, 8 Jul 2021 07:49:41 +0000 Subject: [PATCH 3/3] =?UTF-8?q?!7=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E4=B8=AD=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=90=8E=EF=BC=8C=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=8F=98=E7=9A=84bug=20*=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD=E9=A1=BA=E5=BA=8F=E4=B8=8D?= =?UTF-8?q?=E5=8F=98=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tduck/cloud/api/web/controller/UserProjectController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index 488d581..1fbea24 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -273,7 +273,9 @@ public class UserProjectController { ValidatorUtils.validateEntity(request); List itemEntityList = projectItemService.list(Wrappers.lambdaQuery() .eq(UserProjectItemEntity::getProjectKey, request.getKey()) - .eq(ObjectUtil.isNotNull(request.getDisplayType()), UserProjectItemEntity::getDisplayType, request.getDisplayType())); + .eq(ObjectUtil.isNotNull(request.getDisplayType()), UserProjectItemEntity::getDisplayType, request.getDisplayType()) + .orderByAsc(UserProjectItemEntity::getSort) + ); return Result.success(itemEntityList); }