From 96cf4e668154555878036a14b7ada2d4acdf7f45 Mon Sep 17 00:00:00 2001
From: Allenxy <13762749+chaosallen@user.noreply.gitee.com>
Date: Thu, 10 Oct 2024 10:39:02 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E5=8F=96=E6=B6=88JsonFormat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fizz/business/constants/enums/NextUnitEnum.java     | 1 -
 .../com/fizz/business/constants/enums/OperModeEnum.java     | 1 -
 .../com/fizz/business/constants/enums/PlanStatusEnum.java   | 1 -
 .../fizz/business/constants/enums/RollerPositionEnum.java   | 1 -
 .../com/fizz/business/constants/enums/RollerTypeEnum.java   | 1 -
 .../src/main/java/com/fizz/business/domain/CrmPdiPlan.java  | 6 +++---
 .../src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java    | 6 +++---
 7 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java b/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java
index d6b0f08..f2541c4 100644
--- a/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java
+++ b/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java
@@ -7,7 +7,6 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum NextUnitEnum {
 
 
diff --git a/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java
index e615133..9c40d5e 100644
--- a/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java
+++ b/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java
@@ -7,7 +7,6 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum OperModeEnum {
 
     UNKNOWN(0,"未知"),
diff --git a/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java b/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java
index efb72c2..185a60d 100644
--- a/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java
+++ b/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java
@@ -7,7 +7,6 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum PlanStatusEnum {
 
     UNKNOWN("UNKNOWN","未知状态"),
diff --git a/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java b/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java
index ff06680..d26561c 100644
--- a/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java
+++ b/business/src/main/java/com/fizz/business/constants/enums/RollerPositionEnum.java
@@ -6,7 +6,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 @Getter
 @AllArgsConstructor
-@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum RollerPositionEnum{
     TOP("TOP","上辊"),
     BOTTOM("BOTTOM","下辊");
diff --git a/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java
index cf62943..66b1812 100644
--- a/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java
+++ b/business/src/main/java/com/fizz/business/constants/enums/RollerTypeEnum.java
@@ -6,7 +6,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 @Getter
 @AllArgsConstructor
-@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum RollerTypeEnum {
     WORK("WORK","工作辊"),
     INTERMEDIATE("INTERMEDIATE","中间辊"),
diff --git a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
index 749412e..a84440e 100644
--- a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
+++ b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
@@ -28,7 +28,7 @@ public class CrmPdiPlan implements Serializable {
     private Integer operid;
 
     @ApiModelProperty(value = "轧制模式")
-    private Integer operMode;
+    private OperModeEnum operMode;
 
     @ApiModelProperty(value = "钢卷id")
     private String coilid;
@@ -64,7 +64,7 @@ public class CrmPdiPlan implements Serializable {
     private String exitCoilid;
 
     @ApiModelProperty(value = "下工序代码")
-    private String nextUnit;
+    private NextUnitEnum nextUnit;
 
     @ApiModelProperty(value = "分切数量")
     private Integer splitNum;
@@ -112,7 +112,7 @@ public class CrmPdiPlan implements Serializable {
     private Integer tensileStrength;
 
     @ApiModelProperty(value = "状态")
-    private String status;
+    private PlanStatusEnum status;
 
     @ApiModelProperty(value = "计划号")
     private String planNo;
diff --git a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
index 478fd52..6da3c3f 100644
--- a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
+++ b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
@@ -23,7 +23,7 @@ public class CrmPdiPlanVO {
     private Integer operid;
 
     @ApiModelProperty(value = "轧制模式")
-    private Integer operMode;
+    private OperModeEnum operMode;
 
     @ApiModelProperty(value = "卷ID")
     private String coilid;
@@ -59,7 +59,7 @@ public class CrmPdiPlanVO {
     private String exitCoilid;
 
     @ApiModelProperty(value = "下工序代码")
-    private String nextUnit;
+    private NextUnitEnum nextUnit;
 
     @ApiModelProperty(value = "分割数量")
     private Integer splitNum;
@@ -107,7 +107,7 @@ public class CrmPdiPlanVO {
     private Integer tensileStrength;
 
     @ApiModelProperty(value = "状态")
-    private String status;
+    private PlanStatusEnum status;
 
     @ApiModelProperty(value = "计划号")
     private String planNo;