Skip to content

A
attendance-performance-platform
Commit 56b22778 authored by daijunxiong's avatar daijunxiong
Browse files
Options

新增考勤假期字段

parent 415c5c9c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 12457 additions and 8833 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationRecordEntity.java
View file @ 56b22778
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationRecordVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationRecordVo;
import java.math.BigDecimal;
/** /**
* 员工假期记录信息实体对象 * 员工假期记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-12 * @date 2023-04-14
*/ */
public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 员工id * 员工id
*/ */
@Excel(name = "员工id") @Excel(name = "员工id")
private Long staffId; private Long staffId;
/** /**
* 员工姓名 * 员工姓名
*/ */
private String staffName; private String staffName;
/** /**
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
*/ */
private Integer type; private Integer type;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
private Integer subAddType; private Integer subAddType;
/** /**
* 有效期 * 有效期
*/ */
private String validityPeriod; private String validityPeriod;
/** /**
* 增加或扣减天数（天） * 增加或扣减天数（天）
*/ */
private BigDecimal subOrAddDays; private BigDecimal subOrAddDays;
/** /**
* 内容 * 内容
*/ */
private String content; private String content;
/** /**
* 规则 * 规则
*/ */
private String rule; private String rule;
/** /**
* 理由 * 理由
*/ */
private String reason; private String reason;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
public AttendanceVacationRecordEntity(){} public AttendanceVacationRecordEntity(){}
/** /**
* 获取 员工id * 获取 员工id
* @return Long * @return Long
*/ */
public Long getStaffId(){ public Long getStaffId(){
return staffId; return staffId;
} }
/** /**
* 设置 员工id * 设置 员工id
* @param staffId * @param staffId
*/ */
public void setStaffId(Long staffId){ public void setStaffId(Long staffId){
this.staffId = staffId; this.staffId = staffId;
} }
/** /**
* 获取 员工姓名 * 获取 员工姓名
* @return String * @return String
*/ */
public String getStaffName(){ public String getStaffName(){
return staffName; return staffName;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffName * @param staffName
*/ */
public void setStaffName(String staffName){ public void setStaffName(String staffName){
this.staffName = staffName; this.staffName = staffName;
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return Integer * @return Integer
*/ */
public Integer getType(){ public Integer getType(){
return type; return type;
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param type * @param type
*/ */
public void setType(Integer type){ public void setType(Integer type){
this.type = type; this.type = type;
} }
/** /**
* 获取 增减类型(1.增加,2.扣除) * 获取 增减类型(1.增加,2.扣除)
* @return Integer * @return Integer
*/ */
public Integer getSubAddType(){ public Integer getSubAddType(){
return subAddType; return subAddType;
} }
/** /**
* 设置 增减类型(1.增加,2.扣除) * 设置 增减类型(1.增加,2.扣除)
* @param subAddType * @param subAddType
*/ */
public void setSubAddType(Integer subAddType){ public void setSubAddType(Integer subAddType){
this.subAddType = subAddType; this.subAddType = subAddType;
} }
/** /**
* 获取 有效期 * 获取 有效期
* @return String * @return String
*/ */
public String getValidityPeriod(){ public String getValidityPeriod(){
return validityPeriod; return validityPeriod;
} }
/** /**
* 设置 有效期 * 设置 有效期
* @param validityPeriod * @param validityPeriod
*/ */
public void setValidityPeriod(String validityPeriod){ public void setValidityPeriod(String validityPeriod){
this.validityPeriod = validityPeriod; this.validityPeriod = validityPeriod;
} }
/** /**
* 获取 增加或扣减天数（天） * 获取 增加或扣减天数（天）
* @return BigDecimal * @return BigDecimal
*/ */
public BigDecimal getSubOrAddDays(){ public BigDecimal getSubOrAddDays(){
return subOrAddDays; return subOrAddDays;
} }
/** /**
* 设置 增加或扣减天数（天） * 设置 增加或扣减天数（天）
* @param subOrAddDays * @param subOrAddDays
*/ */
public void setSubOrAddDays(BigDecimal subOrAddDays){ public void setSubOrAddDays(BigDecimal subOrAddDays){
this.subOrAddDays = subOrAddDays; this.subOrAddDays = subOrAddDays;
} }
/** /**
* 获取 内容 * 获取 内容
* @return String * @return String
*/ */
public String getContent(){ public String getContent(){
return content; return content;
} }
/** /**
* 设置 内容 * 设置 内容
* @param content * @param content
*/ */
public void setContent(String content){ public void setContent(String content){
this.content = content; this.content = content;
} }
/** /**
* 获取 规则 * 获取 规则
* @return String * @return String
*/ */
public String getRule(){ public String getRule(){
return rule; return rule;
} }
/** /**
* 设置 规则 * 设置 规则
* @param rule * @param rule
*/ */
public void setRule(String rule){ public void setRule(String rule){
this.rule = rule; this.rule = rule;
} }
/** /**
* 获取 理由 * 获取 理由
* @return String * @return String
*/ */
public String getReason(){ public String getReason(){
return reason; return reason;
} }
/** /**
* 设置 理由 * 设置 理由
* @param reason * @param reason
*/ */
public void setReason(String reason){ public void setReason(String reason){
this.reason = reason; this.reason = reason;
} }
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
*/ */
public String getRemark(){ public String getRemark(){
return remark; return remark;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
...@@ -208,7 +205,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -208,7 +205,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
@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) {
...@@ -216,7 +213,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -216,7 +213,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
if (obj instanceof AttendanceVacationRecordEntity) { if (obj instanceof AttendanceVacationRecordEntity) {
AttendanceVacationRecordEntity tmp = (AttendanceVacationRecordEntity) obj; AttendanceVacationRecordEntity tmp = (AttendanceVacationRecordEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -239,24 +236,24 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -239,24 +236,24 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
public void initAttrValue(){ public void initAttrValue(){
this.staffId = null; this.staffId = null;
this.staffName = ""; this.staffName = "";
this.type = null; this.type = null;
this.subAddType = 1; this.subAddType = 1;
this.validityPeriod = "0"; this.validityPeriod = "0";
this.subOrAddDays = BigDecimal.valueOf(0); this.subOrAddDays = BigDecimal.valueOf(0);
this.content = ""; this.content = "";
this.rule = ""; this.rule = "";
this.reason = ""; this.reason = "";
this.remark = ""; this.remark = "";
} }
} }
\ No newline at end of file
db/menu.sql
View file @ 56b22778
...@@ -283,6 +283,17 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRe ...@@ -283,6 +283,17 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRe
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '8', '例假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '8', '例假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '9', '哺乳假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '9', '哺乳假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '10', '丧假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '10', '丧假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '11', '回单位', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '12', '因公请假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '13', '外出勘验', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '14', '值班补班', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '15', '体检', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '16', '隔离', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '17', '因公外出', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '18', '公休', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '19', '育儿假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '20', '调回单位', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '21', '探亲假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 员工假期余额信息菜单 SQL -- 员工假期余额信息菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -546,5 +557,16 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio ...@@ -546,5 +557,16 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '8', '例假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '8', '例假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '9', '哺乳假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '9', '哺乳假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '10', '丧假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '10', '丧假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '11', '回单位', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '12', '因公请假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '13', '外出勘验', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '14', '值班补班', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '15', '体检', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '16', '隔离', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '17', '因公外出', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '18', '公休', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '19', '育儿假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '20', '调回单位', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '21', '探亲假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
\ No newline at end of file
db/module.sql
View file @ 56b22778
This diff is collapsed.
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