From 0a95c15ff07dcc8980c3e5acfb37d32a9e32f518 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 27 Feb 2023 09:59:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8=E6=89=AB?= =?UTF-8?q?=E6=8F=8F@Table=E7=9A=84=E5=88=97=E6=B3=A8=E9=87=8A=E5=88=B0Swa?= =?UTF-8?q?gger=E5=9C=A8=E7=BA=BF=E6=96=87=E6=A1=A3=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5=E8=AF=B4=E6=98=8E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/sys/entity/EmpUser.java | 8 +++++--- .../com/jeesite/modules/sys/entity/Employee.java | 13 +++++++------ .../java/com/jeesite/modules/sys/entity/Log.java | 4 +++- .../com/jeesite/modules/sys/entity/Office.java | 15 +++++++++------ .../java/com/jeesite/modules/sys/entity/Post.java | 13 ++++++++----- 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java index 5f7749d3..9330b2ea 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java @@ -4,8 +4,6 @@ */ package com.jeesite.modules.sys.entity; -import javax.validation.Valid; - import com.jeesite.common.entity.BaseEntity; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.entity.TreeEntity; @@ -19,6 +17,9 @@ import com.jeesite.common.utils.excel.annotation.ExcelField.Align; import com.jeesite.common.utils.excel.annotation.ExcelFields; import com.jeesite.common.utils.excel.fieldtype.CompanyType; import com.jeesite.common.utils.excel.fieldtype.OfficeType; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.Valid; /** * 员工用户管理Entity @@ -123,7 +124,8 @@ public class EmpUser extends User { public void setEmployee(Employee employee){ super.setRefObj(employee); } - + + @ApiModelProperty("根据各种编码查询") public String[] getCodes() { return codes; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java index 261578d8..9f77f782 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java @@ -4,12 +4,6 @@ */ package com.jeesite.modules.sys.entity; -import java.util.List; - -import javax.validation.constraints.NotNull; - -import javax.validation.constraints.Size; - import com.jeesite.common.collect.ListUtils; import com.jeesite.common.entity.BaseEntity; import com.jeesite.common.entity.DataEntity; @@ -19,6 +13,11 @@ import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.List; /** * 员工管理Entity @@ -130,6 +129,7 @@ public class Employee extends DataEntity { this.company = company; } + @ApiModelProperty("根据岗位编码查询") public String getPostCode() { return postCode; } @@ -146,6 +146,7 @@ public class Employee extends DataEntity { this.employeePostList = employeePostList; } + @ApiModelProperty("员工岗位关系") public String getEmployeePosts() { List list = ListUtils.extractToList(employeePostList, "postCode"); return StringUtils.join(list, ","); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java index 8a4c8785..039e6bde 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java @@ -14,6 +14,7 @@ import com.jeesite.common.lang.TimeUtils; import com.jeesite.common.mybatis.annotation.Column; import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; +import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @@ -228,7 +229,8 @@ public class Log extends DataEntity { public void setExecuteTime(Long executeTime) { this.executeTime = executeTime; } - + + @ApiModelProperty("格式化后的执行时间") public String getExecuteTimeFormat(){ if (executeTime == null) { executeTime = 0L; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java index 8b4d6897..94bc83c5 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java @@ -4,10 +4,6 @@ */ package com.jeesite.modules.sys.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.jeesite.common.entity.BaseEntity; import com.jeesite.common.entity.DataEntity; @@ -20,6 +16,11 @@ import com.jeesite.common.utils.excel.annotation.ExcelField; import com.jeesite.common.utils.excel.annotation.ExcelField.Align; import com.jeesite.common.utils.excel.annotation.ExcelFields; import com.jeesite.modules.sys.utils.EmpUtils; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; /** * 组织机构Entity @@ -137,7 +138,8 @@ public class Office extends TreeEntity { public void setOfficeType(String officeType) { this.officeType = officeType; } - + + @ApiModelProperty("包含某机构类型") public String[] getOfficeType_in(){ return sqlMap.getWhere().getValue("office_type", QueryType.IN); } @@ -198,7 +200,8 @@ public class Office extends TreeEntity { public void setExtend(Extend extend) { this.extend = extend; } - + + @ApiModelProperty("公司编码") public String getCompanyCode() { return companyCode; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java index aca087e6..e2fc9e9d 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java @@ -4,15 +4,16 @@ */ package com.jeesite.modules.sys.entity; -import javax.validation.constraints.Size; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; - import com.jeesite.common.entity.BaseEntity; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.mybatis.annotation.Column; import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; @Table(name="${_prefix}sys_post", alias="a", label="岗位信息", columns={ @Column(includeEntity=BaseEntity.class), @@ -70,7 +71,8 @@ public class Post extends DataEntity { public void setPostName(String postName) { this.postName = postName; } - + + @ApiModelProperty("模糊查询岗位名称") public String getPostName_like() { return sqlMap().getWhere().getValue("post_name", QueryType.LIKE); } @@ -96,6 +98,7 @@ public class Post extends DataEntity { this.postSort = postSort; } + @ApiModelProperty("根据员工编码查询") public String getEmpCode() { return empCode; }