Merge branch 'master' of https://git.evo-techina.com/hbyt/evo-Financial-pc
# Conflicts: # evo-admin/src/main/java/com/evo/attendance/mapper/RzAttendanceDetailMapper.java # evo-admin/src/main/java/com/evo/attendance/mapper/RzAttendanceStatisticalMapper.java # evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java # evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java # evo-admin/src/main/java/com/evo/common/utils/poi/ExcelUtilSs.java # evo-admin/src/main/java/com/evo/equipment/service/IEqButtonService.java # evo-admin/src/main/java/com/evo/equipment/service/impl/EqButtonServiceImpl.java # evo-admin/src/main/java/com/evo/finance/controller/RzSalaryDetailController.java # evo-admin/src/main/java/com/evo/finance/service/impl/RzSalaryDetailServiceImpl.java # evo-admin/src/main/java/com/evo/framework/websocket/WebSocketServer.java # evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantDetailController.java # evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantStatisticsController.java # evo-admin/src/main/java/com/evo/restaurant/mapper/RzRestaurantStatisticsMapper.java # evo-admin/src/main/java/com/evo/restaurant/service/IRzRestaurantDetailService.java # evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantDetailServiceImpl.java # evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantStatisticsServiceImpl.java # evo-admin/src/main/java/com/evo/system/domain/SysStaffDetail.java # evo-admin/src/main/java/com/evo/system/service/impl/SysStaffDetailServiceImpl.java # evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java # evo-admin/src/main/resources/mapper/attendance/RzAttendanceStatisticalMapper.xml # evo-admin/src/main/resources/mapper/restaurant/RzRestaurantStatisticsMapper.xml
This commit is contained in:
lhb
commit
33eddc864f
@ -0,0 +1,384 @@
|
||||
package com.evo.restaurant.domain;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.evo.common.annotation.Excel;
|
||||
import com.evo.common.core.domain.BaseEntity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 餐饮消费明细对象 cy_consumption_info
|
||||
*
|
||||
* @author zhukangchao
|
||||
* @date 2023-10-05
|
||||
*/
|
||||
public class CyConsumptionInfo extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private Long id;
|
||||
|
||||
/** 月统计id */
|
||||
private Long statisticsId;
|
||||
|
||||
/** 日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date dateTime;
|
||||
|
||||
private String dateTime1;
|
||||
|
||||
public String getDateTime1() {
|
||||
return dateTime1;
|
||||
}
|
||||
|
||||
public void setDateTime1(String dateTime1) {
|
||||
this.dateTime1 = dateTime1;
|
||||
}
|
||||
|
||||
/** 姓名 */
|
||||
@Excel(name = "姓名")
|
||||
private String name;
|
||||
|
||||
/** 上班卡 */
|
||||
@Excel(name = "上班卡")
|
||||
private String shangBan;
|
||||
|
||||
/** 下班卡 */
|
||||
@Excel(name = "下班卡")
|
||||
private String xiaBan;
|
||||
|
||||
/** 工作时长 */
|
||||
@Excel(name = "工作时长")
|
||||
private Double duration;
|
||||
|
||||
/** 早餐次数 */
|
||||
@Excel(name = "早餐次数")
|
||||
private Long breakfastNumber;
|
||||
|
||||
/** 早餐补助 */
|
||||
@Excel(name = "早餐补助")
|
||||
private Double breakfastSubsidy;
|
||||
|
||||
/** 早餐个人消费 */
|
||||
@Excel(name = "早餐个人消费")
|
||||
private Double breakfastPersonalConsumption;
|
||||
|
||||
/** 早餐总消费 */
|
||||
@Excel(name = "早餐总消费")
|
||||
private Double breakfastSumConsumption;
|
||||
|
||||
/** 午餐次数 */
|
||||
@Excel(name = "午餐次数")
|
||||
private Long lunchNumber;
|
||||
|
||||
/** 午餐补助 */
|
||||
@Excel(name = "午餐补助")
|
||||
private Double lunchSubsidy;
|
||||
|
||||
/** 午餐个人消费 */
|
||||
@Excel(name = "午餐个人消费")
|
||||
private Double lunchPresonalConsumption;
|
||||
|
||||
/** 午餐总消费 */
|
||||
@Excel(name = "午餐总消费")
|
||||
private Double lunchSumConsumption;
|
||||
|
||||
/** 晚餐次数 */
|
||||
@Excel(name = "晚餐次数")
|
||||
private Long supperNumber;
|
||||
|
||||
/** 晚餐补助 */
|
||||
@Excel(name = "晚餐补助")
|
||||
private Double supperSubsidy;
|
||||
|
||||
/** 晚餐个人消费 */
|
||||
@Excel(name = "晚餐个人消费")
|
||||
private Double supperPersonalConsumption;
|
||||
|
||||
/** 晚餐总消费 */
|
||||
@Excel(name = "晚餐总消费")
|
||||
private Double supperSumConsumption;
|
||||
|
||||
/** 总补贴 */
|
||||
@Excel(name = "总补贴")
|
||||
private Double sumSubsidy;
|
||||
|
||||
/** 个人总消费 */
|
||||
@Excel(name = "个人总消费")
|
||||
private Double personalSumConsumption;
|
||||
|
||||
/** 总消费 */
|
||||
@Excel(name = "总消费")
|
||||
private Double sumConsumption;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String sparedOne;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String sparedTwo;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private Long sparedThree;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private Long sparedFour;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
public Long getStatisticsId() {
|
||||
return statisticsId;
|
||||
}
|
||||
|
||||
public void setStatisticsId(Long statisticsId) {
|
||||
this.statisticsId = statisticsId;
|
||||
}
|
||||
|
||||
public void setDateTime(Date dateTime)
|
||||
{
|
||||
this.dateTime = dateTime;
|
||||
}
|
||||
|
||||
public Date getDateTime()
|
||||
{
|
||||
return dateTime;
|
||||
}
|
||||
public void setName(String name)
|
||||
{
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
public void setShangBan(String shangBan)
|
||||
{
|
||||
this.shangBan = shangBan;
|
||||
}
|
||||
|
||||
public String getShangBan()
|
||||
{
|
||||
return shangBan;
|
||||
}
|
||||
public void setXiaBan(String xiaBan)
|
||||
{
|
||||
this.xiaBan = xiaBan;
|
||||
}
|
||||
|
||||
public String getXiaBan()
|
||||
{
|
||||
return xiaBan;
|
||||
}
|
||||
public void setDuration(Double duration)
|
||||
{
|
||||
this.duration = duration;
|
||||
}
|
||||
|
||||
public Double getDuration()
|
||||
{
|
||||
return duration;
|
||||
}
|
||||
public void setBreakfastNumber(Long breakfastNumber)
|
||||
{
|
||||
this.breakfastNumber = breakfastNumber;
|
||||
}
|
||||
|
||||
public Long getBreakfastNumber()
|
||||
{
|
||||
return breakfastNumber;
|
||||
}
|
||||
public void setBreakfastSubsidy(Double breakfastSubsidy)
|
||||
{
|
||||
this.breakfastSubsidy = breakfastSubsidy;
|
||||
}
|
||||
|
||||
public Double getBreakfastSubsidy()
|
||||
{
|
||||
return breakfastSubsidy;
|
||||
}
|
||||
public void setBreakfastPersonalConsumption(Double breakfastPersonalConsumption)
|
||||
{
|
||||
this.breakfastPersonalConsumption = breakfastPersonalConsumption;
|
||||
}
|
||||
|
||||
public Double getBreakfastPersonalConsumption()
|
||||
{
|
||||
return breakfastPersonalConsumption;
|
||||
}
|
||||
public void setBreakfastSumConsumption(Double breakfastSumConsumption)
|
||||
{
|
||||
this.breakfastSumConsumption = breakfastSumConsumption;
|
||||
}
|
||||
|
||||
public Double getBreakfastSumConsumption()
|
||||
{
|
||||
return breakfastSumConsumption;
|
||||
}
|
||||
public void setLunchNumber(Long lunchNumber)
|
||||
{
|
||||
this.lunchNumber = lunchNumber;
|
||||
}
|
||||
|
||||
public Long getLunchNumber()
|
||||
{
|
||||
return lunchNumber;
|
||||
}
|
||||
public void setLunchSubsidy(Double lunchSubsidy)
|
||||
{
|
||||
this.lunchSubsidy = lunchSubsidy;
|
||||
}
|
||||
|
||||
public Double getLunchSubsidy()
|
||||
{
|
||||
return lunchSubsidy;
|
||||
}
|
||||
public void setLunchPresonalConsumption(Double lunchPresonalConsumption)
|
||||
{
|
||||
this.lunchPresonalConsumption = lunchPresonalConsumption;
|
||||
}
|
||||
|
||||
public Double getLunchPresonalConsumption()
|
||||
{
|
||||
return lunchPresonalConsumption;
|
||||
}
|
||||
public void setLunchSumConsumption(Double lunchSumConsumption)
|
||||
{
|
||||
this.lunchSumConsumption = lunchSumConsumption;
|
||||
}
|
||||
|
||||
public Double getLunchSumConsumption()
|
||||
{
|
||||
return lunchSumConsumption;
|
||||
}
|
||||
public void setSupperNumber(Long supperNumber)
|
||||
{
|
||||
this.supperNumber = supperNumber;
|
||||
}
|
||||
|
||||
public Long getSupperNumber()
|
||||
{
|
||||
return supperNumber;
|
||||
}
|
||||
public void setSupperSubsidy(Double supperSubsidy)
|
||||
{
|
||||
this.supperSubsidy = supperSubsidy;
|
||||
}
|
||||
|
||||
public Double getSupperSubsidy()
|
||||
{
|
||||
return supperSubsidy;
|
||||
}
|
||||
public void setSupperPersonalConsumption(Double supperPersonalConsumption)
|
||||
{
|
||||
this.supperPersonalConsumption = supperPersonalConsumption;
|
||||
}
|
||||
|
||||
public Double getSupperPersonalConsumption()
|
||||
{
|
||||
return supperPersonalConsumption;
|
||||
}
|
||||
public void setSupperSumConsumption(Double supperSumConsumption)
|
||||
{
|
||||
this.supperSumConsumption = supperSumConsumption;
|
||||
}
|
||||
|
||||
public Double getSupperSumConsumption()
|
||||
{
|
||||
return supperSumConsumption;
|
||||
}
|
||||
public void setSumSubsidy(Double sumSubsidy)
|
||||
{
|
||||
this.sumSubsidy = sumSubsidy;
|
||||
}
|
||||
|
||||
public Double getSumSubsidy()
|
||||
{
|
||||
return sumSubsidy;
|
||||
}
|
||||
public void setPersonalSumConsumption(Double personalSumConsumption)
|
||||
{
|
||||
this.personalSumConsumption = personalSumConsumption;
|
||||
}
|
||||
|
||||
public Double getPersonalSumConsumption()
|
||||
{
|
||||
return personalSumConsumption;
|
||||
}
|
||||
public void setSumConsumption(Double sumConsumption)
|
||||
{
|
||||
this.sumConsumption = sumConsumption;
|
||||
}
|
||||
|
||||
public Double getSumConsumption()
|
||||
{
|
||||
return sumConsumption;
|
||||
}
|
||||
public void setSparedOne(String sparedOne)
|
||||
{
|
||||
this.sparedOne = sparedOne;
|
||||
}
|
||||
|
||||
public String getSparedOne()
|
||||
{
|
||||
return sparedOne;
|
||||
}
|
||||
public void setSparedTwo(String sparedTwo)
|
||||
{
|
||||
this.sparedTwo = sparedTwo;
|
||||
}
|
||||
|
||||
public String getSparedTwo()
|
||||
{
|
||||
return sparedTwo;
|
||||
}
|
||||
public void setSparedThree(Long sparedThree)
|
||||
{
|
||||
this.sparedThree = sparedThree;
|
||||
}
|
||||
|
||||
public Long getSparedThree()
|
||||
{
|
||||
return sparedThree;
|
||||
}
|
||||
public void setSparedFour(Long sparedFour)
|
||||
{
|
||||
this.sparedFour = sparedFour;
|
||||
}
|
||||
|
||||
public Long getSparedFour()
|
||||
{
|
||||
return sparedFour;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "CyConsumptionInfo [id=" + id + ", statisticsId=" + statisticsId + ", dateTime=" + dateTime + ", name="
|
||||
+ name + ", shangBan=" + shangBan + ", xiaBan=" + xiaBan + ", duration=" + duration
|
||||
+ ", breakfastNumber=" + breakfastNumber + ", breakfastSubsidy=" + breakfastSubsidy
|
||||
+ ", breakfastPersonalConsumption=" + breakfastPersonalConsumption + ", breakfastSumConsumption="
|
||||
+ breakfastSumConsumption + ", lunchNumber=" + lunchNumber + ", lunchSubsidy=" + lunchSubsidy
|
||||
+ ", lunchPresonalConsumption=" + lunchPresonalConsumption + ", lunchSumConsumption="
|
||||
+ lunchSumConsumption + ", supperNumber=" + supperNumber + ", supperSubsidy=" + supperSubsidy
|
||||
+ ", supperPersonalConsumption=" + supperPersonalConsumption + ", supperSumConsumption="
|
||||
+ supperSumConsumption + ", sumSubsidy=" + sumSubsidy + ", personalSumConsumption="
|
||||
+ personalSumConsumption + ", sumConsumption=" + sumConsumption + ", sparedOne=" + sparedOne
|
||||
+ ", sparedTwo=" + sparedTwo + ", sparedThree=" + sparedThree + ", sparedFour=" + sparedFour + "]";
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user