From 3fcc25d1875d675c1b091fe9c06aad413b10002e Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 12 Aug 2024 15:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=A2=E6=88=B7=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E3=80=91=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/CustomerFeedbackRespVO.java            | 97 ++++++++++---------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/customerfeedback/vo/CustomerFeedbackRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/customerfeedback/vo/CustomerFeedbackRespVO.java
index c35a797c..ffae40b6 100644
--- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/customerfeedback/vo/CustomerFeedbackRespVO.java
+++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/customerfeedback/vo/CustomerFeedbackRespVO.java
@@ -17,82 +17,89 @@ import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert;
 public class CustomerFeedbackRespVO {
 
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("编号")
     private Long id;
 
-    @Schema(description = "客户id")
-    @ExcelProperty("客户id")
-    private Long customerId;
+    @Schema(description = "客户名称")
+    @ExcelProperty("客户名称")
+    private String customerName;
 
-    @Schema(description = "物料(产品)id")
-    @ExcelProperty("物料(产品)id")
-    private Long materialId;
+    @Schema(description = "产品名称")
+    @ExcelProperty("产品名称")
+    private String projectSubName;
 
-    @Schema(description = "单据状态 已保存/已送审/已审核")
-    @ExcelProperty(value = "单据状态 已保存/已送审/已审核", converter = DictConvert.class)
-    @DictFormat("biz_customer_feedback_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private String status;
+    @Schema(description = "产品编码")
+    @ExcelProperty("产品编码")
+    private String projectSubCode;
 
+    @Schema(description = "规格型号")
+    @ExcelProperty("规格型号")
+    private String spec;
 
+    @Schema(description = "颜色")
+    @ExcelProperty("颜色")
+    private String color;
 
+    @Schema(description = "客户反馈人")
+    @ExcelProperty("客户反馈人")
+    private String feedbackPerson;
 
+    @Schema(description = "联系电话")
+    @ExcelProperty("联系电话")
+    private String telephone;
+
+    @Schema(description = "金额")
+    @ExcelProperty("金额")
+    private BigDecimal reduceMoney;
 
     @Schema(description = "数量")
     @ExcelProperty("数量")
     private BigDecimal feedbackNum;
 
-    @Schema(description = "扣款金额")
-    @ExcelProperty("扣款金额")
-    private BigDecimal reduceMoney;
-
     @Schema(description = "扣款原因描述")
     @ExcelProperty("扣款原因描述")
     private String reduceReason;
 
-    @Schema(description = "送审人id")
-    @ExcelProperty("送审人id")
-    private String submitter;
+    @Schema(description = "创建人")
+    @ExcelProperty("创建人")
+    private String creatorName;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "送审人")
+    @ExcelProperty("送审人")
+    private String submitterName;
 
     @Schema(description = "送审时间")
     @ExcelProperty("送审时间")
     private LocalDateTime submitTime;
 
-    @Schema(description = "审核人id")
-    @ExcelProperty("审核人id")
-    private String auditor;
+    @Schema(description = "审核人")
+    @ExcelProperty("审核人")
+    private String auditorName;
 
     @Schema(description = "审核时间")
     @ExcelProperty("审核时间")
     private LocalDateTime auditorTime;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
+    @Schema(description = "单据状态 已保存/已送审/已审核")
+    @ExcelProperty(value = "单据状态", converter = DictConvert.class)
+    @DictFormat("biz_customer_feedback_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private String status;
 
 
-    @Schema(description = "客户反馈人")
-    @ExcelProperty("客户反馈人")
-    private String feedbackPerson;
 
-    @Schema(description = "联系电话")
-    @ExcelProperty("联系电话")
-    private String telephone;
 
-    @Schema(description = "客户名称")
-    private String customerName;
-    @Schema(description = "产品编码")
-    private String projectSubName;
-    @Schema(description = "产品名称")
-    private String projectSubCode;
-    @Schema(description = "规格型号")
-    private String spec;
-    @Schema(description = "创建人")
-    private String creatorName;
-    @Schema(description = "送审人")
-    private String submitterName;
-    @Schema(description = "审核人")
-    private String auditorName;
+    @Schema(description = "客户id")
+    private Long customerId;
 
-    private String color;
+    @Schema(description = "物料(产品)id")
+    private Long materialId;
 
+    @Schema(description = "送审人id")
+    private String submitter;
+
+    @Schema(description = "审核人id")
+    private String auditor;
 }
\ No newline at end of file