From a57112aee7438f4f550d1dd5a1b93e2a28fb386c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 24 十一月 2023 17:09:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/Plan.java |  451 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 274 insertions(+), 177 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/Plan.java b/src/main/java/com/zy/crm/manager/entity/Plan.java
index 24ccfdf..4f1a728 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -33,346 +33,421 @@
     /**
      * ID
      */
-    @ApiModelProperty(value= "ID")
+    @ApiModelProperty(value = "ID")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 鎵�灞炲晢鎴�
      */
-    @ApiModelProperty(value= "鎵�灞炲晢鎴�")
+    @ApiModelProperty(value = "鎵�灞炲晢鎴�")
     @TableField("host_id")
     private Long hostId;
 
     /**
      * 鎵�灞為儴闂�
      */
-    @ApiModelProperty(value= "鎵�灞為儴闂�")
+    @ApiModelProperty(value = "鎵�灞為儴闂�")
     @TableField("dept_id")
     private Long deptId;
 
     /**
      * 涓氬姟绫诲瀷
      */
-    @ApiModelProperty(value= "涓氬姟绫诲瀷")
+    @ApiModelProperty(value = "涓氬姟绫诲瀷")
     @TableField("plan_type")
     private Long planType;
 
     /**
      * 涓氬姟鍛�
      */
-    @ApiModelProperty(value= "涓氬姟鍛�")
+    @ApiModelProperty(value = "涓氬姟鍛�")
     @TableField("user_id")
     private Long userId;
 
     /**
      * 璺熻釜椤圭洰
      */
-    @ApiModelProperty(value= "璺熻釜椤圭洰")
+    @ApiModelProperty(value = "璺熻釜椤圭洰")
     @TableField("order_id")
     private Long orderId;
 
     /**
-     * 鐢叉柟鍗曚綅
+     * 瀹㈡埛淇℃伅
      */
-    @ApiModelProperty(value= "鐢叉柟鍗曚綅")
+    @ApiModelProperty(value = "瀹㈡埛淇℃伅")
     @TableField("cstmr_id")
     private Long cstmrId;
 
     /**
      * 瑙勫垝鍗曚唬鍙�
      */
-    @ApiModelProperty(value= "瑙勫垝鍗曚唬鍙�")
+    @ApiModelProperty(value = "瑙勫垝鍗曚唬鍙�")
     private String uuid;
 
     /**
      * 瑙勫垝鍗曞悕绉�
      */
-    @ApiModelProperty(value= "瑙勫垝鍗曞悕绉�")
+    @ApiModelProperty(value = "瑙勫垝鍗曞悕绉�")
     private String name;
 
     /**
      * 鐢宠鏃ユ湡
      */
