gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.6.0】【hr】调整实体属性

pull/55/head
fengshuonan 2023-05-11 21:47:19 +08:00
parent 4c2db63346
commit 568c1620d2
3 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java
View File

@ -54,6 +54,10 @@ public class HrOrgApprover extends BaseEntity {
@ChineseDescription("用户id") @ChineseDescription("用户id")
private Long userId; private Long userId;
//-------------------------------非实体字段-------------------------------
//-------------------------------非实体字段-------------------------------
//-------------------------------非实体字段-------------------------------
/** /**
* 绑定人员信息 * 绑定人员信息
*/ */

1
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
View File

@ -126,5 +126,4 @@ public class HrOrganization extends BaseBusinessEntity {
@ChineseDescription("拓展字段") @ChineseDescription("拓展字段")
private Map<String, Object> expandField; private Map<String, Object> expandField;
} }

41
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java
View File

@ -24,18 +24,17 @@
*/ */
package cn.stylefeng.roses.kernel.system.modular.organization.entity; package cn.stylefeng.roses.kernel.system.modular.organization.entity;
import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity;
import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
import cn.stylefeng.roses.kernel.rule.tree.xmtree.base.AbstractXmSelectNode;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.Map;
/** /**
* 系统职位表 * 系统职位表
@ -46,7 +45,7 @@ import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("hr_position") @TableName("hr_position")
public class HrPosition extends BaseEntity implements AbstractXmSelectNode { public class HrPosition extends BaseBusinessEntity {
/** /**
* 主键 * 主键
@ -91,34 +90,10 @@ public class HrPosition extends BaseEntity implements AbstractXmSelectNode {
private String positionRemark; private String positionRemark;
/** /**
* 删除标记：Y-已删除，N-未删除 * 拓展字段
*/ */
@TableField(value = "del_flag", fill = FieldFill.INSERT) @TableField(value = "expand_field", typeHandler = JacksonTypeHandler.class)
@ChineseDescription("删除标记：Y-已删除，N-未删除") @ChineseDescription("拓展字段")
private String delFlag; private Map<String, Object> expandField;
@Override
public String getName() {
return this.positionName;
}
@Override
public String getValue() {
return String.valueOf(positionId);
}
@Override
public Boolean getSelected() {
return false;
}
@Override
public Boolean getDisabled() {
return false;
}
@Override
public List<?> getChildren() {
return null;
}
} }