From cf236e9ee544bd41975686108c1f6535ffbc7e05 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Aug 2020 10:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=9D=A1=E4=BB=B6=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E9=BB=98=E8=AE=A4=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/constant/StrConstant.java | 2 ++ .../com/epmet/dto/form/work/PublishActInfoFormDTO.java | 3 +-- .../java/com/epmet/dto/form/work/RePublishFormDTO.java | 3 +-- .../com/epmet/service/impl/WorkActDraftServiceImpl.java | 7 ++++++- .../java/com/epmet/service/impl/WorkActServiceImpl.java | 6 ++++++ .../main/resources/db/migration/V0.0.2__updateactinfo.sql | 1 + 6 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.2__updateactinfo.sql diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index a05eac28c6..655635e6d7 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -75,4 +75,6 @@ public interface StrConstant { String EPMETY_STR=""; String NULL_STR="null"; + + String NOT_FILLED = "无"; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java index 5ded502bb2..fae068b230 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java @@ -120,8 +120,7 @@ public class PublishActInfoFormDTO implements Serializable { /** * 报名条件 */ - @NotBlank(message = "报名条件不能为空", groups = {AddUserShowGroup.class}) - @Length(min=1, max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) + @Length(max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) private String requirement; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java index 06208c4564..dfd1aeed99 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java @@ -126,8 +126,7 @@ public class RePublishFormDTO implements Serializable { /** * 报名条件 */ - @NotBlank(message = "报名条件不能为空", groups = {AddUserShowGroup.class}) - @Length(min=1, max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) + @Length(max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) private String requirement; /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java index e622f5f9fb..da6a45db44 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dto.LatestActContentDTO; @@ -182,7 +183,11 @@ public class WorkActDraftServiceImpl implements WorkActDraftService { latestActInfoDTO.setSignUpEndTime(signUpEndTime); } //招募要求 - latestActInfoDTO.setRequirement(formDTO.getRequirement()); + if(StringUtils.isNotBlank(formDTO.getRequirement())){ + latestActInfoDTO.setRequirement(formDTO.getRequirement()); + }else{ + latestActInfoDTO.setRequirement(StrConstant.NOT_FILLED); + } //活动预计开始时间 if(StringUtils.isNotBlank(formDTO.getActStartTime())){ Date actStartTime= DateUtils.minStrToSecondDate(formDTO.getActStartTime()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 1936de361d..4656baf0ee 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -332,6 +332,9 @@ public class WorkActServiceImpl implements WorkActService { }else{ actInfoEntity.setPid(StrConstant.EPMETY_STR); } + if(StringUtils.isBlank(actInfoEntity.getRequirement())){ + actInfoEntity.setRequirement(StrConstant.NOT_FILLED); + } return actInfoEntity; } @@ -375,6 +378,9 @@ public class WorkActServiceImpl implements WorkActService { }else{ actInfoEntity.setPid(StrConstant.EPMETY_STR); } + if(StringUtils.isBlank(actInfoEntity.getRequirement())){ + actInfoEntity.setRequirement(StrConstant.NOT_FILLED); + } return actInfoEntity; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.2__updateactinfo.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.2__updateactinfo.sql new file mode 100644 index 0000000000..e15cfae871 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.2__updateactinfo.sql @@ -0,0 +1 @@ +alter table act_info MODIFY column REQUIREMENT VARCHAR(512) DEFAULT '' COMMENT '招募要求'; \ No newline at end of file