From beea1a8c4021746ba1311660a96fb5cb477bf6a7 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 16:58:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=B2=E6=8A=A5=E5=90=8D=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/ActInfoDao.java | 2 +- .../src/main/resources/mapper/ActInfoDao.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java index 002bd3a6b3..b4fea5476a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java @@ -258,7 +258,7 @@ public interface ActInfoDao extends BaseDao { * @return java.util.List * @param actId * @author yinzuomei - * @description 已结束-已参加人员列表 + * @description 已结束-已参加人员列表(审核中、审核通过) * @Date 2020/7/24 10:18 **/ List queryJoinUserList(String actId); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 8732b7c248..2d442beff6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -551,7 +551,7 @@ limit #{pageNo}, #{pageSize} - + From f8fef3cf9f773985b2dd0686d828051918ea119e Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 7 Aug 2020 17:09:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9B=B4=E6=96=B0=20=20?= =?UTF-8?q?=20111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index e7e6219ac1..05049a8edb 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.110 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.111 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 9fd7485cf5..6e323ee2fe 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.110 + 0.3.111 com.epmet epmet-user From b121532f1dc0e07e5d1d086c4182475f526e7409 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Aug 2020 17:11:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=A4=A7=E4=BA=8E=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/exception/EpmetErrorCode.java | 1 + .../com/epmet/service/impl/WorkActServiceImpl.java | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 1ca4a859fd..fbbeebccbf 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -61,6 +61,7 @@ public enum EpmetErrorCode { HAVE_HANDLE(8123,"存在待处理事项,请先处理"), ACTUAL_TIME(8124,"请录入实际开始时间,实际结束时间"), ACTUAL_NOT_FINISHED(8125,"请先结束活动"), + ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR(8121,"活动报名截止时间应晚于当前时间"), CANNOT_AUDIT_WARM(8201, "请完善居民信息"), NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"), 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 4656baf0ee..740c446f37 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 @@ -147,6 +147,11 @@ public class WorkActServiceImpl implements WorkActService { //构造属性保存活动属性，活动内容 ActInfoEntity actInfoEntity=this.constructActInfo(formDTO); //校验参数 + + //校验 活动报名截止时间应该大于当前时间 + if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){ + throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg()); + } this.checkPublishFormDTO(actInfoEntity); PublishActResultDTO publishActResultDTO=new PublishActResultDTO(); //内容审核（活动标题、招募要求、活动内容图文） @@ -186,18 +191,19 @@ public class WorkActServiceImpl implements WorkActService { * @Date 2020/7/24 16:45 **/ private void checkPublishFormDTO(ActInfoEntity actInfoEntity) { + // //1、活动预计开始时间、活动预计结束时间 if(actInfoEntity.getActStartTime().compareTo(actInfoEntity.getActEndTime())!=-1){ - throw new RenException(EpmetErrorCode.ACT_START_TIME_ERROR.getCode()); + throw new RenException(EpmetErrorCode.ACT_START_TIME_ERROR.getCode(),EpmetErrorCode.ACT_START_TIME_ERROR.getMsg()); } //2、签到开始时间、签到结束时间 if(actInfoEntity.getSignInStartTime().compareTo(actInfoEntity.getSignInEndTime())!=-1){ - throw new RenException(EpmetErrorCode.ACT_SIGN_IN_START_TIME_ERROR.getCode()); + throw new RenException(EpmetErrorCode.ACT_SIGN_IN_START_TIME_ERROR.getCode(),EpmetErrorCode.ACT_SIGN_IN_START_TIME_ERROR.getMsg()); } int n=actInfoEntity.getSignUpEndTime().compareTo(actInfoEntity.getActStartTime()); //3、报名截止时间（应该在活动预计开始时间之前） if(n!=-1){ - throw new RenException((EpmetErrorCode.ACT_SIGN_UP_END_TIME_ERROR.getCode())); + throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_ERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_ERROR.getMsg()); } } @@ -327,7 +333,7 @@ public class WorkActServiceImpl implements WorkActService { if(result.success()&&null!=result.getData()){ actInfoEntity.setPid(result.getData().getPid()); }else{ - logger.warn("根据agencyId查询组织信息失败，agencyId=",formDTO.getSponsorId()); + logger.warn("根据agencyId查询组织信息失败，agencyId={}",formDTO.getSponsorId()); } }else{ actInfoEntity.setPid(StrConstant.EPMETY_STR);