Browse Source

修复bug

zhaopeiqing 1 year ago
parent
commit
660624a5f3

+ 25 - 35
yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/businessopportunity/vo/CustomerBusinessOpportunityRespVO.java

@@ -19,11 +19,9 @@ import com.alibaba.excel.annotation.*;
 public class CustomerBusinessOpportunityRespVO {
 
     @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6699")
-    @ExcelProperty("自增主键")
     private Long id;
 
     @Schema(description = "商机uuid", example = "28138")
-    @ExcelProperty("商机uuid")
     private String opportunityId;
 
     @Schema(description = "商机编码")
@@ -31,39 +29,18 @@ public class CustomerBusinessOpportunityRespVO {
     private String opportunityCode;
 
     @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2835")
-    @ExcelProperty("客户id")
     private Long customerId;
 
-    @Schema(description = "客户名称", example = "人事部")
-    @ExcelProperty("客户名称")
-    private String customerName;
-
     @Schema(description = "商机名称", example = "王五")
     @ExcelProperty("商机名称")
     private String opportunityName;
 
-    @Schema(description = "项目类型", example = "1")
-    @ExcelProperty("项目类型")
-    private String projectType;
-
-    @Schema(description = "创建人员工id", example = "28498")
-    @ExcelProperty("创建人员工id")
-    private Long creatorEmployeeId;
-
-    @Schema(description = "创建人员工姓名", example = "张三")
-    @ExcelProperty("创建人员工姓名")
-    private String creatorEmployeeName;
-
-    @Schema(description = "部门id", example = "8267")
-    @ExcelProperty("部门id")
-    private Long deptId;
-
-    @Schema(description = "部门名称", example = "人事部")
-    @ExcelProperty("部门名称")
-    private String deptName;
+    @Schema(description = "客户名称", example = "人事部")
+    @ExcelProperty("客户名称")
+    private String customerName;
 
     @Schema(description = "赢单机率")
-    @ExcelProperty("赢单机率")
+    @ExcelProperty("预计赢单机率")
     private String winRate;
 
     @Schema(description = "预计合同金额")
@@ -87,21 +64,34 @@ public class CustomerBusinessOpportunityRespVO {
     @ExcelProperty("商机等级")
     private String opportunityLevel;
 
-    @Schema(description = "备注")
-    @ExcelProperty("备注")
-    private String remarks;
-
-    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("状态")
-    private Integer status;
+    @Schema(description = "创建人员工姓名", example = "张三")
+    @ExcelProperty("创建人员工姓名")
+    private String creatorEmployeeName;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @Schema(description = "项目类型", example = "1")
+    private String projectType;
+
+    @Schema(description = "创建人员工id", example = "28498")
+    private Long creatorEmployeeId;
+
+    @Schema(description = "部门id", example = "8267")
+    private Long deptId;
+
+    @Schema(description = "部门名称", example = "人事部")
+    private String deptName;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    private Integer status;
+
     @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4014")
-    @ExcelProperty("租户编号")
     private Long tenantId;
 
     @Schema(description = "附件列表")