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

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java

@@ -39,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -105,6 +106,10 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl<LatestActInfoDao,
         }
         dto.setId(null);
         LatestActInfoEntity entity = ConvertUtils.sourceToTarget(dto, LatestActInfoEntity.class);
+        Date nowDate=new Date();
+        entity.setSignUpStartTime(nowDate);
+        entity.setCreatedTime(nowDate);
+        entity.setUpdatedTime(nowDate);
         insert(entity);
         logger.info("insert latest_act_info success");
         return entity.getId();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java

@@ -176,10 +176,10 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
         latestActInfoDTO.setTitle(formDTO.getTitle());
         //活动封面
         latestActInfoDTO.setCoverPic(formDTO.getCoverPic());
-        //报名开始时间latestActInfoDTO.setSignUpStartTime(new Date());
-        //报名截止时间
+        //报名开始时间暂不赋值,放在插入的时候赋值
         if(StringUtils.isNotBlank(formDTO.getSignUpEndTime())){
             Date signUpEndTime= DateUtils.minStrToSecondDate(formDTO.getSignUpEndTime());
+            //报名截止时间
             latestActInfoDTO.setSignUpEndTime(signUpEndTime);
         }
         //招募要求

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -1232,9 +1232,6 @@ public class WorkActServiceImpl implements WorkActService {
         this.deleteDraft();
         publishActResultDTO.setActId(rePublishFormDTO.getActId());
         //发送消息通知-暂时不做了,前端默认串的是不通知
-        /*if(rePublishFormDTO.getNoticePassedPeople()){
-            this.noticePassedPeople(originalActInfo,newActInfoEntity);
-        }*/
         //如果用户在重新发布之前点击了预览，需要去更新草稿表里的act_info_id,记录草稿和活动的关系
         if(StringUtils.isNotBlank(rePublishFormDTO.getActDraftId())){
             latestActInfoDao.updateActInfoId(rePublishFormDTO.getActDraftId(),newActInfoEntity.getId());