修改考勤汇总

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

@@ -11,7 +11,7 @@ import lombok.Data;
  * 请假记录信息实体对象
  *
  * @author zxfei
- * @date 2023-07-18
+ * @date 2023-07-19
  */
 @Data
 public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
@@ -20,11 +20,11 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
     /**
      * 请假人id
      */
-    @Excel(name = "请假人id")
     private Long leavePersonId;
     /**
      * 请假人
      */
+    @Excel(name = "请假人")
     private String leavePerson;
     /**
      * 所属部门id
@@ -37,26 +37,32 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
     /**
      * 电话号码
      */
+    @Excel(name = "电话号码")
     private String phoneNumber;
     /**
      * 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
      */
+    @Excel(name = "请假类型", readConverterExp = "1=事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假")
     private Integer leaveType;
     /**
      * 开始时间
      */
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date startTime;
     /**
      * 结束时间
      */
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
     /**
      * 时长,单位秒
      */
+    @Excel(name = "时长,单位秒")
     private Integer duration;
     /**
      * 请假事由
      */
+    @Excel(name = "请假事由")
     private String reason;
     /**
      * 审批负责人Id
@@ -85,14 +91,17 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
     /**
      * 审核结果(1.申请通过,2.申请不通过)
      */
+    @Excel(name = "审核结果", readConverterExp = "1=申请通过,2.申请不通过")
     private Integer auditResult;
     /**
      * 审核说明
      */
+    @Excel(name = "审核说明")
     private String auditDesc;
     /**
      * 审核时间
      */
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date auditTime;
     /**
      * 处理状态
@@ -116,7 +125,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
 
     public void initAttrValue(){
 
-        this.leavePersonId = null;
+        this.leavePersonId = -1L;
 
         this.leavePerson = "";
 
@@ -126,7 +135,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
 
         this.phoneNumber = "";
 
-        this.leaveType = null;
+        this.leaveType =null;
 
         this.startTime = null;
 

db/add.sql

@@ -800,7 +800,7 @@ ALTER TABLE mortals_xhx_attendance_record ADD COLUMN `signOutResult` tinyint(2)
 ALTER TABLE mortals_xhx_attendance_record ADD COLUMN `attendType` varchar(128)    DEFAULT '0'  COMMENT '考勤类型' ;
 ALTER TABLE mortals_xhx_attendance_record ADD COLUMN `punchResult` tinyint(2)    DEFAULT '0'  COMMENT '打卡结果(0.否,1.是)';
 
-ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN    `signInResult` tinyint(2)    DEFAULT '0'  COMMENT '签到结果(0.否,1.是)' ;
+ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `signInResult` tinyint(2)    DEFAULT '0'  COMMENT '签到结果(0.否,1.是)' ;
 ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `signOutResult` tinyint(2)    DEFAULT '0'  COMMENT '签退结果(0.否,1.是)';
 ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `attendType` varchar(128)    DEFAULT '0'  COMMENT '考勤类型';
 ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `punchResult` tinyint(2)    DEFAULT '0'  COMMENT '打卡结果(0.否,1.是)';