Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!77 食谱展示界面开发

Browse Source 
Merge pull request !77 from 德仔/develop
This commit is contained in:
德仔
2021-02-26 20:16:12 +08:00
committed by Gitee
parent 2de4e1e845 9e87e1c9e8
commit 02a67be4fe
38 changed files with 1536 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesDetail.java Normal file
View File

@@ -0,0 +1,12 @@
package com.stdiet.custom.domain;
import lombok.Data;
import java.util.List;
@Data
public class SysRecipesDetail {
private List<SysRecipesPlan> plans;
}

73
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java
View File

@@ -1,12 +1,10 @@
package com.stdiet.custom.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* 食谱计划对象 sys_recipes_plan
@@ -15,14 +13,16 @@ import com.stdiet.common.core.domain.BaseEntity;
* @date 2021-01-15
*/
@Data
public class SysRecipesPlan extends BaseEntity
{
private static final long serialVersionUID = 1L;
public class SysRecipesPlan {
/** $column.columnComment */
/**
* $column.columnComment
*/
private Long id;
/** 订单ID */
/**
* 订单ID
*/
//@Excel(name = "订单ID")
private Long orderId;
@@ -46,12 +46,16 @@ public class SysRecipesPlan extends BaseEntity
//处理过的客户手机号
private String hidePhone;
/** 食谱开始日期 */
/**
* 食谱开始日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "食谱开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date startDate;
/** 食谱结束日期 */
/**
* 食谱结束日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "食谱结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
@@ -78,19 +82,54 @@ public class SysRecipesPlan extends BaseEntity
@Excel(name = "营养师助理")
private String nutritionistAssis;
/** 食谱ID */
/**
* 食谱ID
*/
//@Excel(name = "食谱ID")
private Long recipesId;
/** 食谱是否发送，0未发送 1已发送 */
@Excel(name = "食谱是否发送", readConverterExp="0=未发送,1=已发送")
/**
* 食谱是否发送，0未发送 1已发送
*/
@Excel(name = "食谱是否发送", readConverterExp = "0=未发送,1=已发送")
private Integer sendFlag;
/** 食谱发送时间 */
/**
* 食谱发送时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "食谱发送时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date sendTime;
/** 删除标识 0未删除 1已删除 默认0 */
/**
* 删除标识 0未删除 1已删除 默认0
*/
private Integer delFlag;
/**
* 审核标识 0未审核 1已审核 默认0
*/
private Integer reviewStatus;
/**
* 创建者
*/
private String createBy;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 更新者
*/
private String updateBy;
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

26
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanListInfo.java Normal file
View File

@@ -0,0 +1,26 @@
package com.stdiet.custom.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class SysRecipesPlanListInfo {
private Long id;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
private Integer startNumDay;
private Integer endNumDay;
private List<SysRecipesPlan> menus;
}