1

src/main/java/com/fdkankan/manage/vo/response/UserIncrementVo.java

@@ -1,10 +1,12 @@
 package com.fdkankan.manage.vo.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
-public class UserIncrementVo extends IncrementOrderVo{
+public class UserIncrementVo {
     private Long id;                                //会员权益id
     private String snCode;                          //相机snCode
     private String incrementStartTime;              //购买日期
@@ -18,26 +20,49 @@ public class UserIncrementVo extends IncrementOrderVo{
 
     private Integer IncrementTypeId;
 
-//    private String projectNum;
-//
-//    private Integer useType;
-//
-//    private String useTypeStr;
-//
-//    private String remark;
-//
-//    public String getUseTypeStr() {
-//        if(useType == null){
-//            return "";
-//        }
-//        switch (useType){
-//            case 1 : return "项目实施";
-//            case 2 : return "客户试用";
-//            case 3 : return "内部测试";
-//            case 4 : return "正常销售";
-//            case 5 : return "渠道推广";
-//            case 6 : return "其它";
-//            default: return "";
-//        }
-//    }
+    private String projectNum;
+
+    private Integer useType;
+
+    private String useTypeStr;
+
+    private String remark;
+
+    private String customerName;
+
+    /**
+     * 客户类别0直销，1经销
+     */
+    private Integer customerType;
+
+    private String customerTypeStr;
+
+    private String endCustomer;
+
+
+    public String getUseTypeStr() {
+        if(useType == null){
+            return "";
+        }
+        switch (useType){
+            case 1 : return "项目实施";
+            case 2 : return "客户试用";
+            case 3 : return "内部测试";
+            case 4 : return "正常销售";
+            case 5 : return "渠道推广";
+            case 6 : return "其它";
+            default: return "";
+        }
+    }
+
+    public String getCustomerTypeStr() {
+        if(customerType == null){
+            return "";
+        }
+        switch (customerType){
+            case 0 : return "直销";
+            case 1 : return "经销";
+            default: return "";
+        }
+    }
 }