-    @ApiModelProperty(value= "鐢宠鏃ユ湡")
+    @ApiModelProperty(value = "鐢宠鏃ユ湡")
     @TableField("apple_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date appleTime;
 
     /**
      * 鏂规鎵�闇�
      */
-    @ApiModelProperty(value= "鏂规鎵�闇�")
+    @ApiModelProperty(value = "鏂规鎵�闇�")
     @TableField("plan_need")
-    private Long planNeed;
+    private String planNeed;
 
     /**
      * 绔嬮」 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "绔嬮」 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "绔嬮」 1: 鏄�  0: 鍚�  ")
     @TableField("be_item")
     private Integer beItem;
 
     /**
      * 琛ㄥ崟鍐呭
      */
-    @ApiModelProperty(value= "琛ㄥ崟鍐呭")
+    @ApiModelProperty(value = "琛ㄥ崟鍐呭")
     private String form;
 
     /**
      * 瑙勫垝鍛�
      */
-    @ApiModelProperty(value= "瑙勫垝鍛�")
-    private String planner;
+    @ApiModelProperty(value = "瑙勫垝鍛�")
+    private Long planner;
 
     /**
      * 瀹屾垚鏃堕棿
      */
-    @ApiModelProperty(value= "瀹屾垚鏃堕棿")
+    @ApiModelProperty(value = "瀹屾垚鏃堕棿")
     @TableField("finish_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date finishTime;
 
     /**
      * 鏇存敼鏂规 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "鏇存敼鏂规 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "鏇存敼鏂规 1: 鏄�  0: 鍚�  ")
     private Integer change;
 
     /**
      * 鏇存敼娆℃暟
      */
-    @ApiModelProperty(value= "鏇存敼娆℃暟")
+    @ApiModelProperty(value = "鏇存敼娆℃暟")
     @TableField("change_time")
     private Integer changeTime;
 
     /**
      * 鏇存敼鏂规鍘熷洜
      */
-    @ApiModelProperty(value= "鏇存敼鏂规鍘熷洜")
+    @ApiModelProperty(value = "鏇存敼鏂规鍘熷洜")
     @TableField("change_reason")
     private String changeReason;
 
     /**
      * 瑙勬牸濂栭噾
      */
-    @ApiModelProperty(value= "瑙勬牸濂栭噾")
+    @ApiModelProperty(value = "瑙勬牸濂栭噾")
     @TableField("plan_bonus")
     private Double planBonus;
 
     /**
      * 瑙勬牸缁勯暱濂栭噾
      */
-    @ApiModelProperty(value= "瑙勬牸缁勯暱濂栭噾")
+    @ApiModelProperty(value = "瑙勬牸缁勯暱濂栭噾")
     @TableField("plan_leader_bonus")
     private Double planLeaderBonus;
 
     /**
      * 闄勪欢
      */
-    @ApiModelProperty(value= "闄勪欢")
+    @ApiModelProperty(value = "闄勪欢")
     private String files;
 
     /**
-     * 杩涘害 1: 寮�濮�  2: 缁勯暱寰呭  3: 缁勯暱瀹℃牳  4: 瑙勫垝寰呭  5: 瑙勫垝瀹℃牳  6: 瀹℃壒涓�  7: 瀹℃壒閫氳繃
+     * 杩涘害 1: 寮�濮�  2: 缁勯暱瀹℃牳  3: 鍞墠缁勯暱瀹℃牳  4: 瑙勫垝鍛樺鏍�  5: 瀹℃壒閫氳繃
      */
-    @ApiModelProperty(value= "杩涘害 1: 寮�濮�  2: 缁勯暱寰呭  3: 缁勯暱瀹℃牳  4: 瑙勫垝寰呭  5: 瑙勫垝瀹℃牳  6: 瀹℃壒涓�  7: 瀹℃壒閫氳繃  ")
+    @ApiModelProperty(value = "杩涘害 1: 寮�濮�  2: 缁勯暱瀹℃牳  3: 鍞墠瀹℃牳  4: 瑙勫垝鍛樺鏍�  5: 瀹℃壒閫氳繃  ")
     private Integer settle;
 
     /**
      * 瀹℃牳杩涘害
      */
-    @ApiModelProperty(value= "瀹℃牳杩涘害")
+    @ApiModelProperty(value = "瀹℃牳杩涘害")
     @TableField("settle_msg")
     private String settleMsg;
 
     /**
      * 璇勮
      */
-    @ApiModelProperty(value= "璇勮")
+    @ApiModelProperty(value = "璇勮")
     private String comment;
 
     /**
      * 鐘舵�� 1: 姝e父  0: 绂佺敤
      */
-    @ApiModelProperty(value= "鐘舵�� 1: 姝e父  0: 绂佺敤  ")
+    @ApiModelProperty(value = "鐘舵�� 1: 姝e父  0: 绂佺敤  ")
     private Integer status;
 
     /**
      * 娣诲姞浜哄憳
      */
-    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @ApiModelProperty(value = "娣诲姞浜哄憳")
     @TableField("create_by")
     private Long createBy;
 
     /**
      * 娣诲姞鏃堕棿
      */
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
     @TableField("create_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
      * 淇敼浜哄憳
      */
-    @ApiModelProperty(value= "淇敼浜哄憳")
+    @ApiModelProperty(value = "淇敼浜哄憳")
     @TableField("update_by")
     private Long updateBy;
 
     /**
      * 淇敼鏃堕棿
      */
-    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @ApiModelProperty(value = "淇敼鏃堕棿")
     @TableField("update_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**
      * 娉ㄩ噴
      */
-    @ApiModelProperty(value= "娉ㄩ噴")
+    @ApiModelProperty(value = "娉ㄩ噴")
     private String memo;
 
-    public Plan() {}
+    /**
+     * 椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}
+     */
+    @ApiModelProperty(value = "椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}")
+    private Integer step;
 
-    public Plan(Long hostId,Long deptId,Long planType,Long userId,Long orderId,Long cstmrId,String uuid,String name,Date appleTime,Long planNeed,Integer beItem,String planner,Date finishTime,String form,Integer change,Integer changeTime,String changeReason,Double planBonus,Double planLeaderBonus,String files,Integer settle,String settleMsg,String comment,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
-        this.hostId = hostId;
-        this.deptId = deptId;
-        this.planType = planType;
-        this.userId = userId;
-        this.orderId = orderId;
-        this.cstmrId = cstmrId;
-        this.uuid = uuid;
-        this.name = name;
-        this.appleTime = appleTime;
-        this.planNeed = planNeed;
-        this.beItem = beItem;
-        this.planner = planner;
-        this.finishTime = finishTime;
-        this.form = form;
-        this.change = change;
-        this.changeTime = changeTime;
-        this.changeReason = changeReason;
-        this.planBonus = planBonus;
-        this.planLeaderBonus = planLeaderBonus;
-        this.files = files;
-        this.settle = settle;
-        this.settleMsg = settleMsg;
-        this.comment = comment;
-        this.status = status;
-        this.createBy = createBy;
-        this.createTime = createTime;
-        this.updateBy = updateBy;
-        this.updateTime = updateTime;
-        this.memo = memo;
+    /**
+     * 涓氬姟鍛樿仈绯绘柟寮�
+     */
+    @ApiModelProperty(value = "涓氬姟鍛樿仈绯绘柟寮�")
+    private String userXmlSelPhone;
+
+    /**
+     * 鑺傜偣璐熻矗浜�
+     */
+    @ApiModelProperty(value = "鑺傜偣璐熻矗浜�")
+    private Long director;
+
+    /**
+     * 闆嗘垚椤圭洰璐ф灦鏍镐环鐘舵��
+     */
+    @ApiModelProperty(value = "鐘舵�� 3: 瀹屾垚鏍镐环 2: 寮�濮嬫牳浠� 1: 绛夊緟鏍镐环  0: 鍒濆  ")
+    private Integer status2;
+
+    /**
+     * 鑺傜偣璐熻矗浜�
+     */
+    @ApiModelProperty(value = "鍓痯lanId")
+    @TableField("assistant_plan_id")
+    private Long assistantPlanId;
+
+    /**
+     * 鑺傜偣璐熻矗浜�
+     */
+    @ApiModelProperty(value = "涓籶lanId")
+    @TableField("host_plan_id")
+    private Long hostPlanId;
+
+    /**
+     * 鑺傜偣璐熻矗浜�
+     */
+    @ApiModelProperty(value = "涓籶lanId")
+    @TableField("assistant_host_sign")
+    private Integer assistantHostSign;
+
+    public Plan() {
     }
 
-//    Plan plan = new Plan(
-//            null,    // 鎵�灞炲晢鎴�
-//            null,    // 鎵�灞為儴闂�
-//            null,    // 涓氬姟绫诲瀷[闈炵┖]
-//            null,    // 涓氬姟鍛�
-//            null,    // 璺熻釜椤圭洰
-//            null,    // 鐢叉柟鍗曚綅
-//            null,    // 瑙勫垝鍗曚唬鍙穂闈炵┖]
-//            null,    // 瑙勫垝鍗曞悕绉癧闈炵┖]
-//            null,    // 鐢宠鏃ユ湡
-//            null,    // 鏂规鎵�闇�
-//            null,    // 绔嬮」
-//            null,    // 瑙勫垝鍛�
-//            null,    // 瀹屾垚鏃堕棿
-//            null,    // 琛ㄥ崟鍐呭
-//            null,    // 鏇存敼鏂规
-//            null,    // 鏇存敼娆℃暟
-//            null,    // 鏇存敼鏂规鍘熷洜
-//            null,    // 瑙勬牸濂栭噾
-//            null,    // 瑙勬牸缁勯暱濂栭噾
-//            null,    // 闄勪欢
-//            null,    // 杩涘害
-//            null,    // 瀹℃牳杩涘害
-//            null,    // 璇勮
-//            null,    // 鐘舵��
-//            null,    // 娣诲姞浜哄憳
-//            null,    // 娣诲姞鏃堕棿
-//            null,    // 淇敼浜哄憳
-//            null,    // 淇敼鏃堕棿
-//            null    // 娉ㄩ噴
-//    );
+    public Plan(Plan plan) {
+        this.hostId = plan.getHostId();
+        this.deptId = plan.getDeptId();
+        this.planType = plan.getPlanType();
+        this.userId = plan.getUserId();
+        this.orderId = plan.getOrderId();
+        this.cstmrId = plan.getCstmrId();
+        this.name = plan.getName();
+        this.planNeed = plan.getPlanNeed();
+        this.beItem = plan.getBeItem();
+        this.form = plan.getForm();
+        this.finishTime = plan.getFinishTime();
+        this.change = plan.getChange();
+        this.changeTime = plan.getChangeTime();
+        this.changeReason = plan.getChangeReason();
+        this.planBonus = plan.getPlanBonus();
+        this.planLeaderBonus = plan.getPlanLeaderBonus();
+        this.files = plan.getFiles();
+        this.comment = plan.getComment();
+        this.memo = plan.getMemo();
+        this.userXmlSelPhone = plan.getUserXmlSelPhone();
+    }
 
-    public String getHostId$(){
+    public String getHostId$() {
         HostService service = SpringUtils.getBean(HostService.class);
         Host host = service.selectById(this.hostId);
-        if (!Cools.isEmpty(host)){
+        if (!Cools.isEmpty(host)) {
             return String.valueOf(host.getName());
         }
         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 getPlanType$(){
-        PlanTypeService service = SpringUtils.getBean(PlanTypeService.class);
-        PlanType planType = service.selectById(this.planType);
-        if (!Cools.isEmpty(planType)){
-            return String.valueOf(planType.getName());
-        }
-        return null;
-    }
-
-    public String getUserId$(){
+    public String getDirector$() {
+        if (this.director == null) return "";
         UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.userId);
-        if (!Cools.isEmpty(user)){
+        User user = service.selectById(this.director);
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getNickname());
         }
         return null;
     }
 
-    public String getOrderId$(){
+    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 getPlanType$() {
+        PlanTypeService service = SpringUtils.getBean(PlanTypeService.class);
+        PlanType planType = service.selectById(this.planType);
+        if (!Cools.isEmpty(planType)) {
+            return String.valueOf(planType.getName());
+        }
+        return null;
+    }
+
+    public Integer getPLType$() {
+        PlanTypeService service = SpringUtils.getBean(PlanTypeService.class);
+        PlanType planType = service.selectById(this.planType);
+        if (!Cools.isEmpty(planType)) {
+            return planType.getType();
+        }
+        return null;
+    }
+
+    public String getStatusAll$(){
+        if (this.status2>3 || this.getAssistantHostSign()==1){
+            return getStatus$();
+        }else {
+            return "闆嗘垚"+getStatus$()+"/"+"璐ф灦"+getStatus2$();
+        }
+
+    }
+
+    public String getStatus$(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 3:
+                return "瀹屾垚鏍镐环";
+            case 2:
+                return "寮�濮嬫牳浠�";
+            case 1:
+                return "绛夊緟鏍镐环";
+            case 0:
+                return "鍒濆";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
+    public String getStatus2$(){
+        if (null == this.status2){ return null; }
+        switch (this.status2){
+            case 3:
+                return "瀹屾垚鏍镐环";
+            case 2:
+                return "寮�濮嬫牳浠�";
+            case 1:
+                return "绛夊緟鏍镐环";
+            case 0:
+                return "鍒濆";
+            default:
+                return String.valueOf(this.status2);
+        }
+    }
+
+    public String getUserId$() {
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.userId);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+    public String getOrderId$() {
         OrderService service = SpringUtils.getBean(OrderService.class);
         Order order = service.selectById(this.orderId);
-        if (!Cools.isEmpty(order)){
+        if (!Cools.isEmpty(order)) {
             return String.valueOf(order.getName());
         }
         return null;
     }
 
-    public String getCstmrId$(){
+    public String getCstmrId$() {
         CstmrService service = SpringUtils.getBean(CstmrService.class);
         Cstmr cstmr = service.selectById(this.cstmrId);
-        if (!Cools.isEmpty(cstmr)){
+        if (!Cools.isEmpty(cstmr)) {
             return String.valueOf(cstmr.getName());
         }
         return null;
     }
 
-    public String getAppleTime$(){
-        if (Cools.isEmpty(this.appleTime)){
+    public String getAppleTime$() {
+        if (Cools.isEmpty(this.appleTime)) {
             return "";
         }
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appleTime);
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.appleTime);
     }
 
-    public String getPlanNeed$(){
-        PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
-        PlanNeed planNeed = service.selectById(this.planNeed);
-        if (!Cools.isEmpty(planNeed)){
-            return String.valueOf(planNeed.getName());
+    public String getPlanNeed$() {
+        if (Cools.isEmpty(this.planNeed)) {
+            return null;
         }
-        return null;
+        PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
+        String[] planNeeds = this.planNeed.split("-");
+        String name = "";
+        for (String planNeeda : planNeeds) {
+            PlanNeed planNeed = service.selectById(Integer.parseInt(planNeeda));
+            if (!Cools.isEmpty(planNeed)) {
+//                return String.valueOf(planNeed.getName());
+                name = name + planNeed.getName() + ";";
+            }
+        }
+        return name;
     }
 
-    public String getBeItem$(){
-        if (null == this.beItem){ return null; }
-        switch (this.beItem){
+    public String getBeItem$() {
+        if (null == this.beItem) {
+            return null;
+        }
+        switch (this.beItem) {
             case 1:
                 return "鏄�";
             case 0:
@@ -382,16 +457,32 @@
         }
     }
 
-    public String getFinishTime$(){
-        if (Cools.isEmpty(this.finishTime)){
-            return "";
+    public String getAssistantHostSign$() {
+        if (null == this.assistantHostSign) {
+            return null;
         }
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.finishTime);
+        switch (this.assistantHostSign) {
+            case 1:
+                return "鍓祦绋�";
+            case 0:
+                return "涓绘祦绋�";
+            default:
+                return String.valueOf(this.assistantHostSign);
+        }
     }
 
-    public String getChange$(){
-        if (null == this.change){ return null; }
-        switch (this.change){
+    public String getFinishTime$() {
+        if (Cools.isEmpty(this.finishTime)) {
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.finishTime);
+    }
+
+    public String getChange$() {
+        if (null == this.change) {
+            return null;
+        }
+        switch (this.change) {
             case 1:
                 return "鏄�";
             case 0:
@@ -401,67 +492,73 @@
         }
     }
 
-    public String getSettle$(){
-        if (null == this.settle){ return null; }
-        switch (this.settle){
+    public String getSettle$() {
+        if (null == this.settle) {
+            return null;
+        }
+        switch (this.settle) {
+//            case 1:
+//                return "绛夊緟缁勯暱瀹℃牳";
             case 1:
-                return "寮�濮�";
+                return "绛夊緟鍞墠鍒嗛厤瑙勫垝鍛�";
             case 2:
-                return "缁勯暱寰呭";
+                return "绛夊緟瑙勫垝鍛樻彁浜�";
             case 3:
-                return "缁勯暱瀹℃牳";
+                return "瑙勫垝鍛樺凡鎻愪氦";
             case 4:
-                return "瑙勫垝寰呭";
-            case 5:
-                return "瑙勫垝瀹℃牳";
-            case 6:
-                return "瀹℃壒涓�";
-            case 7:
                 return "瀹℃壒閫氳繃";
             default:
                 return String.valueOf(this.settle);
         }
     }
 
-    public String getStatus$(){
-        if (null == this.status){ return null; }
-        switch (this.status){
-            case 1:
-                return "姝e父";
-            case 0:
-                return "绂佺敤";
-            default:
-                return String.valueOf(this.status);
+    public String getPlanner$() {
+        if (this.planner == null) return "鏈垎閰�";
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.planner);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getNickname());
         }
+        return "";
     }
 
-    public String getCreateBy$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.createBy);
-        if (!Cools.isEmpty(user)){
+    public String getNowHeadman$() {
+        PlanTypeService planTypeService = SpringUtils.getBean(PlanTypeService.class);
+        PlanType planType = planTypeService.selectById(this.planType);
+        User user = planTypeService.findPlanLeader(planType);
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getNickname());
         }
         return null;
     }
 
-    public String getCreateTime$(){
-        if (Cools.isEmpty(this.createTime)){
+    public String getCreateBy$() {
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.createBy);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+    public String getCreateTime$() {
+        if (Cools.isEmpty(this.createTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
     }
 
-    public String getUpdateBy$(){
+    public String getUpdateBy$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.updateBy);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getNickname());
         }
         return null;
     }
 
-    public String getUpdateTime$(){
-        if (Cools.isEmpty(this.updateTime)){
+    public String getUpdateTime$() {
+        if (Cools.isEmpty(this.updateTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);

--
Gitblit v1.9.1