From 3986ef858e4f7c1efc983de6f459cdbf75c0d4d7 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期五, 16 八月 2024 19:18:59 +0800 Subject: [PATCH] 检验下单调整3 --- performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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..a555a1e 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,18 +3,21 @@ 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.Data; - -import java.time.LocalDateTime; @Data //鍘熷宸ユ椂 public class AuxiliaryOriginalHoursDto { + @ApiModelProperty("濮撳悕") @ValueTableShow(2) @ExcelProperty(value = "濮撳悕") private String name; + + //淇宸ユ椂 + private AuxiliaryCorrectionHours auxiliaryCorrectionHours; @ApiModelProperty("绫诲瀷") @ValueTableShow(3) @@ -26,6 +29,7 @@ @ExcelProperty(value = "1鏃�") private Double oneHours; + @ExcelIgnore private Integer one; @ApiModelProperty("2鏃ュ伐鏃�") @@ -268,8 +272,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