From 3647aa5008055528f075ee73002542a1399575ae Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 19 三月 2025 14:45:39 +0800
Subject: [PATCH] 单点登录调整

---
 performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursDto.java |  108 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursDto.java b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursDto.java
index e037f05..8b89fb4 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursDto.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursDto.java
@@ -2,13 +2,20 @@
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.ruoyi.performance.pojo.AuxiliaryCorrectionHours;
+import com.ruoyi.performance.utils.CustomerDoubleSerialize;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
-
-import java.math.BigDecimal;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+
 //鍘熷宸ユ椂
 public class AuxiliaryOriginalHoursDto {
 
@@ -17,6 +24,7 @@
     private String name;
 
     //淇宸ユ椂
+    @ExcelIgnore
     private AuxiliaryCorrectionHours auxiliaryCorrectionHours;
 
     @ApiModelProperty("绫诲瀷")
@@ -25,224 +33,256 @@
 
     @ApiModelProperty("1鏃ュ伐鏃�")
     @ExcelProperty(value = "1鏃�")
-    private BigDecimal oneHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double oneHours;
 
     @ExcelIgnore
     private Integer one;
 
     @ApiModelProperty("2鏃ュ伐鏃�")
     @ExcelProperty(value = "2鏃�")
-    private BigDecimal twoHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twoHours;
 
     @ExcelIgnore
     private Integer  two;
 
     @ApiModelProperty("3鏃ュ伐鏃�")
     @ExcelProperty(value = "3鏃�")
-    private BigDecimal threeHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double threeHours;
 
     @ExcelIgnore
     private Integer three;
 
     @ApiModelProperty("4鏃ュ伐鏃�")
     @ExcelProperty(value = "4鏃�")
-    private BigDecimal fourHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double fourHours;
 
     @ExcelIgnore
     private Integer four;
 
     @ApiModelProperty("5鏃ュ伐鏃�")
     @ExcelProperty(value = "5鏃�")
-    private BigDecimal fiveHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double fiveHours;
 
     @ExcelIgnore
     private Integer  five;
 
     @ApiModelProperty("6鏃ュ伐鏃�")
     @ExcelProperty(value = "6鏃�")
-    private BigDecimal sixHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double sixHours;
 
     @ExcelIgnore
     private Integer six;
 
     @ApiModelProperty("7鏃ュ伐鏃�")
     @ExcelProperty(value = "7鏃�")
-    private BigDecimal sevenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double sevenHours;
 
     @ExcelIgnore
     private Integer seven;
 
     @ApiModelProperty("8鏃ュ伐鏃�")
     @ExcelProperty(value = "8鏃�")
-    private BigDecimal eightHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double eightHours;
 
     @ExcelIgnore
     private Integer eight;
 
     @ApiModelProperty("9鏃ュ伐鏃�")
     @ExcelProperty(value = "9鏃�")
-    private BigDecimal nineHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double nineHours;
 
     @ExcelIgnore
     private Integer nine;
 
     @ApiModelProperty("10鏃ュ伐鏃�")
     @ExcelProperty(value = "10鏃�")
-    private BigDecimal tenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double tenHours;
 
     @ExcelIgnore
     private Integer ten;
 
     @ApiModelProperty("11鏃ュ伐鏃�")
     @ExcelProperty(value = "11鏃�")
-    private BigDecimal elevenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double elevenHours;
 
     @ExcelIgnore
     private Integer eleven;
 
     @ApiModelProperty("12鏃ュ伐鏃�")
     @ExcelProperty(value = "12鏃�")
-    private BigDecimal twelveHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twelveHours;
 
     @ExcelIgnore
     private Integer twelve;
 
     @ApiModelProperty("13鏃ュ伐鏃�")
     @ExcelProperty(value = "13鏃�")
-    private BigDecimal thirteenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double thirteenHours;
 
     @ExcelIgnore
     private Integer thirteen;
 
     @ApiModelProperty("14鏃ュ伐鏃�")
     @ExcelProperty(value = "14鏃�")
-    private BigDecimal fourteenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double fourteenHours;
 
     @ExcelIgnore
     private Integer fourteen;
 
     @ApiModelProperty("15鏃ュ伐鏃�")
     @ExcelProperty(value = "15鏃�")
-    private BigDecimal fifteenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double fifteenHours;
 
     @ExcelIgnore
     private Integer fifteen;
 
     @ApiModelProperty("16鏃ュ伐鏃�")
     @ExcelProperty(value = "16鏃�")
-    private BigDecimal sixteenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double sixteenHours;
 
     @ExcelIgnore
     private Integer sixteen;
 
     @ApiModelProperty("17鏃ュ伐鏃�")
     @ExcelProperty(value = "17鏃�")
-    private BigDecimal seventeenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double seventeenHours;
 
     @ExcelIgnore
     private Integer seventeen;
 
     @ApiModelProperty("18鏃ュ伐鏃�")
     @ExcelProperty(value = "18鏃�")
-    private BigDecimal eighteenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double eighteenHours;
 
     @ExcelIgnore
     private Integer eighteen;
 
     @ApiModelProperty("19鏃ュ伐鏃�")
     @ExcelProperty(value = "19鏃�")
-    private BigDecimal nineteenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double nineteenHours;
 
     @ExcelIgnore
     private Integer nineteen;
 
     @ApiModelProperty("20鏃ュ伐鏃�")
     @ExcelProperty(value = "20鏃�")
-    private BigDecimal twentyHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentyHours;
 
     @ExcelIgnore
     private Integer twenty;
 
     @ApiModelProperty("21鏃ュ伐鏃�")
     @ExcelProperty(value = "21鏃�")
-    private BigDecimal twentyOneHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentyOneHours;
 
     @ExcelIgnore
     private Integer twentyOne;
 
     @ApiModelProperty("22鏃ュ伐鏃�")
     @ExcelProperty(value = "22鏃�")
-    private BigDecimal twentyTwoHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentyTwoHours;
 
     @ExcelIgnore
     private Integer twentyTwo;
 
     @ApiModelProperty("23鏃ュ伐鏃�")
     @ExcelProperty(value = "23鏃�")
-    private BigDecimal twentyThreeHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentyThreeHours;
 
     @ExcelIgnore
     private Integer twentyThree;
 
     @ApiModelProperty("24鏃ュ伐鏃�")
     @ExcelProperty(value = "24鏃�")
-    private BigDecimal twentyFourHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentyFourHours;
 
     @ExcelIgnore
     private Integer twentyFour;
 
     @ApiModelProperty("25鏃ュ伐鏃�")
     @ExcelProperty(value = "25鏃�")
-    private BigDecimal twentyFiveHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentyFiveHours;
 
     @ExcelIgnore
     private Integer twentyFive;
 
     @ApiModelProperty("26鏃ュ伐鏃�")
     @ExcelProperty(value = "26鏃�")
-    private BigDecimal twentySixHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentySixHours;
 
     @ExcelIgnore
     private Integer twentySix;
 
     @ApiModelProperty("27鏃ュ伐鏃�")
     @ExcelProperty(value = "27鏃�")
-    private BigDecimal twentySevenHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentySevenHours;
 
     @ExcelIgnore
     private Integer twentySeven;
 
     @ApiModelProperty("28鏃ュ伐鏃�")
     @ExcelProperty(value = "28鏃�")
-    private BigDecimal twentyEightHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentyEightHours;
 
     @ExcelIgnore
     private Integer  twentyEight;
 
     @ApiModelProperty("29鏃ュ伐鏃�")
     @ExcelProperty(value = "29鏃�")
-    private BigDecimal twentyNineHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double twentyNineHours;
 
     @ExcelIgnore
     private Integer  twentyNine;
 
     @ApiModelProperty("30鏃ュ伐鏃�")
     @ExcelProperty(value = "30鏃�")
-    private BigDecimal thirtyHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double thirtyHours;
 
     @ExcelIgnore
     private Integer thirty;
 
     @ApiModelProperty("31鏃ュ伐鏃�")
     @ExcelProperty(value = "31鏃�")
-    private BigDecimal thirtyOneHours;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double thirtyOneHours;
 
     @ExcelIgnore
     private Integer thirtyOne;
 
     @ApiModelProperty("鎬诲伐鏃�")
     @ExcelProperty(value = "鎬诲伐鏃�")
-    private BigDecimal total;
+    @JsonSerialize(using = CustomerDoubleSerialize.class)
+    private Double total;
 
     @ApiModelProperty("鏈堜唤")
     @ExcelProperty(value = "鏈堜唤")

--
Gitblit v1.9.3