From 9c61e9c8f99cc3c35f2940333605981ef4b30fbb Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 19 八月 2024 18:20:20 +0800
Subject: [PATCH] 工时管理小数点问题
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java | 7 +--
performance-server/src/main/java/com/yuanchu/mom/utils/CustomerDoubleSerialize.java | 26 +++++++++++++
performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java | 34 +++++++++++++++++
inspect-server/pom.xml | 2 -
4 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/inspect-server/pom.xml b/inspect-server/pom.xml
index cc9a3e0..f467ec8 100644
--- a/inspect-server/pom.xml
+++ b/inspect-server/pom.xml
@@ -24,8 +24,6 @@
<groupId>com.aspose</groupId>
<artifactId>aspose-words</artifactId>
<version>15.12.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/src/main/resources/lib/aspose-words-15.12.0-jdk16.jar</systemPath>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
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 a555a1e..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,8 +2,10 @@
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;
@@ -27,6 +29,7 @@
@ApiModelProperty("1鏃ュ伐鏃�")
@ValueTableShow(4)
@ExcelProperty(value = "1鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double oneHours;
@ExcelIgnore
@@ -35,6 +38,7 @@
@ApiModelProperty("2鏃ュ伐鏃�")
@ValueTableShow(5)
@ExcelProperty(value = "2鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twoHours;
@ExcelIgnore
@@ -43,6 +47,7 @@
@ApiModelProperty("3鏃ュ伐鏃�")
@ValueTableShow(6)
@ExcelProperty(value = "3鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double threeHours;
@ExcelIgnore
@@ -51,6 +56,7 @@
@ApiModelProperty("4鏃ュ伐鏃�")
@ValueTableShow(7)
@ExcelProperty(value = "4鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double fourHours;
@ExcelIgnore
@@ -59,6 +65,7 @@
@ApiModelProperty("5鏃ュ伐鏃�")
@ValueTableShow(8)
@ExcelProperty(value = "5鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double fiveHours;
@ExcelIgnore
@@ -67,6 +74,7 @@
@ApiModelProperty("6鏃ュ伐鏃�")
@ValueTableShow(9)
@ExcelProperty(value = "6鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double sixHours;
@ExcelIgnore
@@ -75,6 +83,7 @@
@ApiModelProperty("7鏃ュ伐鏃�")
@ValueTableShow(10)
@ExcelProperty(value = "7鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double sevenHours;
@ExcelIgnore
@@ -83,6 +92,7 @@
@ApiModelProperty("8鏃ュ伐鏃�")
@ValueTableShow(11)
@ExcelProperty(value = "8鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double eightHours;
@ExcelIgnore
@@ -91,6 +101,7 @@
@ApiModelProperty("9鏃ュ伐鏃�")
@ValueTableShow(12)
@ExcelProperty(value = "9鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double nineHours;
@ExcelIgnore
@@ -99,6 +110,7 @@
@ApiModelProperty("10鏃ュ伐鏃�")
@ValueTableShow(13)
@ExcelProperty(value = "10鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double tenHours;
@ExcelIgnore
@@ -107,6 +119,7 @@
@ApiModelProperty("11鏃ュ伐鏃�")
@ValueTableShow(14)
@ExcelProperty(value = "11鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double elevenHours;
@ExcelIgnore
@@ -115,6 +128,7 @@
@ApiModelProperty("12鏃ュ伐鏃�")
@ValueTableShow(15)
@ExcelProperty(value = "12鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twelveHours;
@ExcelIgnore
@@ -123,6 +137,7 @@
@ApiModelProperty("13鏃ュ伐鏃�")
@ValueTableShow(16)
@ExcelProperty(value = "13鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double thirteenHours;
@ExcelIgnore
@@ -131,6 +146,7 @@
@ApiModelProperty("14鏃ュ伐鏃�")
@ValueTableShow(17)
@ExcelProperty(value = "14鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double fourteenHours;
@ExcelIgnore
@@ -139,6 +155,7 @@
@ApiModelProperty("15鏃ュ伐鏃�")
@ValueTableShow(18)
@ExcelProperty(value = "15鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double fifteenHours;
@ExcelIgnore
@@ -147,6 +164,7 @@
@ApiModelProperty("16鏃ュ伐鏃�")
@ValueTableShow(19)
@ExcelProperty(value = "16鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double sixteenHours;
@ExcelIgnore
@@ -155,6 +173,7 @@
@ApiModelProperty("17鏃ュ伐鏃�")
@ValueTableShow(20)
@ExcelProperty(value = "17鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double seventeenHours;
@ExcelIgnore
@@ -163,6 +182,7 @@
@ApiModelProperty("18鏃ュ伐鏃�")
@ValueTableShow(21)
@ExcelProperty(value = "18鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double eighteenHours;
@ExcelIgnore
@@ -171,6 +191,7 @@
@ApiModelProperty("19鏃ュ伐鏃�")
@ValueTableShow(22)
@ExcelProperty(value = "19鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double nineteenHours;
@ExcelIgnore
@@ -179,6 +200,7 @@
@ApiModelProperty("20鏃ュ伐鏃�")
@ValueTableShow(23)
@ExcelProperty(value = "20鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyHours;
@ExcelIgnore
@@ -187,6 +209,7 @@
@ApiModelProperty("21鏃ュ伐鏃�")
@ValueTableShow(24)
@ExcelProperty(value = "21鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyOneHours;
@ExcelIgnore
@@ -195,6 +218,7 @@
@ApiModelProperty("22鏃ュ伐鏃�")
@ValueTableShow(25)
@ExcelProperty(value = "22鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyTwoHours;
@ExcelIgnore
@@ -203,6 +227,7 @@
@ApiModelProperty("23鏃ュ伐鏃�")
@ValueTableShow(26)
@ExcelProperty(value = "23鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyThreeHours;
@ExcelIgnore
@@ -211,6 +236,7 @@
@ApiModelProperty("24鏃ュ伐鏃�")
@ValueTableShow(27)
@ExcelProperty(value = "24鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyFourHours;
@ExcelIgnore
@@ -219,6 +245,7 @@
@ApiModelProperty("25鏃ュ伐鏃�")
@ValueTableShow(28)
@ExcelProperty(value = "25鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyFiveHours;
@ExcelIgnore
@@ -227,6 +254,7 @@
@ApiModelProperty("26鏃ュ伐鏃�")
@ValueTableShow(29)
@ExcelProperty(value = "26鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentySixHours;
@ExcelIgnore
@@ -235,6 +263,7 @@
@ApiModelProperty("27鏃ュ伐鏃�")
@ValueTableShow(30)
@ExcelProperty(value = "27鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentySevenHours;
@ExcelIgnore
@@ -243,6 +272,7 @@
@ApiModelProperty("28鏃ュ伐鏃�")
@ValueTableShow(31)
@ExcelProperty(value = "28鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyEightHours;
@ExcelIgnore
@@ -251,6 +281,7 @@
@ApiModelProperty("29鏃ュ伐鏃�")
@ValueTableShow(32)
@ExcelProperty(value = "29鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double twentyNineHours;
@ExcelIgnore
@@ -259,6 +290,7 @@
@ApiModelProperty("30鏃ュ伐鏃�")
@ValueTableShow(33)
@ExcelProperty(value = "30鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double thirtyHours;
@ExcelIgnore
@@ -267,6 +299,7 @@
@ApiModelProperty("31鏃ュ伐鏃�")
@ValueTableShow(34)
@ExcelProperty(value = "31鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double thirtyOneHours;
@ExcelIgnore
@@ -275,6 +308,7 @@
@ApiModelProperty("鎬诲伐鏃�")
@ValueTableShow(34)
@ExcelProperty(value = "鎬诲伐鏃�")
+ @JsonSerialize(using = CustomerDoubleSerialize.class)
private Double total;
@ApiModelProperty("鏈堜唤")
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
index 6079e42..a0cf3ae 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
@@ -4,21 +4,20 @@
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.*;
+import com.yuanchu.mom.dto.AuxiliaryCorrectionHoursDto;
+import com.yuanchu.mom.dto.AuxiliaryOriginalHoursDto;
+import com.yuanchu.mom.dto.AuxiliaryOriginalHoursLookDto;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.AuxiliaryCorrectionHours;
-import com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours;
import com.yuanchu.mom.pojo.Power;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.AuxiliaryOriginalHoursService;
-import com.yuanchu.mom.utils.QueryWrappers;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
diff --git a/performance-server/src/main/java/com/yuanchu/mom/utils/CustomerDoubleSerialize.java b/performance-server/src/main/java/com/yuanchu/mom/utils/CustomerDoubleSerialize.java
new file mode 100644
index 0000000..69c45b3
--- /dev/null
+++ b/performance-server/src/main/java/com/yuanchu/mom/utils/CustomerDoubleSerialize.java
@@ -0,0 +1,26 @@
+package com.yuanchu.mom.utils;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.text.DecimalFormat;
+
+public class CustomerDoubleSerialize extends JsonSerializer {
+ private DecimalFormat df = new DecimalFormat("0.0000");
+
+ @Override
+ public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+ if(o.toString() != null && !o.toString().equals("0.0")) {
+ Double dd=Double.parseDouble(o.toString());
+ jsonGenerator.writeString(df.format(dd));
+ } else{
+ if(o.toString().equals("0.0")) {
+ jsonGenerator.writeString("0");
+ } else {
+ jsonGenerator.writeString(o.toString());
+ }
+ }
+ }
+}
--
Gitblit v1.9.3