From 51ec98113c6d49d0f7eec4e3c030e55e337e97db Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 五月 2025 15:47:16 +0800
Subject: [PATCH] 芯导软件(江苏)有限公司  delete

---
 performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 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 04702b3..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
@@ -2,19 +2,24 @@
 
 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)
@@ -24,6 +29,7 @@
     @ApiModelProperty("1鏃ュ伐鏃�")
     @ValueTableShow(4)
     @ExcelProperty(value = "1鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double oneHours;
 
     @ExcelIgnore
@@ -32,6 +38,7 @@
     @ApiModelProperty("2鏃ュ伐鏃�")
     @ValueTableShow(5)
     @ExcelProperty(value = "2鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twoHours;
 
     @ExcelIgnore
@@ -40,6 +47,7 @@
     @ApiModelProperty("3鏃ュ伐鏃�")
     @ValueTableShow(6)
     @ExcelProperty(value = "3鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double threeHours;
 
     @ExcelIgnore
@@ -48,6 +56,7 @@
     @ApiModelProperty("4鏃ュ伐鏃�")
     @ValueTableShow(7)
     @ExcelProperty(value = "4鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double fourHours;
 
     @ExcelIgnore
@@ -56,6 +65,7 @@
     @ApiModelProperty("5鏃ュ伐鏃�")
     @ValueTableShow(8)
     @ExcelProperty(value = "5鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double fiveHours;
 
     @ExcelIgnore
@@ -64,6 +74,7 @@
     @ApiModelProperty("6鏃ュ伐鏃�")
     @ValueTableShow(9)
     @ExcelProperty(value = "6鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double sixHours;
 
     @ExcelIgnore
@@ -72,6 +83,7 @@
     @ApiModelProperty("7鏃ュ伐鏃�")
     @ValueTableShow(10)
     @ExcelProperty(value = "7鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double sevenHours;
 
     @ExcelIgnore
@@ -80,6 +92,7 @@
     @ApiModelProperty("8鏃ュ伐鏃�")
     @ValueTableShow(11)
     @ExcelProperty(value = "8鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double eightHours;
 
     @ExcelIgnore
@@ -88,6 +101,7 @@
     @ApiModelProperty("9鏃ュ伐鏃�")
     @ValueTableShow(12)
     @ExcelProperty(value = "9鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double nineHours;
 
     @ExcelIgnore
@@ -96,6 +110,7 @@
     @ApiModelProperty("10鏃ュ伐鏃�")
     @ValueTableShow(13)
     @ExcelProperty(value = "10鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double tenHours;
 
     @ExcelIgnore
@@ -104,6 +119,7 @@
     @ApiModelProperty("11鏃ュ伐鏃�")
     @ValueTableShow(14)
     @ExcelProperty(value = "11鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double elevenHours;
 
     @ExcelIgnore
@@ -112,6 +128,7 @@
     @ApiModelProperty("12鏃ュ伐鏃�")
     @ValueTableShow(15)
     @ExcelProperty(value = "12鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twelveHours;
 
     @ExcelIgnore
@@ -120,6 +137,7 @@
     @ApiModelProperty("13鏃ュ伐鏃�")
     @ValueTableShow(16)
     @ExcelProperty(value = "13鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double thirteenHours;
 
     @ExcelIgnore
@@ -128,6 +146,7 @@
     @ApiModelProperty("14鏃ュ伐鏃�")
     @ValueTableShow(17)
     @ExcelProperty(value = "14鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double fourteenHours;
 
     @ExcelIgnore
@@ -136,6 +155,7 @@
     @ApiModelProperty("15鏃ュ伐鏃�")
     @ValueTableShow(18)
     @ExcelProperty(value = "15鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double fifteenHours;
 
     @ExcelIgnore
@@ -144,6 +164,7 @@
     @ApiModelProperty("16鏃ュ伐鏃�")
     @ValueTableShow(19)
     @ExcelProperty(value = "16鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double sixteenHours;
 
     @ExcelIgnore
@@ -152,6 +173,7 @@
     @ApiModelProperty("17鏃ュ伐鏃�")
     @ValueTableShow(20)
     @ExcelProperty(value = "17鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double seventeenHours;
 
     @ExcelIgnore
@@ -160,6 +182,7 @@
     @ApiModelProperty("18鏃ュ伐鏃�")
     @ValueTableShow(21)
     @ExcelProperty(value = "18鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double eighteenHours;
 
     @ExcelIgnore
@@ -168,6 +191,7 @@
     @ApiModelProperty("19鏃ュ伐鏃�")
     @ValueTableShow(22)
     @ExcelProperty(value = "19鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double nineteenHours;
 
     @ExcelIgnore
@@ -176,6 +200,7 @@
     @ApiModelProperty("20鏃ュ伐鏃�")
     @ValueTableShow(23)
     @ExcelProperty(value = "20鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentyHours;
 
     @ExcelIgnore
@@ -184,6 +209,7 @@
     @ApiModelProperty("21鏃ュ伐鏃�")
     @ValueTableShow(24)
     @ExcelProperty(value = "21鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentyOneHours;
 
     @ExcelIgnore
@@ -192,6 +218,7 @@
     @ApiModelProperty("22鏃ュ伐鏃�")
     @ValueTableShow(25)
     @ExcelProperty(value = "22鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentyTwoHours;
 
     @ExcelIgnore
@@ -200,6 +227,7 @@
     @ApiModelProperty("23鏃ュ伐鏃�")
     @ValueTableShow(26)
     @ExcelProperty(value = "23鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentyThreeHours;
 
     @ExcelIgnore
@@ -208,6 +236,7 @@
     @ApiModelProperty("24鏃ュ伐鏃�")
     @ValueTableShow(27)
     @ExcelProperty(value = "24鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentyFourHours;
 
     @ExcelIgnore
@@ -216,6 +245,7 @@
     @ApiModelProperty("25鏃ュ伐鏃�")
     @ValueTableShow(28)
     @ExcelProperty(value = "25鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentyFiveHours;
 
     @ExcelIgnore
@@ -224,6 +254,7 @@
     @ApiModelProperty("26鏃ュ伐鏃�")
     @ValueTableShow(29)
     @ExcelProperty(value = "26鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentySixHours;
 
     @ExcelIgnore
@@ -232,6 +263,7 @@
     @ApiModelProperty("27鏃ュ伐鏃�")
     @ValueTableShow(30)
     @ExcelProperty(value = "27鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentySevenHours;
 
     @ExcelIgnore
@@ -240,6 +272,7 @@
     @ApiModelProperty("28鏃ュ伐鏃�")
     @ValueTableShow(31)
     @ExcelProperty(value = "28鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentyEightHours;
 
     @ExcelIgnore
@@ -248,6 +281,7 @@
     @ApiModelProperty("29鏃ュ伐鏃�")
     @ValueTableShow(32)
     @ExcelProperty(value = "29鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double twentyNineHours;
 
     @ExcelIgnore
@@ -256,6 +290,7 @@
     @ApiModelProperty("30鏃ュ伐鏃�")
     @ValueTableShow(33)
     @ExcelProperty(value = "30鏃�")
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
     private Double thirtyHours;
 
     @ExcelIgnore
@@ -264,13 +299,21 @@
     @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 String month;
+
 }

--
Gitblit v1.9.3