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/AuxiliaryOutputWorkingHours.java | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
index 52cec1a..f22ebb5 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
@@ -2,14 +2,7 @@
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;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
@@ -17,6 +10,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -36,39 +32,49 @@
@ExcelIgnore
private Integer id;
- @ApiModelProperty("妫�娴嬮」鐩�")
- @ExcelProperty(value = "妫�娴嬮」鐩�")
+ @ApiModelProperty("妫�娴嬬埗椤�")
+ @ExcelProperty(value = "妫�娴嬬埗椤�")
@ValueTableShow(2)
- private String inspectProject;
+ private String inspectionItem;
+
+ @ApiModelProperty("妫�娴嬪瓙椤�")
+ @ExcelProperty(value = "妫�娴嬪瓙椤�")
+ @ValueTableShow(2)
+ private String inspectionItemSubclass;
+
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ @ExcelProperty(value = "鏍峰搧缂栧彿")
+ @ValueTableShow(2)
+ private String sample;
@ApiModelProperty("鍔犵彮濮旀墭鍗曞彿")
@ExcelProperty(value = "鍔犵彮濮旀墭鍗曞彿")
- @ValueTableShow(3)
+ @ValueTableShow(6)
private String overtimeOrderNo;
@ApiModelProperty("鍔犵彮宸ユ椂")
@ExcelProperty(value = "鍔犵彮宸ユ椂")
- @ValueTableShow(4)
+ @ValueTableShow(7)
private Double overtimeWorkTime;
@ApiModelProperty("鍔犵彮鏁伴噺")
@ExcelProperty(value = "鍔犵彮鏁伴噺")
- @ValueTableShow(5)
+ @ValueTableShow(8)
private Integer overtimeAmount;
@ApiModelProperty("闈炲姞鐝鎵樺崟鍙�")
@ExcelProperty(value = "闈炲姞鐝鎵樺崟鍙�")
- @ValueTableShow(6)
+ @ValueTableShow(3)
private String orderNo;
@ApiModelProperty("闈炲姞鐝伐鏃�")
@ExcelProperty(value = "闈炲姞鐝伐鏃�")
- @ValueTableShow(7)
+ @ValueTableShow(4)
private Double workTime;
@ApiModelProperty("闈炲姞鐝暟閲�")
@ExcelProperty(value = "闈炲姞鐝暟閲�")
- @ValueTableShow(8)
+ @ValueTableShow(5)
private Integer amount;
@ApiModelProperty("浜ч噺宸ユ椂")
@@ -93,6 +99,7 @@
@ApiModelProperty("妫�娴嬩汉id")
@ExcelIgnore
+ @TableField("`check`")
private Integer check;
@ApiModelProperty("鍒涘缓鏃堕棿")
@@ -120,4 +127,19 @@
@ApiModelProperty("宸ユ椂鍒嗙粍")
@ExcelIgnore
private String manHourGroup;
+
+ @ApiModelProperty("妫�楠岄」鐩甶d")
+ @ExcelIgnore
+ private Integer insProductId;
+
+ @ApiModelProperty("妫�娴嬫鏁�")
+ @ExcelProperty(value = "妫�娴嬫鏁�")
+ @ValueTableShow(2)
+ private Integer num;
+
+ @ValueTableShow(13)
+ @ApiModelProperty("妫�娴嬩汉")
+ @ExcelProperty(value = "妫�娴嬩汉")
+ @TableField(select = false,exist = false)
+ private String name;
}
--
Gitblit v1.9.3