Skip to content

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

新增考勤假期字段

parent 415c5c9c
Expand all Show 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/AttendanceLeaveRecordEntity.java
View file @ 56b22778
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.util.Date;
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.AttendanceLeaveRecordVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceLeaveRecordVo;
import java.util.Date;
/** /**
* 请假记录信息实体对象 * 请假记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-14
*/ */
public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -39,7 +36,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -39,7 +36,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
*/ */
private String phoneNumber; private String phoneNumber;
/** /**
* 请假类型(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 leaveType; private Integer leaveType;
/** /**
...@@ -153,14 +150,14 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -153,14 +150,14 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
this.phoneNumber = phoneNumber; this.phoneNumber = phoneNumber;
} }
/** /**
* 获取 请假类型(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 getLeaveType(){ public Integer getLeaveType(){
return leaveType; return leaveType;
} }
/** /**
* 设置 请假类型(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 leaveType * @param leaveType
*/ */
public void setLeaveType(Integer leaveType){ public void setLeaveType(Integer leaveType){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.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.AttendanceStatVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceStatVo;
import java.math.BigDecimal;
/** /**
* 考勤汇总信息实体对象 * 考勤汇总信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-14
*/ */
public class AttendanceStatEntity extends AttendanceStatVo { public class AttendanceStatEntity extends AttendanceStatVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -99,7 +96,7 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -99,7 +96,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
@Excel(name = "育儿假") @Excel(name = "育儿假")
private BigDecimal childRearingLeave; private BigDecimal childRearingLeave;
/** /**
* 产假（陪护假/天） * 产假（天））
*/ */
@Excel(name = "产假") @Excel(name = "产假")
private BigDecimal maternityLeave; private BigDecimal maternityLeave;
...@@ -189,6 +186,31 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -189,6 +186,31 @@ public class AttendanceStatEntity extends AttendanceStatVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 哺乳假（天）
*/
@Excel(name = "哺乳假")
private BigDecimal breastfeedingLeaveDays;
/**
* 例假（天）
*/
@Excel(name = "例假")
private BigDecimal menstrualLeaveDays;
/**
* 年假（天）
*/
@Excel(name = "年假")
private BigDecimal annualLeaveDays;
/**
* 调休（天）
*/
@Excel(name = "调休")
private BigDecimal compensatedLeaveDays;
/**
* 陪产假（天）
*/
@Excel(name = "陪产假")
private BigDecimal paternityLeaveDays;
...@@ -432,14 +454,14 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -432,14 +454,14 @@ public class AttendanceStatEntity extends AttendanceStatVo {
this.childRearingLeave = childRearingLeave; this.childRearingLeave = childRearingLeave;
} }
/** /**
* 获取 产假（陪护假/天） * 获取 产假（天））
* @return BigDecimal * @return BigDecimal
*/ */
public BigDecimal getMaternityLeave(){ public BigDecimal getMaternityLeave(){
return maternityLeave; return maternityLeave;
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeave * @param maternityLeave
*/ */
public void setMaternityLeave(BigDecimal maternityLeave){ public void setMaternityLeave(BigDecimal maternityLeave){
...@@ -697,6 +719,76 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -697,6 +719,76 @@ public class AttendanceStatEntity extends AttendanceStatVo {
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
/**
* 获取 哺乳假（天）
* @return BigDecimal
*/
public BigDecimal getBreastfeedingLeaveDays(){
return breastfeedingLeaveDays;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDays
*/
public void setBreastfeedingLeaveDays(BigDecimal breastfeedingLeaveDays){
this.breastfeedingLeaveDays = breastfeedingLeaveDays;
}
/**
* 获取 例假（天）
* @return BigDecimal
*/
public BigDecimal getMenstrualLeaveDays(){
return menstrualLeaveDays;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDays
*/
public void setMenstrualLeaveDays(BigDecimal menstrualLeaveDays){
this.menstrualLeaveDays = menstrualLeaveDays;
}
/**
* 获取 年假（天）
* @return BigDecimal
*/
public BigDecimal getAnnualLeaveDays(){
return annualLeaveDays;
}
/**
* 设置 年假（天）
* @param annualLeaveDays
*/
public void setAnnualLeaveDays(BigDecimal annualLeaveDays){
this.annualLeaveDays = annualLeaveDays;
}
/**
* 获取 调休（天）
* @return BigDecimal
*/
public BigDecimal getCompensatedLeaveDays(){
return compensatedLeaveDays;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDays
*/
public void setCompensatedLeaveDays(BigDecimal compensatedLeaveDays){
this.compensatedLeaveDays = compensatedLeaveDays;
}
/**
* 获取 陪产假（天）
* @return BigDecimal
*/
public BigDecimal getPaternityLeaveDays(){
return paternityLeaveDays;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDays
*/
public void setPaternityLeaveDays(BigDecimal paternityLeaveDays){
this.paternityLeaveDays = paternityLeaveDays;
}
...@@ -755,6 +847,11 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -755,6 +847,11 @@ public class AttendanceStatEntity extends AttendanceStatVo {
sb.append(",month:").append(getMonth()); sb.append(",month:").append(getMonth());
sb.append(",day:").append(getDay()); sb.append(",day:").append(getDay());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",breastfeedingLeaveDays:").append(getBreastfeedingLeaveDays());
sb.append(",menstrualLeaveDays:").append(getMenstrualLeaveDays());
sb.append(",annualLeaveDays:").append(getAnnualLeaveDays());
sb.append(",compensatedLeaveDays:").append(getCompensatedLeaveDays());
sb.append(",paternityLeaveDays:").append(getPaternityLeaveDays());
return sb.toString(); return sb.toString();
} }
...@@ -831,5 +928,15 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -831,5 +928,15 @@ public class AttendanceStatEntity extends AttendanceStatVo {
this.day = null; this.day = null;
this.remark = ""; this.remark = "";
this.breastfeedingLeaveDays = BigDecimal.valueOf(0.0);
this.menstrualLeaveDays = BigDecimal.valueOf(0.0);
this.annualLeaveDays = BigDecimal.valueOf(0.0);
this.compensatedLeaveDays = BigDecimal.valueOf(0.0);
this.paternityLeaveDays = BigDecimal.valueOf(0.0);
} }
} }
\ No newline at end of file
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;
...@@ -27,7 +24,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -27,7 +24,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
*/ */
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;
/** /**
...@@ -91,14 +88,14 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -91,14 +88,14 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
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){
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceVacationRecordMapper.xml
View file @ 56b22778
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceVacationRecordDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceVacationRecordDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
......
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
...@@ -340,8 +340,7 @@ CREATE TABLE mortals_xhx_attendance_leave_record( ...@@ -340,8 +340,7 @@ CREATE TABLE mortals_xhx_attendance_leave_record(
`deptId` bigint(20) COMMENT '所属部门id', `deptId` bigint(20) COMMENT '所属部门id',
`deptName` varchar(256) COMMENT '所属部门', `deptName` varchar(256) COMMENT '所属部门',
`phoneNumber` varchar(20) COMMENT '电话号码', `phoneNumber` varchar(20) COMMENT '电话号码',
`leaveType` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)', `leaveType` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)', `startTime` datetime COMMENT '开始时间',
`startTime` datetime COMMENT '开始时间',
`endTime` datetime COMMENT '结束时间', `endTime` datetime COMMENT '结束时间',
`duration` int(9) COMMENT '时长,单位秒', `duration` int(9) COMMENT '时长,单位秒',
`reason` text COMMENT '请假事由', `reason` text COMMENT '请假事由',
...@@ -372,17 +371,28 @@ CREATE TABLE mortals_xhx_attendance_vacation_balance( ...@@ -372,17 +371,28 @@ CREATE TABLE mortals_xhx_attendance_vacation_balance(
`compensatedLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '调休（天）', `compensatedLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '调休（天）',
`sickLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '病假（天）', `sickLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '病假（天）',
`annualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '年假（天）', `annualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '年假（天）',
`maternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '产假（天）',
`paternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '陪产假（天）',
`marriageLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '婚假（天）', `marriageLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '婚假（天）',
`menstrualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '例假（天）',
`breastfeedingLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '哺乳假（天）',
`bereavementLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '丧假（天）',
`remark` varchar(255) COMMENT '备注', `remark` varchar(255) COMMENT '备注',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`maternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '产假（天）',
`paternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '陪产假（天）',
`menstrualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '例假（天）',
`breastfeedingLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '哺乳假（天）',
`bereavementLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '丧假（天）',
`backToUnit` decimal(10,2) DEFAULT '0' COMMENT '回单位（天）',
`onDutyLeave` decimal(10,2) DEFAULT '0' COMMENT '因公请假（天）',
`outOfOffice` decimal(10,2) DEFAULT '0' COMMENT '外出勘验（天）',
`shiftCompensation` decimal(10,2) DEFAULT '0' COMMENT '值班补班（天）',
`physicalExamination` decimal(10,2) DEFAULT '0' COMMENT '体检（天）',
`quarantine` decimal(10,2) DEFAULT '0' COMMENT '隔离（天）',
`businessTrip` decimal(10,2) DEFAULT '0' COMMENT '因公外出（与窗口工作无关/天）',
`publicHoliday` decimal(10,2) DEFAULT '0' COMMENT '公休（天）',
`childRearingLeave` decimal(10,2) DEFAULT '0' COMMENT '育儿假（天）',
`transferBack` decimal(10,2) DEFAULT '0' COMMENT '调回单位（或离职/天）',
`homeLeave` decimal(10,2) DEFAULT '0' COMMENT '探亲假（天）',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期余额信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期余额信息';
...@@ -394,7 +404,7 @@ CREATE TABLE mortals_xhx_attendance_vacation_record( ...@@ -394,7 +404,7 @@ CREATE TABLE mortals_xhx_attendance_vacation_record(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`staffId` bigint(20) COMMENT '员工id', `staffId` bigint(20) COMMENT '员工id',
`staffName` varchar(255) COMMENT '员工姓名', `staffName` varchar(255) COMMENT '员工姓名',
`type` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)', `type` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)',
`subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)', `subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)',
`validityPeriod` varchar(255) DEFAULT '0' COMMENT '有效期', `validityPeriod` varchar(255) DEFAULT '0' COMMENT '有效期',
`subOrAddDays` decimal(10,2) DEFAULT '0' COMMENT '增加或扣减天数（天）', `subOrAddDays` decimal(10,2) DEFAULT '0' COMMENT '增加或扣减天数（天）',
...@@ -453,7 +463,7 @@ CREATE TABLE mortals_xhx_attendance_stat( ...@@ -453,7 +463,7 @@ CREATE TABLE mortals_xhx_attendance_stat(
`funeralLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '丧假（天）', `funeralLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '丧假（天）',
`marriageLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '婚假（天）', `marriageLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '婚假（天）',
`childRearingLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '育儿假（天）', `childRearingLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '育儿假（天）',
`maternityLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '产假（陪护假/天）', `maternityLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '产假（天））',
`transferBack` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调回单位（或离职/天）', `transferBack` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调回单位（或离职/天）',
`homeLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '探亲假（天）', `homeLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '探亲假（天）',
`personalLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '事假（天）', `personalLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '事假（天）',
...@@ -476,6 +486,11 @@ CREATE TABLE mortals_xhx_attendance_stat( ...@@ -476,6 +486,11 @@ CREATE TABLE mortals_xhx_attendance_stat(
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`breastfeedingLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '哺乳假（天）',
`menstrualLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '例假（天）',
`annualLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '年假（天）',
`compensatedLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调休（天）',
`paternityLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '陪产假（天）',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤汇总信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤汇总信息';
......
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