Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java

@@ -73,7 +73,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable {
      * 活动主题
      */
     @NotBlank(message = "活动主题不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class})
-    @Length(max = 35, message = "最多输入35个字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class})
+    @Length(max = 35, message = "活动主题最多输入35个字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class})
     private String topic;
 
     /**

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java

@@ -731,7 +731,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
                     .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg);
         }
         //日程又增加了一个提醒时间
-        List<IcScheduleEntity> scheduleEntityList=icScheduleDao.selectNeedNotice(dateId);
+        String nowDateId=DateUtils.format(new Date(),DateUtils.DATE_PATTERN_YYYYMMDD);
+        List<IcScheduleEntity> scheduleEntityList=icScheduleDao.selectNeedNotice(nowDateId);
         for(IcScheduleEntity icScheduleEntity:scheduleEntityList){
             PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg();
             msg.setCustomerId(icScheduleEntity.getCustomerId());