From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java | 12 ++++++++++++
1 files changed, 12 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 04702b3..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)
@@ -269,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