Commit 5e443f53 authored by 赵啸非's avatar 赵啸非

添加照片海康下载

parent c569b630
...@@ -9,136 +9,145 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -9,136 +9,145 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo; import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo;
import lombok.Data; import lombok.Data;
/** /**
* 考勤绩效记录核查信息实体对象 * 考勤绩效记录核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-10 * @date 2023-07-15
*/ */
@Data @Data
public class CheckAttendRecordEntity extends CheckAttendRecordVo { public class CheckAttendRecordEntity extends CheckAttendRecordVo {
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;
/** /**
* 员工姓名 * 员工姓名
*/ */
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
private String workNum; private String workNum;
/** /**
* 所属部门 * 所属部门
*/ */
private Long deptId; private Long deptId;
/** /**
* 所属部门名称 * 所属部门名称
*/ */
private String deptName; private String deptName;
/** /**
* 所属考勤组ID * 所属考勤组ID
*/ */
private Long attendanceGroupId; private Long attendanceGroupId;
/** /**
* 所属考勤组名称 * 所属考勤组名称
*/ */
private String attendanceGroupName; private String attendanceGroupName;
/** /**
* 考勤时间 * 考勤时间
*/ */
private Date attendanceDate; private Date attendanceDate;
/** /**
* 绩效规则id * 绩效规则id
*/ */
private Long ruleId; private Long ruleId;
/** /**
* 规则名称 * 规则名称
*/ */
private String ruleName; private String ruleName;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
private Integer subAddType; private Integer subAddType;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
private BigDecimal score; private BigDecimal score;
/** /**
* 上下班时间 * 上下班时间
*/ */
private String goOffTimeStr; private String goOffTimeStr;
/** /**
* 异常时间 * 异常时间
*/ */
private Date errorTime; private Date errorTime;
/** /**
* 实际打卡时间 * 实际打卡时间
*/ */
private Date actualAttendTime; private Date actualAttendTime;
/** /**
* 异常处理结果 * 异常处理结果
*/ */
private String errorResult; private String errorResult;
/** /**
* 核查人员 * 核查人员
*/ */
@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;
/** /**
* 核查结果(1.加分或扣分,2.不扣分) * 核查结果(1.加分或扣分,2.不扣分)
*/ */
@Excel(name = "核查结果", readConverterExp = "1=加分或扣分,2.不扣分") @Excel(name = "核查结果", readConverterExp = "1=加分或扣分,2.不扣分")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
*/ */
private Integer checkStatus; private Integer checkStatus;
/** /**
* 扣分方式(1.系统自动,2.人工添加,3.大厅巡查,4.申诉冲销) * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
*/ */
private Integer subMethod; private Integer subMethod;
/** /**
* 备注 * 备注
*/ */
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
/** /**
* 附件名称,多个逗号分割 * 附件名称,多个逗号分割
*/ */
@Excel(name = "附件名称,多个逗号分割") @Excel(name = "附件名称,多个逗号分割")
private String fileNames; private String fileNames;
/** /**
* 附件下载地址,多个逗号分割 * 附件下载地址,多个逗号分割
*/ */
@Excel(name = "附件下载地址,多个逗号分割") @Excel(name = "附件下载地址,多个逗号分割")
private String filePaths; private String filePaths;
/** /**
* 绩效规则分类id * 绩效规则分类id
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 规则分类名称 * 规则名称
*/ */
private String categoryName; private String categoryName;
/**
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分时间
*/
private Date deductTime;
@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) {
...@@ -146,7 +155,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -146,7 +155,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
if (obj instanceof CheckAttendRecordEntity) { if (obj instanceof CheckAttendRecordEntity) {
CheckAttendRecordEntity tmp = (CheckAttendRecordEntity) obj; CheckAttendRecordEntity tmp = (CheckAttendRecordEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -154,60 +163,64 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -154,60 +163,64 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
public void initAttrValue(){ public void initAttrValue(){
this.recordId = -1L; this.recordId = -1L;
this.staffId = -1L;
this.staffName = "";
this.staffId = -1L; this.workNum = "";
this.staffName = ""; this.deptId = -1L;
this.workNum = ""; this.deptName = "";
this.deptId = -1L; this.attendanceGroupId = -1L;
this.deptName = ""; this.attendanceGroupName = "";
this.attendanceGroupId = -1L; this.attendanceDate = null;
this.attendanceGroupName = ""; this.ruleId = -1L;
this.attendanceDate = null; this.ruleName = "";
this.ruleId = -1L; this.subAddType = 1;
this.ruleName = ""; this.score = BigDecimal.valueOf(0.00);
this.subAddType = 1; this.goOffTimeStr = "";
this.score = BigDecimal.valueOf(0.00); this.errorTime = null;
this.goOffTimeStr = ""; this.actualAttendTime = null;
this.errorTime = null; this.errorResult = "";
this.actualAttendTime = null; this.checkPerson = "";
this.errorResult = ""; this.checkTime = null;
this.checkPerson = ""; this.checkDesc = "";
this.checkTime = null; this.checkResult = "";
this.checkDesc = ""; this.checkStatus = 1;
this.checkResult = ""; this.subMethod = 1;
this.checkStatus = 1; this.remark = "";
this.subMethod = 1; this.fileNames = "";
this.remark = ""; this.filePaths = "";
this.fileNames = ""; this.categoryId = -1L;
this.filePaths = ""; this.categoryName = "";
this.categoryId = -1L; this.deductPerson = "";
this.categoryName = ""; this.deductTime = null;
} }
} }
\ No newline at end of file
...@@ -651,3 +651,9 @@ ALTER TABLE mortals_xhx_perform_attend_appeal ADD COLUMN `deductPerson` varchar( ...@@ -651,3 +651,9 @@ ALTER TABLE mortals_xhx_perform_attend_appeal ADD COLUMN `deductPerson` varchar(
ALTER TABLE mortals_xhx_perform_attend_appeal ADD COLUMN `deductTime` datetime COMMENT '扣分时间' AFTER deductPerson; ALTER TABLE mortals_xhx_perform_attend_appeal ADD COLUMN `deductTime` datetime COMMENT '扣分时间' AFTER deductPerson;
ALTER TABLE mortals_xhx_user ADD COLUMN `dingUserId` varchar(64) DEFAULT '' COMMENT '钉钉userId' AFTER customerId; ALTER TABLE mortals_xhx_user ADD COLUMN `dingUserId` varchar(64) DEFAULT '' COMMENT '钉钉userId' AFTER customerId;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `deductPerson` varchar(128) DEFAULT '' COMMENT '扣分人员' AFTER subMethod;
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `deductTime` datetime COMMENT '扣分时间' AFTER deductPerson;
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