From f40a9f9c1b90d3efd52926b29f3612cb1c293afa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 13:25:42 +0800
Subject: [PATCH] #跟踪项目负责人默认值

---
 src/main/java/com/zy/crm/manager/entity/CompanyTarget.java |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/CompanyTarget.java b/src/main/java/com/zy/crm/manager/entity/CompanyTarget.java
index aaec960..49c6a49 100644
--- a/src/main/java/com/zy/crm/manager/entity/CompanyTarget.java
+++ b/src/main/java/com/zy/crm/manager/entity/CompanyTarget.java
@@ -5,7 +5,10 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
 import com.zy.crm.manager.utils.WordUtils;
+import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.UserService;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -55,6 +58,17 @@
     @TableField("update_user_id")
     private Long updateUserId;
 
+    @ApiModelProperty(value= "鍛樺伐ID,null琛ㄧず鏁版嵁灞炰簬鍏徃")
+    @TableField("staff")
+    private Long staff;
+
+    /**
+     * 瀹屾垚鎯呭喌,棰勭暀瀛楁
+     */
+    @ApiModelProperty(value= "瀹屾垚鎯呭喌,棰勭暀瀛楁")
+    @TableField("complete")
+    private String complete;
+
     public CompanyTarget() {}
 
     public CompanyTarget(String year,String target,Date createTime,Long userId,Date updateTime,Long updateUserId) {
@@ -75,6 +89,16 @@
 //            null    // 
 //    );
 
+    public String getStaff$(){
+        if (Cools.isEmpty(this.staff)) return "鍏徃";
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.staff);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return "";
+    }
+
     public String getCreateTime$(){
         if (Cools.isEmpty(this.createTime)){
             return "";
@@ -89,11 +113,26 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
     }
 
-    public String getTarget$() {
-        if (Cools.isEmpty(this.target)){
-            return "";
+    public String getComplete$(){
+        int completes =0;
+        int targets = 0;
+        if (!Cools.isEmpty(this.complete)){
+            completes = Integer.parseInt(this.complete);
         }
-        return WordUtils.formatNumberForAccounting(Double.parseDouble(this.target));
+        if (!Cools.isEmpty(this.target)){
+            targets = Integer.parseInt(this.target);
+        }
+        if (completes==0 && targets==0){
+            return "鏈煡";
+        }
+        if (completes<targets){
+            return "鏈畬鎴�";
+        }else if (completes>targets){
+            return "瓒呴瀹屾垚";
+        }else {
+            return "瀹屾垚";
+        }
+
     }
 
 

--
Gitblit v1.9.1