diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 2c0fc380e6..ebf9e4dbbb 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -55,7 +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_PATTERN_YYYYMMDDHHM = "yyyyMMddHHm"; 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"; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 1383eeea2f..e92a1040d2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/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 list=baseDao.selectNoPublishList(dateId); for(IcPartyActEntity act:list){ //置为已发布 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 437085a29d..ad19154b21 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -238,7 +238,7 @@ WHERE a.DEL_FLAG = '0' AND a.IS_PUBLISH = '0' - AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i') = #{dateId} + AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i%s') like concat('%', #{dateId},'%')