|
@@ -3,14 +3,13 @@ package cn.com.ctop.performanceappraisal.entity;
|
|
import com.baomidou.mybatisplus.annotation.IdType;
|
|
import com.baomidou.mybatisplus.annotation.IdType;
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
import com.baomidou.mybatisplus.annotation.TableName;
|
|
import com.baomidou.mybatisplus.annotation.TableName;
|
|
-import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
|
import io.swagger.annotations.ApiModel;
|
|
import io.swagger.annotations.ApiModel;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
import lombok.EqualsAndHashCode;
|
|
import lombok.EqualsAndHashCode;
|
|
import lombok.experimental.Accessors;
|
|
import lombok.experimental.Accessors;
|
|
|
|
+import org.jeecg.common.aspect.annotation.Dict;
|
|
import org.jeecgframework.poi.excel.annotation.Excel;
|
|
import org.jeecgframework.poi.excel.annotation.Excel;
|
|
-import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
|
|
@@ -31,20 +30,22 @@ public class Performance {
|
|
/**
|
|
/**
|
|
* id
|
|
* id
|
|
*/
|
|
*/
|
|
- @TableId(type = IdType.UUID)
|
|
|
|
|
|
+ @TableId(type = IdType.AUTO)
|
|
@ApiModelProperty(value = "id")
|
|
@ApiModelProperty(value = "id")
|
|
- private Integer id;
|
|
|
|
|
|
+ private Long id;
|
|
/**
|
|
/**
|
|
* sys_user的主键id
|
|
* sys_user的主键id
|
|
*/
|
|
*/
|
|
@Excel(name = "sys_user的主键id", width = 15)
|
|
@Excel(name = "sys_user的主键id", width = 15)
|
|
@ApiModelProperty(value = "sys_user的主键id")
|
|
@ApiModelProperty(value = "sys_user的主键id")
|
|
|
|
+ @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
|
|
private String userId;
|
|
private String userId;
|
|
/**
|
|
/**
|
|
* sys_role的主键id
|
|
* sys_role的主键id
|
|
*/
|
|
*/
|
|
@Excel(name = "sys_role的主键id", width = 15)
|
|
@Excel(name = "sys_role的主键id", width = 15)
|
|
@ApiModelProperty(value = "sys_role的主键id")
|
|
@ApiModelProperty(value = "sys_role的主键id")
|
|
|
|
+ @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
|
|
private String roleId;
|
|
private String roleId;
|
|
/**
|
|
/**
|
|
* 年度
|
|
* 年度
|
|
@@ -61,19 +62,15 @@ public class Performance {
|
|
/**
|
|
/**
|
|
* 绩效统计开始时间
|
|
* 绩效统计开始时间
|
|
*/
|
|
*/
|
|
- @Excel(name = "绩效统计开始时间", width = 15, format = "yyyy-MM-dd")
|
|
|
|
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
|
|
|
- @DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
|
|
|
|
+ @Excel(name = "绩效统计开始时间", width = 15)
|
|
@ApiModelProperty(value = "绩效统计开始时间")
|
|
@ApiModelProperty(value = "绩效统计开始时间")
|
|
- private Date startTime;
|
|
|
|
|
|
+ private String startTime;
|
|
/**
|
|
/**
|
|
* 绩效统计结束时间
|
|
* 绩效统计结束时间
|
|
*/
|
|
*/
|
|
- @Excel(name = "绩效统计结束时间", width = 15, format = "yyyy-MM-dd")
|
|
|
|
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
|
|
|
- @DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
|
|
|
|
+ @Excel(name = "绩效统计结束时间", width = 15)
|
|
@ApiModelProperty(value = "绩效统计结束时间")
|
|
@ApiModelProperty(value = "绩效统计结束时间")
|
|
- private Date endTime;
|
|
|
|
|
|
+ private String endTime;
|
|
/**
|
|
/**
|
|
* 总消耗(单位元)
|
|
* 总消耗(单位元)
|
|
*/
|
|
*/
|
|
@@ -107,8 +104,9 @@ public class Performance {
|
|
/**
|
|
/**
|
|
* 1_快手2_抖音
|
|
* 1_快手2_抖音
|
|
*/
|
|
*/
|
|
- @Excel(name = "1_快手2_抖音", width = 15)
|
|
|
|
- @ApiModelProperty(value = "1_快手2_抖音")
|
|
|
|
|
|
+ @Excel(name = "媒体类型", width = 15)
|
|
|
|
+ @ApiModelProperty(value = "媒体类型")
|
|
|
|
+ @Dict(dicCode = "media_type")
|
|
private Integer appType;
|
|
private Integer appType;
|
|
/**
|
|
/**
|
|
* 创建时间
|
|
* 创建时间
|