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/dto/AuxiliaryOriginalHoursDto.java | 143 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 140 insertions(+), 3 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 de60608..5935bec 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
@@ -1,19 +1,25 @@
package com.yuanchu.mom.dto;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.pojo.AuxiliaryCorrectionHours;
+import com.yuanchu.mom.utils.CustomerDoubleSerialize;
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)
@@ -23,160 +29,291 @@
@ApiModelProperty("1鏃ュ伐鏃�")
@ValueTableShow(4)
@ExcelProperty(value = "1鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double oneHours;
+
+ @ExcelIgnore
+ private Integer one;
@ApiModelProperty("2鏃ュ伐鏃�")
@ValueTableShow(5)
@ExcelProperty(value = "2鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twoHours;
+
+ @ExcelIgnore
+ private Integer two;
@ApiModelProperty("3鏃ュ伐鏃�")
@ValueTableShow(6)
@ExcelProperty(value = "3鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double threeHours;
+
+ @ExcelIgnore
+ private Integer three;
@ApiModelProperty("4鏃ュ伐鏃�")
@ValueTableShow(7)
@ExcelProperty(value = "4鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double fourHours;
+
+ @ExcelIgnore
+ private Integer four;
@ApiModelProperty("5鏃ュ伐鏃�")
@ValueTableShow(8)
@ExcelProperty(value = "5鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double fiveHours;
+
+ @ExcelIgnore
+ private Integer five;
@ApiModelProperty("6鏃ュ伐鏃�")
@ValueTableShow(9)
@ExcelProperty(value = "6鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double sixHours;
+
+ @ExcelIgnore
+ private Integer six;
@ApiModelProperty("7鏃ュ伐鏃�")
@ValueTableShow(10)
@ExcelProperty(value = "7鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double sevenHours;
+
+ @ExcelIgnore
+ private Integer seven;
@ApiModelProperty("8鏃ュ伐鏃�")
@ValueTableShow(11)
@ExcelProperty(value = "8鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double eightHours;
+
+ @ExcelIgnore
+ private Integer eight;
@ApiModelProperty("9鏃ュ伐鏃�")
@ValueTableShow(12)
@ExcelProperty(value = "9鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double nineHours;
+
+ @ExcelIgnore
+ private Integer nine;
@ApiModelProperty("10鏃ュ伐鏃�")
@ValueTableShow(13)
@ExcelProperty(value = "10鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double tenHours;
+
+ @ExcelIgnore
+ private Integer ten;
@ApiModelProperty("11鏃ュ伐鏃�")
@ValueTableShow(14)
@ExcelProperty(value = "11鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double elevenHours;
+
+ @ExcelIgnore
+ private Integer eleven;
@ApiModelProperty("12鏃ュ伐鏃�")
@ValueTableShow(15)
@ExcelProperty(value = "12鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twelveHours;
+
+ @ExcelIgnore
+ private Integer twelve;
@ApiModelProperty("13鏃ュ伐鏃�")
@ValueTableShow(16)
@ExcelProperty(value = "13鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double thirteenHours;
+
+ @ExcelIgnore
+ private Integer thirteen;
@ApiModelProperty("14鏃ュ伐鏃�")
@ValueTableShow(17)
@ExcelProperty(value = "14鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double fourteenHours;
+
+ @ExcelIgnore
+ private Integer fourteen;
@ApiModelProperty("15鏃ュ伐鏃�")
@ValueTableShow(18)
@ExcelProperty(value = "15鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double fifteenHours;
+
+ @ExcelIgnore
+ private Integer fifteen;
@ApiModelProperty("16鏃ュ伐鏃�")
@ValueTableShow(19)
@ExcelProperty(value = "16鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double sixteenHours;
+
+ @ExcelIgnore
+ private Integer sixteen;
@ApiModelProperty("17鏃ュ伐鏃�")
@ValueTableShow(20)
@ExcelProperty(value = "17鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double seventeenHours;
+
+ @ExcelIgnore
+ private Integer seventeen;
@ApiModelProperty("18鏃ュ伐鏃�")
@ValueTableShow(21)
@ExcelProperty(value = "18鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double eighteenHours;
+
+ @ExcelIgnore
+ private Integer eighteen;
@ApiModelProperty("19鏃ュ伐鏃�")
@ValueTableShow(22)
@ExcelProperty(value = "19鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double nineteenHours;
+
+ @ExcelIgnore
+ private Integer nineteen;
@ApiModelProperty("20鏃ュ伐鏃�")
@ValueTableShow(23)
@ExcelProperty(value = "20鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyHours;
+
+ @ExcelIgnore
+ private Integer twenty;
@ApiModelProperty("21鏃ュ伐鏃�")
@ValueTableShow(24)
@ExcelProperty(value = "21鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyOneHours;
+
+ @ExcelIgnore
+ private Integer twentyOne;
@ApiModelProperty("22鏃ュ伐鏃�")
@ValueTableShow(25)
@ExcelProperty(value = "22鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyTwoHours;
+
+ @ExcelIgnore
+ private Integer twentyTwo;
@ApiModelProperty("23鏃ュ伐鏃�")
@ValueTableShow(26)
@ExcelProperty(value = "23鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyThreeHours;
+
+ @ExcelIgnore
+ private Integer twentyThree;
@ApiModelProperty("24鏃ュ伐鏃�")
@ValueTableShow(27)
@ExcelProperty(value = "24鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyFourHours;
+
+ @ExcelIgnore
+ private Integer twentyFour;
@ApiModelProperty("25鏃ュ伐鏃�")
@ValueTableShow(28)
@ExcelProperty(value = "25鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyFiveHours;
+
+ @ExcelIgnore
+ private Integer twentyFive;
@ApiModelProperty("26鏃ュ伐鏃�")
@ValueTableShow(29)
@ExcelProperty(value = "26鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentySixHours;
+
+ @ExcelIgnore
+ private Integer twentySix;
@ApiModelProperty("27鏃ュ伐鏃�")
@ValueTableShow(30)
@ExcelProperty(value = "27鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentySevenHours;
+
+ @ExcelIgnore
+ private Integer twentySeven;
@ApiModelProperty("28鏃ュ伐鏃�")
@ValueTableShow(31)
@ExcelProperty(value = "28鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyEightHours;
+
+ @ExcelIgnore
+ private Integer twentyEight;
@ApiModelProperty("29鏃ュ伐鏃�")
@ValueTableShow(32)
@ExcelProperty(value = "29鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyNineHours;
+
+ @ExcelIgnore
+ private Integer twentyNine;
@ApiModelProperty("30鏃ュ伐鏃�")
@ValueTableShow(33)
@ExcelProperty(value = "30鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double thirtyHours;
+
+ @ExcelIgnore
+ private Integer thirty;
@ApiModelProperty("31鏃ュ伐鏃�")
@ValueTableShow(34)
@ExcelProperty(value = "31鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double thirtyOneHours;
+
+ @ExcelIgnore
+ private Integer thirtyOne;
+
+ @ApiModelProperty("鎬诲伐鏃�")
+ @ValueTableShow(34)
+ @ExcelProperty(value = "鎬诲伐鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
+ private Double total;
@ApiModelProperty("鏈堜唤")
@ValueTableShow(35)
@ExcelProperty(value = "鏈堜唤")
- private LocalDateTime month;
+ private String month;
+
}
--
Gitblit v1.9.3