From 30e858fa504b268b9b436afca0a1259cf6e8c488 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 11:01:40 +0800
Subject: [PATCH] 优化
---
server/src/main/java/com/doumee/dao/business/model/Company.java | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/model/Company.java b/server/src/main/java/com/doumee/dao/business/model/Company.java
index 0eb4d26..10c6e54 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Company.java
@@ -1,14 +1,13 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.doumee.core.annotation.excel.ExcelExportColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -24,76 +23,58 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelExportColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelExportColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelExportColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelExportColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelExportColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelExportColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鍚嶇О")
- @ExcelExportColumn(name="鍚嶇О")
private String name;
@ApiModelProperty(value = "澶囨敞")
- @ExcelExportColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
- @ExcelExportColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelExportColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "澶村儚")
- @ExcelExportColumn(name="澶村儚")
private String imgurl;
@ApiModelProperty(value = "绫诲瀷", example = "1")
- @ExcelExportColumn(name="绫诲瀷")
private Integer type;
@ApiModelProperty(value = "鎵�灞炵埗绾х紪鐮侊紙鍏宠仈company)", example = "1")
- @ExcelExportColumn(name="鎵�灞炵埗绾х紪鐮侊紙鍏宠仈company)")
private Integer parentId;
@ApiModelProperty(value = "缂栫爜")
- @ExcelExportColumn(name="缂栫爜")
private String code;
@ApiModelProperty(value = "浼佸井鏍囪瘑")
- @ExcelExportColumn(name="浼佸井鏍囪瘑")
private String qwId;
@ApiModelProperty(value = "鍚嶇О璺緞")
- @ExcelExportColumn(name="鍚嶇О璺緞")
private String namePath;
@ApiModelProperty(value = "缂栫爜璺緞")
- @ExcelExportColumn(name="缂栫爜璺緞")
private String idPath;
@ApiModelProperty(value = "浼佷笟寰俊鎵�灞炵埗绾х紪鐮侊紙鍏宠仈company)", example = "1")
- @ExcelExportColumn(name="浼佷笟寰俊鎵�灞炵埗绾х紪鐮侊紙鍏宠仈company)")
private String qwParentId;
@@ -112,5 +93,17 @@
@ApiModelProperty(value = "鏄惁涓洪儴闂ㄨ礋璐ｄ汉0-鍚︼紱1-鏄�", example = "1")
@TableField(exist = false)
private Integer isLeader;
+ @ApiModelProperty(value = "鏄惁鍖呭惈瀛愯彍鍗�")
+ @TableField(exist = false)
+ private Boolean hasChildren;
+ @ApiModelProperty(value = "瀵硅薄绫诲瀷 0閮ㄩ棬 1鍛樺伐")
+ @TableField(exist = false)
+ private int objType;
+ @ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎ember", example = "1")
+ @TableField(exist = false)
+ private Integer memberId;
+ @ApiModelProperty(value = "涓嬬骇閮ㄩ棬鏁伴噺", example = "1")
+ @TableField(exist = false)
+ private Integer childNum;
}
--
Gitblit v1.9.3