From c32dfb847e5c333ea788c07dea179be0e9a73bb7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 07 十一月 2023 17:49:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/PriOnline2.java |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/PriOnline2.java b/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
index 754014c..715860a 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
@@ -8,7 +8,9 @@
 import com.core.common.SpringUtils;
 import com.zy.crm.manager.service.CstmrService;
 import com.zy.crm.manager.service.PlanService;
+import com.zy.crm.system.entity.Dept;
 import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.DeptService;
 import com.zy.crm.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,6 +46,20 @@
     @TableField("sheet_data")
     private String sheetData;
 
+    /**
+     * excel琛ㄦ爣棰�
+     */
+    @ApiModelProperty(value= "excel琛ㄦ爣棰�")
+    @TableField("sales_title")
+    private String salesTitle;
+
+    /**
+     * excel琛ㄦ暟鎹�
+     */
+    @ApiModelProperty(value= "excel琛ㄦ暟鎹�")
+    @TableField("sales_sheet_data")
+    private String salesSheetData;
+
     @ApiModelProperty(value= "鏂囦欢淇濆瓨鍦板潃")
     private String filepath;
 
@@ -55,7 +71,7 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    @ApiModelProperty(value= "椤圭洰id{man_item}")
+    @ApiModelProperty(value= "瑙勫垝鍗旾D plan_id")
     @TableField("item_id")
     private Long itemId;
 
@@ -96,6 +112,10 @@
     @TableField("member_id")
     private Long memberId;
 
+    @ApiModelProperty(value= "瑙勫垝鍗旾D")
+    @TableField("plan_id")
+    private Long planId;
+
     @ApiModelProperty(value= "涓婁紶鎶ヤ环excel鏁版嵁鐨勫師濮嬫枃浠跺湴鍧�")
     @TableField("check_data_file")
     private String checkDataFile;
@@ -114,6 +134,13 @@
     private Integer settle;
 
     /**
+     * 杩涘害
+     */
+    @ApiModelProperty(value= "杩涘害")
+    @TableField("settle_size")
+    private Integer settleSize;
+
+    /**
      * 娴佺▼杩涘害
      */
     @ApiModelProperty(value= "娴佺▼杩涘害")
@@ -125,12 +152,13 @@
 
     public PriOnline2() {}
 
-    public PriOnline2(String title, String sheetData, Date createTime, String filepath,Integer settle) {
+    public PriOnline2(String title, String sheetData, Date createTime, String filepath,Integer settle,Integer settleSize) {
         this.title = title;
         this.sheetData = sheetData;
         this.createTime = createTime;
         this.filepath = filepath;
         this.settle = settle;
+        this.settleSize = settleSize;
     }
 
 //    PriOnline priOnline = new PriOnline(
@@ -145,9 +173,9 @@
             case 0:
                 return "绛夊緟鎻愪氦";
             case 1:
-                return "绛夊緟瀹℃壒";
-            case 2:
                 return "绛夊緟纭";
+            case 2:
+                return this.settleSize.equals(this.settle+1)? "瀹℃壒閫氳繃" : "绛夊緟纭";
             case 3:
                 return "瀹℃壒閫氳繃";
             default:
@@ -207,6 +235,15 @@
         return null;
     }
 
+    public String getDeptId$(){
+        DeptService service = SpringUtils.getBean(DeptService.class);
+        Dept dept = service.selectById(this.deptId);
+        if (!Cools.isEmpty(dept)){
+            return String.valueOf(dept.getName());
+        }
+        return null;
+    }
+
     public String getUpdateUserId$() {
         UserService userService = SpringUtils.getBean(UserService.class);
         User user = userService.selectById(this.updateUserId);

--
Gitblit v1.9.1