diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index 1217ea6875..39ed442ef3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -110,17 +110,28 @@ public class IcPartyActivityDTO implements Serializable { private String content; /** - * 服务人数 + * 服务人数;烟台:服务人数是活动限制名额,如果是0代表不限制 */ private Integer peopleCount; /** - * 活动时间 + * 活动时间;烟台:此列作为活动开始时间 */ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern="yyyy-MM-dd HH:mm") private Date activityTime; + /** + * 烟台:此列作为活动结束时间;必填; + */ + private Date activityEndTime; + + /** + * 烟台:活动封面;必填 + */ + private String coverUrl; + + /** * 活动地址 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java index 28a588f6f4..630e95732d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java @@ -83,14 +83,24 @@ public class IcPartyActivityEntity extends BaseEpmetEntity { private String content; /** - * 服务人数 + * 服务人数;烟台:服务人数是活动限制名额,如果是0代表不限制 */ private Integer peopleCount; /** - * 活动时间 + * 活动时间;烟台:此列作为活动开始时间 */ private Date activityTime; + /** + * 烟台:此列作为活动结束时间;必填; + */ + private Date activityEndTime; + + /** + * 烟台:活动封面;必填 + */ + private String coverUrl; + /** * 活动地址 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index e142f3680f..c476109e35 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -63,7 +63,9 @@ a.LATITUDE, a.RESULT, a.AGENCY_ID, - a.CUSTOMER_ID + a.CUSTOMER_ID, + a.COVER_URL, + a.ACTIVITY_END_TIME FROM ic_party_activity a left join ic_activity_unit_relation ur