新增考勤假期字段

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationRecordEntity.java

 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.model.BaseEntityLong;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationRecordVo;
+
+import java.math.BigDecimal;
 /**
-* 员工假期记录信息实体对象
-*
-* @author zxfei
-* @date 2023-04-12
-*/
+ * 员工假期记录信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-14
+ */
 
 public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 员工id
-    */
+     * 员工id
+     */
     @Excel(name = "员工id")
     private Long staffId;
     /**
-    * 员工姓名
-    */
+     * 员工姓名
+     */
     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;
     /**
-    * 增减类型(1.增加,2.扣除)
-    */
+     * 增减类型(1.增加,2.扣除)
+     */
     private Integer subAddType;
     /**
-    * 有效期
-    */
+     * 有效期
+     */
     private String validityPeriod;
     /**
-    * 增加或扣减天数（天）
-    */
+     * 增加或扣减天数（天）
+     */
     private BigDecimal subOrAddDays;
     /**
-    * 内容
-    */
+     * 内容
+     */
     private String content;
     /**
-    * 规则
-    */
+     * 规则
+     */
     private String rule;
     /**
-    * 理由
-    */
+     * 理由
+     */
     private String reason;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
 
 
 
     public AttendanceVacationRecordEntity(){}
     /**
-    * 获取 员工id
-    * @return Long
-    */
+     * 获取 员工id
+     * @return Long
+     */
     public Long getStaffId(){
         return staffId;
     }
     /**
-    * 设置 员工id
-    * @param staffId
-    */
+     * 设置 员工id
+     * @param staffId
+     */
     public void setStaffId(Long staffId){
         this.staffId = staffId;
     }
     /**
-    * 获取 员工姓名
-    * @return String
-    */
+     * 获取 员工姓名
+     * @return String
+     */
     public String getStaffName(){
         return staffName;
     }
     /**
-    * 设置 员工姓名
-    * @param staffName
-    */
+     * 设置 员工姓名
+     * @param staffName
+     */
     public void setStaffName(String staffName){
         this.staffName = staffName;
     }
     /**
-    * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
-    * @return Integer
-    */
+     * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
+     * @return Integer
+     */
     public Integer getType(){
         return type;
     }
     /**
-    * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)
-    * @param type
-    */
+     * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
+     * @param type
+     */
     public void setType(Integer type){
         this.type = type;
     }
     /**
-    * 获取 增减类型(1.增加,2.扣除)
-    * @return Integer
-    */
+     * 获取 增减类型(1.增加,2.扣除)
+     * @return Integer
+     */
     public Integer getSubAddType(){
         return subAddType;
     }
     /**
-    * 设置 增减类型(1.增加,2.扣除)
-    * @param subAddType
-    */
+     * 设置 增减类型(1.增加,2.扣除)
+     * @param subAddType
+     */
     public void setSubAddType(Integer subAddType){
         this.subAddType = subAddType;
     }
     /**
-    * 获取 有效期
-    * @return String
-    */
+     * 获取 有效期
+     * @return String
+     */
     public String getValidityPeriod(){
         return validityPeriod;
     }
     /**
-    * 设置 有效期
-    * @param validityPeriod
-    */
+     * 设置 有效期
+     * @param validityPeriod
+     */
     public void setValidityPeriod(String validityPeriod){
         this.validityPeriod = validityPeriod;
     }
     /**
-    * 获取 增加或扣减天数（天）
-    * @return BigDecimal
-    */
+     * 获取 增加或扣减天数（天）
+     * @return BigDecimal
+     */
     public BigDecimal getSubOrAddDays(){
         return subOrAddDays;
     }
     /**
-    * 设置 增加或扣减天数（天）
-    * @param subOrAddDays
-    */
+     * 设置 增加或扣减天数（天）
+     * @param subOrAddDays
+     */
     public void setSubOrAddDays(BigDecimal subOrAddDays){
         this.subOrAddDays = subOrAddDays;
     }
     /**
-    * 获取 内容
-    * @return String
-    */
+     * 获取 内容
+     * @return String
+     */
     public String getContent(){
         return content;
     }
     /**
-    * 设置 内容
-    * @param content
-    */
+     * 设置 内容
+     * @param content
+     */
     public void setContent(String content){
         this.content = content;
     }
     /**
-    * 获取 规则
-    * @return String
-    */
+     * 获取 规则
+     * @return String
+     */
     public String getRule(){
         return rule;
     }
     /**
-    * 设置 规则
-    * @param rule
-    */
+     * 设置 规则
+     * @param rule
+     */
     public void setRule(String rule){
         this.rule = rule;
     }
     /**
-    * 获取 理由
-    * @return String
-    */
+     * 获取 理由
+     * @return String
+     */
     public String getReason(){
         return reason;
     }
     /**
-    * 设置 理由
-    * @param reason
-    */
+     * 设置 理由
+     * @param reason
+     */
     public void setReason(String reason){
         this.reason = reason;
     }
     /**
-    * 获取 备注
-    * @return String
-    */
+     * 获取 备注
+     * @return String
+     */
     public String getRemark(){
         return remark;
     }
     /**
-    * 设置 备注
-    * @param remark
-    */
+     * 设置 备注
+     * @param remark
+     */
     public void setRemark(String remark){
         this.remark = remark;
     }
@@ -208,7 +205,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -216,7 +213,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
         if (obj instanceof AttendanceVacationRecordEntity) {
             AttendanceVacationRecordEntity tmp = (AttendanceVacationRecordEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -239,24 +236,24 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
 
     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

@@ -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', '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', '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
 -- ----------------------------
@@ -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', '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', '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', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
\ No newline at end of file