外食计算器功能优化修改

This commit is contained in:
xiezhijun
2021-02-20 19:38:17 +08:00
parent afdee0abdf
commit 3f3fcda862
15 changed files with 822 additions and 108 deletions

View File

@ -0,0 +1,57 @@
package com.stdiet.custom.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 外食热量统计对象 sys_customer_heat_statistics
*
* @author xzj
* @date 2021-02-20
*/
@Data
public class SysCustomerHeatStatistics extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
/** 客户ID */
@Excel(name = "客户ID")
private Long customerId;
/** 日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date edibleDate;
/** 最大可摄入量 */
@Excel(name = "最大可摄入量")
private Integer maxHeatValue;
/** 当天食材总热量 */
@Excel(name = "当天食材总热量")
private Integer heatValue;
/** 当天热量缺口 */
@Excel(name = "当天热量缺口")
private Integer heatGap;
/** 删除标识 0未删除 1已删除 */
private Integer delFlag;
//食材热量ID
private Long[] foodHeatIdList;
//食材热量
private Integer[] foodHeatList;
//具体食材集合
private List<SysFoodHeatStatistics> foodHeatStatisticsList;
}

View File

@ -1,7 +1,5 @@
package com.stdiet.custom.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import lombok.Data;
@ -20,9 +18,9 @@ public class SysFoodHeatStatistics extends BaseEntity
/** $column.columnComment */
private Long id;
/** 客户ID */
@Excel(name = "客户ID")
private Long customerId;
/** 客户热量统计ID */
@Excel(name = "客户热量统计ID")
private Long customerHeatId;
/** 食材 */
@Excel(name = "食材")
@ -42,11 +40,6 @@ public class SysFoodHeatStatistics extends BaseEntity
@Excel(name = "具体质量,单位:克")
private Integer quantity;
/** 食用日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "食用日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date edibleDate;
/** 类型0早 1中 2晚 */
@Excel(name = "类型0早 1中 2晚")
private Integer edibleType;
@ -55,11 +48,9 @@ public class SysFoodHeatStatistics extends BaseEntity
@Excel(name = "热量数值")
private Integer heatValue;
/** 热量缺口 */
@Excel(name = "热量缺口")
private Integer heatGap;
/** 删除标识 0未删除 1已删除 */
private Integer delFlag;
}