From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java b/performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java
index e247f70..a1ff994 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java
@@ -3,9 +3,12 @@
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.pojo.AuxiliaryCorrectionHours;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
import lombok.Data;
+import java.text.DecimalFormat;
import java.time.LocalDateTime;
@Data
@@ -15,6 +18,9 @@
@ValueTableShow(2)
@ExcelProperty(value = "濮撳悕")
private String name;
+
+ //淇宸ユ椂
+ private AuxiliaryCorrectionHours auxiliaryCorrectionHours;
@ApiModelProperty("绫诲瀷")
@ValueTableShow(3)
@@ -26,6 +32,7 @@
@ExcelProperty(value = "1鏃�")
private Double oneHours;
+ @ExcelIgnore
private Integer one;
@ApiModelProperty("2鏃ュ伐鏃�")
@@ -268,8 +275,14 @@
@ExcelIgnore
private Integer thirtyOne;
+ @ApiModelProperty("鎬诲伐鏃�")
+ @ValueTableShow(34)
+ @ExcelProperty(value = "鎬诲伐鏃�")
+ private Double total;
+
@ApiModelProperty("鏈堜唤")
@ValueTableShow(35)
@ExcelProperty(value = "鏈堜唤")
private String month;
+
}
--
Gitblit v1.9.3