From eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 11 三月 2025 11:05:38 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj

---
 performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryWorkingHoursDay.java |   93 ++++++++++++++++++++++++++--------------------
 1 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryWorkingHoursDay.java b/performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryWorkingHoursDay.java
index a4fef6a..d95f8ff 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryWorkingHoursDay.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryWorkingHoursDay.java
@@ -1,15 +1,20 @@
 package com.ruoyi.performance.pojo;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * <p>
@@ -22,92 +27,98 @@
 @Data
 @TableName("auxiliary_working_hours_day")
 @ApiModel(value = "AuxiliaryWorkingHoursDay瀵硅薄", description = "鏃ュ伐鏃剁鐞嗙殑杈呭姪宸ユ椂")
-@ExcelIgnoreUnannotated
 public class AuxiliaryWorkingHoursDay  implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
+    @ExcelIgnore
     private Integer id;
 
     @ApiModelProperty("濮撳悕id")
+    @ExcelIgnore
     private Integer nameUser;
 
     @ApiModelProperty("缂栧彿")
-    @ExcelProperty(index = 2, value = "缂栧彿")
+    @ExcelProperty(value = "缂栧彿")
     private String number;
 
     @ApiModelProperty("杈呭姪椤圭洰鍚嶇О")
-    @ExcelProperty(index = 3, value = "杈呭姪椤圭洰鍚嶇О")
+    @ExcelProperty(value = "杈呭姪椤圭洰鍚嶇О")
     private String auxiliaryProject;
 
     @ApiModelProperty("鏍稿噯宸ユ椂")
-    @ExcelProperty(index = 5, value = "鏍稿噯宸ユ椂")
-    private BigDecimal approvedWorkingHour;
+    @ExcelProperty(value = "鏍稿噯宸ユ椂")
+    private Double approvedWorkingHour;
 
     @ApiModelProperty("鏁伴噺")
-    @ExcelProperty(index = 6, value = "鏁伴噺")
-    private Integer amount;
+    @ExcelProperty(value = "鏁伴噺")
+    private Double amount;
 
     @ApiModelProperty("杈呭姪宸ユ椂")
-    @ExcelProperty(index = 7, value = "杈呭姪宸ユ椂")
-    private BigDecimal nonproductiveTime;
+    @ExcelProperty(value = "杈呭姪宸ユ椂")
+    private Double nonproductiveTime;
 
     @ApiModelProperty("杈呭姪璇存槑")
-    @ExcelProperty(index = 8, value = "杈呭姪璇存槑")
+    @ExcelProperty(value = "杈呭姪璇存槑")
     private String remarks;
 
-    @ApiModelProperty("澶嶆牳浜�")
-    @ExcelProperty(index = 9, value = "澶嶆牳浜�")
-    private String reviewer;
-
-    @ApiModelProperty("澶嶆牳鏁伴噺")
-    @ExcelProperty(index = 10, value = "澶嶆牳鏁伴噺")
-    private Integer reviewerNumber;
-
-    @ApiModelProperty("澶嶆牳宸ユ椂")
-    @ExcelProperty(index = 11, value = "澶嶆牳宸ユ椂")
-    private BigDecimal reviewerNonproductiveTime;
-
-    @ApiModelProperty("澶嶆牳璇存槑")
-    @ExcelProperty(index = 12, value = "澶嶆牳璇存槑")
-    private String reviewerRemark;
-
-    @ApiModelProperty("骞�")
-    @ExcelProperty(index = 13, value = "骞�")
-    private String year;
-
     @ApiModelProperty("鐝")
-    @ExcelProperty(index = 14, value = "鐝")
+    @ExcelProperty(value = "鐝")
     private String shift;
 
     @ApiModelProperty("鍛ㄦ")
-    @ExcelProperty(index = 15, value = "鍛ㄦ")
+    @ExcelProperty(value = "鍛ㄦ")
     private String week;
 
     @ApiModelProperty("鏄熸湡")
-    @ExcelProperty(index = 16, value = "鏄熸湡")
+    @ExcelProperty(value = "鏄熸湡")
     private String weekDay;
+
+    @ApiModelProperty("澶嶆牳浜�")
+    @ExcelProperty(value = "澶嶆牳浜�")
+    private String reviewer;
+
+    @ApiModelProperty("澶嶆牳鏁伴噺")
+    @ExcelProperty(value = "澶嶆牳鏁伴噺")
+    private Double reviewerNumber;
+
+    @ApiModelProperty("澶嶆牳宸ユ椂")
+    @ExcelProperty(value = "澶嶆牳宸ユ椂")
+    private Double reviewerNonproductiveTime;
+
+    @ApiModelProperty("澶嶆牳璇存槑")
+    @ExcelProperty(value = "澶嶆牳璇存槑")
+    private String reviewerRemark;
+
+    @ApiModelProperty("骞�")
+    @ExcelProperty(value = "骞�")
+    private String year;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
+    @ExcelIgnore
     private LocalDateTime createTime;
 
     @ApiModelProperty("淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
+    @ExcelIgnore
     private LocalDateTime updateTime;
 
     @ApiModelProperty("鍒涘缓浜篿d")
     @TableField(fill = FieldFill.INSERT)
+    @ExcelIgnore
     private Integer createUser;
 
     @ApiModelProperty("淇敼浜篿d")
     @TableField(fill = FieldFill.INSERT_UPDATE)
+    @ExcelIgnore
     private Integer updateUser;
 
     @ApiModelProperty("鐘舵��")
-    @ExcelProperty(index = 4, value = "鐘舵��")
+    @ExcelProperty(value = "鐘舵��")
+    @ExcelIgnore
     private String state;
 
     @ApiModelProperty("鏃ユ湡")
-    @ExcelProperty(index = 17, value = "鏃ユ湡")
+    @ExcelProperty(value = "鏃ユ湡")
     private String dateTime;
 }

--
Gitblit v1.9.3