diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java index b9abb82..86b56b1 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java @@ -139,7 +139,7 @@ public class CustomServiceImpl extends ExtendServiceImpl list = Lists.newArrayList(); BeanUtils.copyProperties(customEntity, address); diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java index c2c3df9..e67267e 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java +++ b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; @Data @@ -40,12 +41,18 @@ public class CustomVO { @Schema(title = "半径") private String radius; + @Schema(title = "录入时间") + private String enterName; + @Schema(title = "报名状态 0:待提交 1:已报名") private Integer enrollStatus; @Schema(title = "创建时间") private LocalDateTime createTime; + @Schema(description = "分发时间") + private Date distributeTime; + @Schema(title = "门店信息") private List customStoreVOList; @@ -55,6 +62,7 @@ public class CustomVO { @Schema(description = "公司id") private Long companyId; + @Schema(title = "备注") private String remark; } diff --git a/admin/src/main/resources/mapper/CustomMapper.xml b/admin/src/main/resources/mapper/CustomMapper.xml index 2c7f000..75ee281 100644 --- a/admin/src/main/resources/mapper/CustomMapper.xml +++ b/admin/src/main/resources/mapper/CustomMapper.xml @@ -3,6 +3,7 @@ s.store_name, + cm.enter_name, cm.custom_id, cm.custom_name, cm.custom_nid, @@ -14,7 +15,8 @@ cm.batch_no, cm.enroll_status, cm.remark, - cm.create_time + cm.create_time, + cm.distribute_time