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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -55,6 +55,7 @@ public class DateUtils {
     public final static String DATE_TIME_PATTERN_END_WITH_MINUTE = "yyyy-MM-dd HH:mm";
 
     public static final String DATE_PATTERN_YYYYMMDD = "yyyyMMdd";
+    public static final String DATE_PATTERN_YYYYMMDDHHMM = "yyyyMMddHHmm";
     public static final String DATE_NAME_PATTERN = "yyyy年MM月dd日";
     public static final String MONTH_NAME_PATTERN = "yyyy年MM月";
     public static final String DATE_PATTERN_YYYY = "yyyy";

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

@@ -735,7 +735,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
     @Override
     public void autoPublishIcPartyAct() {
         Date nowDate=new Date();
-        String dateId=DateUtils.format(nowDate,DateUtils.DATE_PATTERN_YYYYMMDD);
+        String dateId=DateUtils.format(nowDate,DateUtils.DATE_PATTERN_YYYYMMDDHHMM);
         List<IcPartyActEntity> list=baseDao.selectNoPublishList(dateId);
         for(IcPartyActEntity act:list){
             //置为已发布