From a5b1bad21ba279ade3954852a5e281e9086042f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 15:22:52 +0800
Subject: [PATCH] 前端联调修改2.0
---
performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 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 ffa4801..71b43ff 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
@@ -32,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("浜ч噺宸ユ椂")
@@ -117,4 +127,13 @@
@ApiModelProperty("宸ユ椂鍒嗙粍")
@ExcelIgnore
private String manHourGroup;
+
+ @ApiModelProperty("妫�楠岄」鐩甶d")
+ @ExcelIgnore
+ private Integer insProductId;
+
+ @ApiModelProperty("妫�娴嬫鏁�")
+ @ExcelProperty(value = "妫�娴嬫鏁�")
+ @ValueTableShow(2)
+ private Integer num;
}
--
Gitblit v1.9.3