修改导出业务

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue

@@ -120,13 +120,15 @@ export default {
 
           // {label: "审批负责人Id", prop: "approverId", formatter: this.formatter},
 
+/*          {label: "处理状态", prop: "processStatus", formatter: this.formatter},*/
+
+          {label: "状态", prop: "auditResult", formatter: this.formatter},
           {label: "审批负责人", prop: "approver"},
 
-          {label: "处理状态", prop: "processStatus", formatter: this.formatter},
+          {label: "创建用户", prop: "createUserId", formatter: this.formatter},
 
-          {label: "审核状态", prop: "auditResult", formatter: this.formatter},
+          {label: "创建时间", prop: "createTime", formatter: this.formatterDate},
 
-          {label: "创建用户", prop: "createUserId", formatter: this.formatter},
           {
             label: "操作",
             width: 240,

attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue

@@ -413,13 +413,20 @@ export default {
             name: "staffName",
             type: "text",
             label: "员工姓名",
-            fuzzy: false,
+            fuzzy: true,
+          },
+
+          {
+            name: "workNum",
+            type: "text",
+            label: "员工工号",
+            fuzzy: true,
           },
           {
             name: "phone",
             type: "text",
             label: "手机号",
-            fuzzy: false,
+            fuzzy: true,
           },
           {
             name: "deptId",

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

@@ -12,7 +12,7 @@ import lombok.Data;
  * 员工基本信息实体对象
  *
  * @author zxfei
- * @date 2023-07-07
+ * @date 2023-07-18
  */
 @Data
 public class StaffEntity extends StaffVo {
@@ -21,10 +21,12 @@ public class StaffEntity extends StaffVo {
     /**
      * 员工姓名
      */
+    @Excel(name = "员工姓名")
     private String name;
     /**
      * 性别(1.男,2.女)
      */
+    @Excel(name = "性别", readConverterExp = "1=男,2.女")
     private Integer gender;
     /**
      * 出生日期
@@ -37,14 +39,17 @@ public class StaffEntity extends StaffVo {
     /**
      * 联系电话
      */
+    @Excel(name = "联系电话")
     private String phoneNumber;
     /**
      * 身份证号码
      */
+    @Excel(name = "身份证号码")
     private String idCard;
     /**
      * 工号
      */
+    @Excel(name = "工号")
     private String workNum;
     /**
      * 政治面貌 (1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
@@ -57,6 +62,7 @@ public class StaffEntity extends StaffVo {
     /**
      * 所属部门名称
      */
+    @Excel(name = "所属部门名称")
     private String deptName;
     /**
      * 职位ID
@@ -65,14 +71,17 @@ public class StaffEntity extends StaffVo {
     /**
      * 职位名称
      */
+    @Excel(name = "职位名称")
     private String positionName;
     /**
      * 员工类型（1.全职,2.兼职,3.实习)
      */
+    @Excel(name = "员工类型")
     private Integer staffType;
     /**
      * 员工状态(1.正式,2.试用,3.离职)
      */
+    @Excel(name = "员工状态", readConverterExp = "1=正式,2=试用,3=离职")
     private Integer status;
     /**
      * 员工来源(1.外部,2.内部)
@@ -85,6 +94,7 @@ public class StaffEntity extends StaffVo {
     /**
      * 入职时间
      */
+    @Excel(name = "入职时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date entryDate;
     /**
      * 转正时间
@@ -113,6 +123,7 @@ public class StaffEntity extends StaffVo {
     /**
      * 绩效分数
      */
+    @Excel(name = "绩效分数")
     private BigDecimal score;
     /**
      * 员工登录名