Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

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, "该机关存在下级机关，不允许删除"),

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java

@@ -258,7 +258,7 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      * @return java.util.List<com.epmet.dto.result.work.JoinedUserResultDTO>
      * @param actId
      * @author yinzuomei
-     * @description 已结束-已参加人员列表
+     * @description 已结束-已参加人员列表(审核中、审核通过)
      * @Date 2020/7/24 10:18
      **/
     List<JoinedUserResultDTO> queryJoinUserList(String actId);

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);

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -551,7 +551,7 @@
         limit #{pageNo}, #{pageSize}
     </select>
 
-    <!--  已结束-已参加人员列表  -->
+    <!--  已结束-已报名人员列表(审核中、审核通过)  -->
     <select id="queryJoinUserList" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.JoinedUserResultDTO">
         SELECT
             aur.id as actUserRelationId,
@@ -572,7 +572,8 @@
             and ai.DEL_FLAG='0')
         WHERE
             aur.DEL_FLAG = '0'
-            AND aur.`STATUS` = 'passed'
+            AND aur.`STATUS` != 'refused'
+            AND aur.`STATUS` != 'canceled'
             AND aur.ACT_ID =#{actId}
             order by aur.CREATED_TIME  asc
     </select>

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 # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.110</version>
+    <version>0.3.111</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>