Browse Source

联建活动,导入模板调整,导出调整。

dev
yinzuomei 2 years ago
parent
commit
6c6cb6809a
  1. 4
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
  2. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
  3. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityImportExcel.java
  4. BIN
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx

4
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java

@ -118,12 +118,14 @@ public class IcPartyActivityDTO implements Serializable {
* 活动时间;烟台此列作为活动开始时间
*/
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date activityTime;
/**
* 烟台此列作为活动结束时间;必填
*/
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date activityEndTime;
/**

13
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java

@ -49,9 +49,20 @@ public class IcPartyActivityExcel {
private Integer peopleCount;
@ColumnWidth(20)
@ExcelProperty(value = "活动时间")
@ExcelProperty(value = "活动开始时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date activityTime;
/**
* 烟台此列作为活动结束时间;必填
*/
@ColumnWidth(20)
@ExcelProperty(value = "活动结束时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date activityEndTime;
/**
* actId不为空小程序
* 为空管理平台

13
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityImportExcel.java

@ -51,11 +51,20 @@ public class IcPartyActivityImportExcel extends ExcelVerifyInfo {
@ExcelProperty(value = "服务人数*")
private Integer peopleCount;
@NotNull(message = "活动时间不能为空")
@ExcelProperty("活动时间*")
@NotNull(message = "活动开始时间不能为空")
@ExcelProperty("活动开始时间*")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date activityTime;
/**
* 烟台此列作为活动结束时间;必填
*/
@NotNull(message = "活动结束时间不能为空")
@ExcelProperty("活动结束时间*")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date activityEndTime;
@NotBlank(message = "详细地址")
@Length(max = 250, message = "详细地址最多输入250字")
@ExcelProperty(value = "详细地址*")

BIN
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx

Binary file not shown.
Loading…
Cancel
Save