Commit 3bf08578 authored by 赵啸非's avatar 赵啸非

修改导出业务

parent 452103c9
...@@ -12,7 +12,7 @@ import lombok.Data; ...@@ -12,7 +12,7 @@ import lombok.Data;
* 考勤绩效记录核查信息实体对象 * 考勤绩效记录核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-16 * @date 2023-07-17
*/ */
@Data @Data
public class CheckAttendRecordEntity extends CheckAttendRecordVo { public class CheckAttendRecordEntity extends CheckAttendRecordVo {
...@@ -29,10 +29,12 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -29,10 +29,12 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 所属部门 * 所属部门
...@@ -41,6 +43,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -41,6 +43,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 所属考勤组ID * 所属考勤组ID
...@@ -49,10 +52,12 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -49,10 +52,12 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 所属考勤组名称 * 所属考勤组名称
*/ */
@Excel(name = "所属考勤组名称")
private String attendanceGroupName; private String attendanceGroupName;
/** /**
* 考勤时间 * 考勤时间
*/ */
@Excel(name = "考勤时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date attendanceDate; private Date attendanceDate;
/** /**
* 绩效规则id * 绩效规则id
...@@ -61,30 +66,37 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -61,30 +66,37 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2.扣除")
private Integer subAddType; private Integer subAddType;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 上下班时间 * 上下班时间
*/ */
@Excel(name = "上下班时间")
private String goOffTimeStr; private String goOffTimeStr;
/** /**
* 异常时间 * 异常时间
*/ */
@Excel(name = "异常时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date errorTime; private Date errorTime;
/** /**
* 实际打卡时间 * 实际打卡时间
*/ */
@Excel(name = "实际打卡时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date actualAttendTime; private Date actualAttendTime;
/** /**
* 异常处理结果 * 异常处理结果
*/ */
@Excel(name = "异常处理结果")
private String errorResult; private String errorResult;
/** /**
* 核查人员 * 核查人员
...@@ -94,6 +106,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -94,6 +106,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 核查时间 * 核查时间
*/ */
@Excel(name = "核查时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime; private Date checkTime;
/** /**
* 核查说明 * 核查说明
...@@ -103,7 +116,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -103,7 +116,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 核查结果(1.加分或扣分,2.不扣分) * 核查结果(1.加分或扣分,2.不扣分)
*/ */
@Excel(name = "核查结果", readConverterExp = "1=加分或扣分,2.不扣分") @Excel(name = "核查结果", readConverterExp = "加分或扣分=加分或扣分,不扣分=不扣分")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -121,20 +134,19 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -121,20 +134,19 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 附件名称,多个逗号分割 * 附件名称,多个逗号分割
*/ */
@Excel(name = "附件名称,多个逗号分割")
private String fileNames; private String fileNames;
/** /**
* 附件下载地址,多个逗号分割 * 附件下载地址,多个逗号分割
*/ */
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths; private String filePaths;
/** /**
* 绩效规则分类id * 绩效规则分类id
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 规则名称 * 种类名称
*/ */
@Excel(name = "种类名称")
private String categoryName; private String categoryName;
/** /**
* 扣分人员 * 扣分人员
...@@ -144,6 +156,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -144,6 +156,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 扣分时间 * 扣分时间
*/ */
@Excel(name = "扣分时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deductTime; private Date deductTime;
/** /**
* 窗口编号 * 窗口编号
......
...@@ -136,12 +136,10 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -136,12 +136,10 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/** /**
* 附件名称,多个逗号分割 * 附件名称,多个逗号分割
*/ */
@Excel(name = "附件名称,多个逗号分割")
private String fileNames; private String fileNames;
/** /**
* 附件下载地址,多个逗号分割 * 附件下载地址,多个逗号分割
*/ */
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths; private String filePaths;
/** /**
* 绩效规则分类id * 绩效规则分类id
......
...@@ -53,7 +53,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -53,7 +53,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/** /**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉) * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉") @Excel(name = "违规类型", readConverterExp = "1=脱岗,2=离岗,3=玩手机,4=睡觉")
private Integer irregularType; private Integer irregularType;
/** /**
* 发生时间 * 发生时间
......
...@@ -9,145 +9,148 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -9,145 +9,148 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckGoworkRecordVo; import com.mortals.xhx.module.check.model.vo.CheckGoworkRecordVo;
import lombok.Data; import lombok.Data;
/** /**
* 办件绩效核查信息实体对象 * 办件绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-11 * @date 2023-07-17
*/ */
@Data @Data
public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 记录ID * 记录ID
*/ */
private Long recordId; private Long recordId;
/** /**
* 员工ID * 员工ID
*/ */
private Long staffId; private Long staffId;
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名") @Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号") @Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
*/ */
private Long deptId; private Long deptId;
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称") @Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 办件编码 * 办件编码
*/ */
@Excel(name = "办件编码") @Excel(name = "办件编码")
private String goworkCode; private String goworkCode;
/** /**
* 办件所属部门 * 办件所属部门
*/ */
@Excel(name = "办件所属部门") @Excel(name = "办件所属部门")
private String goworkDepts; private String goworkDepts;
/** /**
* 事项名称 * 事项名称
*/ */
@Excel(name = "事项名称") @Excel(name = "事项名称")
private String matterlName; private String matterlName;
/** /**
* 办理时间 * 办理时间
*/ */
@Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "办理时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime; private Date goworkTime;
/** /**
* 绩效规则id * 绩效规则id
*/ */
private Long ruleId; private Long ruleId;
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称") @Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
@Excel(name = "扣分方式", readConverterExp = "1=系统自动,2.人工添加")
private Integer subMethod; private Integer subMethod;
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员") @Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
*/ */
@Excel(name = "扣分时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deductTime; private Date deductTime;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值") @Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员") @Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
*/ */
@Excel(name = "核查时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime; private Date checkTime;
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明") @Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果") @Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
*/ */
private Integer checkStatus; private Integer checkStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 附件名称,多个逗号分割 * 附件名称,多个逗号分割
*/ */
@Excel(name = "附件名称,多个逗号分割")
private String fileNames; private String fileNames;
/** /**
* 附件下载地址,多个逗号分割 * 附件下载地址,多个逗号分割
*/ */
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths; private String filePaths;
/** /**
* 绩效规则分类id * 绩效规则分类id
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 规则名称 * 规则名称
*/ */
private String categoryName; private String categoryName;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2.扣除")
private Integer subAddType; private Integer subAddType;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -155,7 +158,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -155,7 +158,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
if (obj instanceof CheckGoworkRecordEntity) { if (obj instanceof CheckGoworkRecordEntity) {
CheckGoworkRecordEntity tmp = (CheckGoworkRecordEntity) obj; CheckGoworkRecordEntity tmp = (CheckGoworkRecordEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -163,60 +166,60 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -163,60 +166,60 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
public void initAttrValue(){ public void initAttrValue(){
this.recordId = -1L; this.recordId = -1L;
this.staffId = -1L; this.staffId = -1L;
this.staffName = ""; this.staffName = "";
this.workNum = ""; this.workNum = "";
this.windowNum = ""; this.windowNum = "";
this.deptId = -1L; this.deptId = -1L;
this.deptName = ""; this.deptName = "";
this.goworkCode = ""; this.goworkCode = "";
this.goworkDepts = ""; this.goworkDepts = "";
this.matterlName = ""; this.matterlName = "";
this.goworkTime = null; this.goworkTime = null;
this.ruleId = -1L; this.ruleId = -1L;
this.ruleName = ""; this.ruleName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
this.deductTime = null; this.deductTime = null;
this.score = BigDecimal.valueOf(0.00); this.score = BigDecimal.valueOf(0.00);
this.checkPerson = ""; this.checkPerson = "";
this.checkTime = null; this.checkTime = null;
this.checkDesc = ""; this.checkDesc = "";
this.checkResult = ""; this.checkResult = "";
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = ""; this.fileNames = "";
this.filePaths = ""; this.filePaths = "";
this.categoryId = -1L; this.categoryId = -1L;
this.categoryName = ""; this.categoryName = "";
this.subAddType = 1; this.subAddType = 1;
} }
} }
\ No newline at end of file
...@@ -9,135 +9,145 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -9,135 +9,145 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckOtherRecordVo; import com.mortals.xhx.module.check.model.vo.CheckOtherRecordVo;
import lombok.Data; import lombok.Data;
/** /**
* 其它绩效核查信息实体对象 * 其它绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-11 * @date 2023-07-17
*/ */
@Data @Data
public class CheckOtherRecordEntity extends CheckOtherRecordVo { public class CheckOtherRecordEntity extends CheckOtherRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 记录ID * 记录ID
*/ */
private Long recordId; private Long recordId;
/** /**
* 员工ID * 员工ID
*/ */
private Long staffId; private Long staffId;
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 所属部门 * 所属部门
*/ */
private Long deptId; private Long deptId;
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 违规类型(1.工作纪律) * 违规类型(1.工作纪律)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=工作纪律")
private Integer irregularOtherType; private Integer irregularOtherType;
/** /**
* 发生时间 * 发生时间
*/ */
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime; private Date happenTime;
/** /**
* 持续时间,秒 * 持续时间,秒
*/ */
@Excel(name = "持续时间,秒")
private Integer duration; private Integer duration;
/** /**
* 绩效规则id * 绩效规则id
*/ */
private Long ruleId; private Long ruleId;
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 评分标准 * 评分标准
*/ */
@Excel(name = "评分标准")
private String ruleDesc; private String ruleDesc;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
/** /**
* 扣分人员 * 扣分人员
*/ */
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
*/ */
private Date deductTime; private Date deductTime;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员") @Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
*/ */
private Date checkTime; private Date checkTime;
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明") @Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果") @Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
*/ */
private Integer checkStatus; private Integer checkStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 附件名称,多个逗号分割 * 附件名称,多个逗号分割
*/ */
@Excel(name = "附件名称,多个逗号分割")
private String fileNames; private String fileNames;
/** /**
* 附件下载地址,多个逗号分割 * 附件下载地址,多个逗号分割
*/ */
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths; private String filePaths;
/** /**
* 绩效规则分类id * 绩效规则分类id
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String categoryName; private String categoryName;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType; private Integer subAddType;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -145,7 +155,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -145,7 +155,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
if (obj instanceof CheckOtherRecordEntity) { if (obj instanceof CheckOtherRecordEntity) {
CheckOtherRecordEntity tmp = (CheckOtherRecordEntity) obj; CheckOtherRecordEntity tmp = (CheckOtherRecordEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -153,60 +163,60 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -153,60 +163,60 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
public void initAttrValue(){ public void initAttrValue(){
this.recordId = -1L; this.recordId = -1L;
this.staffId = -1L; this.staffId = -1L;
this.staffName = ""; this.staffName = "";
this.workNum = ""; this.workNum = "";
this.deptId = -1L; this.deptId = -1L;
this.deptName = ""; this.deptName = "";
this.windowNum = ""; this.windowNum = "";
this.irregularOtherType = -1; this.irregularOtherType = -1;
this.happenTime = null; this.happenTime = null;
this.duration = 0; this.duration = 0;
this.ruleId = -1L; this.ruleId = -1L;
this.ruleName = ""; this.ruleName = "";
this.ruleDesc = ""; this.ruleDesc = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
this.deductTime = null; this.deductTime = null;
this.score = BigDecimal.valueOf(0.00); this.score = BigDecimal.valueOf(0.00);
this.checkPerson = ""; this.checkPerson = "";
this.checkTime = null; this.checkTime = null;
this.checkDesc = ""; this.checkDesc = "";
this.checkResult = ""; this.checkResult = "";
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = ""; this.fileNames = "";
this.filePaths = ""; this.filePaths = "";
this.categoryId = -1L; this.categoryId = -1L;
this.categoryName = ""; this.categoryName = "";
this.subAddType = 1; this.subAddType = 1;
} }
} }
\ No newline at end of file
...@@ -9,142 +9,147 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -9,142 +9,147 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckReviewRecordVo; import com.mortals.xhx.module.check.model.vo.CheckReviewRecordVo;
import lombok.Data; import lombok.Data;
/** /**
* 评价差评绩效核查信息实体对象 * 评价差评绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-11 * @date 2023-07-17
*/ */
@Data @Data
public class CheckReviewRecordEntity extends CheckReviewRecordVo { public class CheckReviewRecordEntity extends CheckReviewRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 记录ID * 记录ID
*/ */
private Long recordId; private Long recordId;
/** /**
* 员工ID * 员工ID
*/ */
private Long staffId; private Long staffId;
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名") @Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号") @Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号") @Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
*/ */
private Long deptId; private Long deptId;
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 评价结果(1.非常不满意,2.差评) * 评价结果(1.非常不满意,2.差评)
*/ */
@Excel(name = "评价结果", readConverterExp = "1=非常不满意,2=差评")
private Integer reviewResult; private Integer reviewResult;
/** /**
* 评价时间 * 评价时间
*/ */
@Excel(name = "评价时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date reviewTime; private Date reviewTime;
/** /**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它) * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/ */
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)") @Excel(name = "评价来源", readConverterExp = "评价来源")
private String reviewSource; private String reviewSource;
/** /**
* 评价设备 * 评价设备
*/ */
@Excel(name = "评价设备")
private String reviewDevice; private String reviewDevice;
/** /**
* 绩效规则id * 绩效规则id
*/ */
private Long ruleId; private Long ruleId;
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称") @Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员") @Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
*/ */
private Date deductTime; private Date deductTime;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
@Excel(name = "扣分或增加分值") @Excel(name = "扣分或增加分值")
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员") @Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
*/ */
private Date checkTime; private Date checkTime;
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明") @Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果") @Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
*/ */
@Excel(name = "处理状态", readConverterExp = "1=未处理,2=已处理")
private Integer checkStatus; private Integer checkStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 附件名称,多个逗号分割 * 附件名称,多个逗号分割
*/ */
@Excel(name = "附件名称,多个逗号分割")
private String fileNames; private String fileNames;
/** /**
* 附件下载地址,多个逗号分割 * 附件下载地址,多个逗号分割
*/ */
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths; private String filePaths;
/** /**
* 绩效规则分类id * 绩效规则分类id
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称")
private String categoryName; private String categoryName;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType; private Integer subAddType;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -152,7 +157,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -152,7 +157,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
if (obj instanceof CheckReviewRecordEntity) { if (obj instanceof CheckReviewRecordEntity) {
CheckReviewRecordEntity tmp = (CheckReviewRecordEntity) obj; CheckReviewRecordEntity tmp = (CheckReviewRecordEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -160,60 +165,60 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -160,60 +165,60 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
public void initAttrValue(){ public void initAttrValue(){
this.recordId = -1L; this.recordId = -1L;
this.staffId = -1L; this.staffId = -1L;
this.staffName = ""; this.staffName = "";
this.workNum = ""; this.workNum = "";
this.windowNum = ""; this.windowNum = "";
this.deptId = -1L; this.deptId = -1L;
this.deptName = ""; this.deptName = "";
this.reviewResult = -1; this.reviewResult = -1;
this.reviewTime = null; this.reviewTime = null;
this.reviewSource = ""; this.reviewSource = "";
this.reviewDevice = ""; this.reviewDevice = "";
this.ruleId = -1L; this.ruleId = -1L;
this.ruleName = ""; this.ruleName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
this.deductTime = null; this.deductTime = null;
this.score = BigDecimal.valueOf(0.00); this.score = BigDecimal.valueOf(0.00);
this.checkPerson = ""; this.checkPerson = "";
this.checkTime = null; this.checkTime = null;
this.checkDesc = ""; this.checkDesc = "";
this.checkResult = ""; this.checkResult = "";
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = ""; this.fileNames = "";
this.filePaths = ""; this.filePaths = "";
this.categoryId = -1L; this.categoryId = -1L;
this.categoryName = ""; this.categoryName = "";
this.subAddType = 1; this.subAddType = 1;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment