From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 15:55:19 +0800
Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段
---
performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 745d38b..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
@@ -49,32 +49,32 @@
@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("浜ч噺宸ユ椂")
@@ -127,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