From 929c6698f4d7598997fc233e09c39c3bdce9fcf8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 10:23:15 +0800
Subject: [PATCH] 判断合格绝对值的问题

---
 performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHoursDay.java |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHoursDay.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHoursDay.java
index 4afa389..45a8d26 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHoursDay.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHoursDay.java
@@ -1,5 +1,7 @@
 package com.yuanchu.mom.pojo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -10,8 +12,10 @@
 import java.time.LocalDateTime;
 
 import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -23,100 +27,118 @@
  * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
  * @since 2024-05-28 02:22:19
  */
-@Getter
-@Setter
+@Data
 @TableName("auxiliary_working_hours_day")
 @ApiModel(value = "AuxiliaryWorkingHoursDay瀵硅薄", description = "鏃ュ伐鏃剁鐞嗙殑杈呭姪宸ユ椂")
-public class AuxiliaryWorkingHoursDay implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class AuxiliaryWorkingHoursDay extends OrderBy implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
+    @ExcelIgnore
     private Integer id;
 
-    @ApiModelProperty("濮撳悕")
-    @ValueTableShow(2)
-    private String name;
+    @ApiModelProperty("濮撳悕id")
+    @ExcelIgnore
+    private Integer nameUser;
 
     @ApiModelProperty("缂栧彿")
+    @ExcelProperty(value = "缂栧彿")
     @ValueTableShow(3)
     private String number;
 
     @ApiModelProperty("杈呭姪椤圭洰鍚嶇О")
+    @ExcelProperty(value = "杈呭姪椤圭洰鍚嶇О")
     @ValueTableShow(4)
     private String auxiliaryProject;
 
     @ApiModelProperty("鏍稿噯宸ユ椂")
+    @ExcelProperty(value = "鏍稿噯宸ユ椂")
     @ValueTableShow(5)
     private Double approvedWorkingHour;
 
     @ApiModelProperty("鏁伴噺")
+    @ExcelProperty(value = "鏁伴噺")
     @ValueTableShow(6)
     private Integer amount;
 
     @ApiModelProperty("杈呭姪宸ユ椂")
+    @ExcelProperty(value = "杈呭姪宸ユ椂")
     @ValueTableShow(7)
     private Double nonproductiveTime;
 
     @ApiModelProperty("杈呭姪璇存槑")
+    @ExcelProperty(value = "杈呭姪璇存槑")
     @ValueTableShow(8)
     private String remarks;
 
     @ApiModelProperty("澶嶆牳浜�")
+    @ExcelProperty(value = "澶嶆牳浜�")
     @ValueTableShow(9)
     private String reviewer;
 
     @ApiModelProperty("澶嶆牳鏁伴噺")
+    @ExcelProperty(value = "澶嶆牳鏁伴噺")
     @ValueTableShow(10)
     private Integer reviewerNumber;
 
     @ApiModelProperty("澶嶆牳宸ユ椂")
+    @ExcelProperty(value = "澶嶆牳宸ユ椂")
     @ValueTableShow(11)
     private Double reviewerNonproductiveTime;
 
     @ApiModelProperty("澶嶆牳璇存槑")
+    @ExcelProperty(value = "澶嶆牳璇存槑")
     @ValueTableShow(12)
     private String reviewerRemark;
 
     @ApiModelProperty("骞�")
+    @ExcelProperty(value = "骞�")
     @ValueTableShow(13)
     private String year;
 
     @ApiModelProperty("鐝")
+    @ExcelProperty(value = "鐝")
     @ValueTableShow(14)
     private String shift;
 
     @ApiModelProperty("鍛ㄦ")
+    @ExcelProperty(value = "鍛ㄦ")
     @ValueTableShow(15)
-    private Integer week;
+    private String week;
 
     @ApiModelProperty("鏄熸湡")
+    @ExcelProperty(value = "鏄熸湡")
     @ValueTableShow(16)
     private String weekDay;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @ValueTableShow(17)
+    @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("鐘舵��")
-    @ValueTableShow(18)
+    @ExcelProperty(value = "鐘舵��")
+    @ExcelIgnore
+    @ValueTableShow(4)
     private String state;
 
     @ApiModelProperty("鏃ユ湡")
-    @TableLogic
+    @ExcelProperty(value = "鏃ユ湡")
     @ValueTableShow(19)
-    private LocalDateTime dateTime;
+    private String dateTime;
 }

--
Gitblit v1.9.3