From 3647aa5008055528f075ee73002542a1399575ae Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 19 三月 2025 14:45:39 +0800
Subject: [PATCH] 单点登录调整

---
 performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryOutputWorkingHours.java |   68 +++++++++++++++------------------
 1 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryOutputWorkingHours.java b/performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryOutputWorkingHours.java
index 45fecbe..1116849 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryOutputWorkingHours.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/pojo/AuxiliaryOutputWorkingHours.java
@@ -1,16 +1,17 @@
 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.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -25,99 +26,92 @@
 @Setter
 @TableName("auxiliary_output_working_hours")
 @ApiModel(value = "AuxiliaryOutputWorkingHours瀵硅薄", description = "鏃ュ伐鏃剁鐞嗙殑浜ч噺宸ユ椂")
-@ExcelIgnoreUnannotated
+@ToString
 public class AuxiliaryOutputWorkingHours  implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
+    @ExcelIgnore
     private Integer id;
 
-    @ApiModelProperty("妫�娴嬮」鍒嗙被")
-    @ExcelProperty(index = 2, value = "妫�娴嬮」鍒嗙被")
-    private String inspectionItemClass;
-
-    @ApiModelProperty("妫�娴嬮」")
-    @ExcelProperty(index = 3, value = "妫�娴嬮」")
+    @ApiModelProperty("妫�娴嬬埗椤�")
+    @ExcelProperty(value = "妫�娴嬬埗椤�")
     private String inspectionItem;
 
     @ApiModelProperty("妫�娴嬪瓙椤�")
-    @ExcelProperty(index = 4, value = "妫�娴嬪瓙椤�")
+    @ExcelProperty(value = "妫�娴嬪瓙椤�")
     private String inspectionItemSubclass;
 
-    @ApiModelProperty("鏍峰搧id")
-    private Integer sampleId;
-
     @ApiModelProperty("鏍峰搧缂栧彿")
-    @ExcelProperty(index = 6, value = "鏍峰搧缂栧彿")
+    @ExcelProperty(value = "鏍峰搧缂栧彿")
     private String sample;
 
     @ApiModelProperty("鍔犵彮濮旀墭鍗曞彿")
+    @ExcelProperty(value = "鍔犵彮濮旀墭鍗曞彿")
     private String overtimeOrderNo;
 
     @ApiModelProperty("鍔犵彮宸ユ椂")
-    private BigDecimal overtimeWorkTime;
+    @ExcelProperty(value = "鍔犵彮宸ユ椂")
+    private Double overtimeWorkTime;
 
     @ApiModelProperty("鍔犵彮鏁伴噺")
+    @ExcelProperty(value = "鍔犵彮鏁伴噺")
     private Integer overtimeAmount;
 
     @ApiModelProperty("闈炲姞鐝鎵樺崟鍙�")
-    private Integer orderId;
-
-    @ApiModelProperty("濮旀墭鍗曞彿")
-    @ExcelProperty(index = 5, value = "濮旀墭鍗曞彿")
+    @ExcelProperty(value = "闈炲姞鐝鎵樺崟鍙�")
     private String orderNo;
 
-    @ApiModelProperty("宸ユ椂")
-    private BigDecimal workTime;
+    @ApiModelProperty("闈炲姞鐝伐鏃�")
+    @ExcelProperty(value = "闈炲姞鐝伐鏃�")
+    private Double workTime;
 
-    @ApiModelProperty("鏁伴噺")
+    @ApiModelProperty("闈炲姞鐝暟閲�")
+    @ExcelProperty(value = "闈炲姞鐝暟閲�")
     private Integer amount;
 
     @ApiModelProperty("浜ч噺宸ユ椂")
-    @ExcelProperty(index = 7, value = "浜ч噺宸ユ椂")
-    private BigDecimal outputWorkTime;
+    @ExcelProperty(value = "浜ч噺宸ユ椂")
+    private Double outputWorkTime;
 
     @ApiModelProperty("鏃ユ湡")
-    @ExcelProperty(index = 10, value = "鏃ユ湡")
+    @ExcelProperty(value = "鏃ユ湡")
     private String dateTime;
 
     @ApiModelProperty("鍛ㄦ")
-    @ExcelProperty(index = 11, value = "鍛ㄦ")
+    @ExcelProperty(value = "鍛ㄦ")
     private String week;
 
     @ApiModelProperty("鏄熸湡")
-    @ExcelProperty(index = 12, value = "鏄熸湡")
+    @ExcelProperty(value = "鏄熸湡")
     private String weekDay;
 
     @ApiModelProperty("妫�娴嬩汉id")
-    @TableField("`check`")
-    private Integer check;
+    @ExcelIgnore
+    private Integer checkId;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
     private LocalDateTime createTime;
 
     @ApiModelProperty("淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @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 = 8, value = "宸ユ椂鍒嗙粍")
+    @ExcelIgnore
     private String manHourGroup;
-
-    @ApiModelProperty("鍗曚环")
-    @ExcelProperty(index = 9, value = "鍗曚环")
-    private BigDecimal price;
-
-    @ApiModelProperty("妫�楠岄」id")
-    private Integer insProductId;
 }

--
Gitblit v1.9.3