Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/common/model/pojo/mst/StaffPurview.java

@@ -0,0 +1,159 @@
+package com.dk.common.model.pojo.mst;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.*;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+import java.time.LocalDateTime;
+
+/**
+ *  员工数据范围
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("员工数据范围")
+@TableName(value = "t_mst_staff_purview", schema =  "dkic_b",autoResultMap = true)
+@ApiModel(value="实体类：员工数据范围", description="表名：t_mst_staff_purview")
+public class StaffPurview extends PageInfo<StaffPurview> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 员工ID
+     */
+    @TableId(value = "staff_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "员工ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 范围权限编码
+     */
+    @Excel(name = "范围权限编码")
+    @ApiModelProperty(value = "范围权限编码")
+    private String purviewCode;
+
+
+    /**
+     * 范围权限标识 (true：不限制)
+     */
+    @Excel(name = "范围权限标识 (true：不限制)")
+    @ApiModelProperty(value = "范围权限标识 (true：不限制)")
+    private Boolean flgNolimit;
+
+
+    /**
+     * 数据ID
+     */
+    @Excel(name = "数据ID")
+    @ApiModelProperty(value = "数据ID")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> dataIds;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer cpId;
+
+
+    /**
+     * 创建时间 (触发器自动处理)
+     */
+    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opCreateTime;
+
+
+    /**
+     * 创建用户 (触发器自动处理)
+     */
+    @Excel(name = "创建用户 (触发器自动处理)")
+    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opUpdateTime;
+
+
+    /**
+     * 修改用户 (触发器自动处理)
+     */
+    @Excel(name = "修改用户 (触发器自动处理)")
+    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
+
+
+    /**
+     * 数据操作应用 (触发器自动处理)
+     */
+    @Excel(name = "数据操作应用 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
+    private String opAppCode;
+
+
+    /**
+     * 数据时间戳 (触发器自动处理)
+     */
+    @Excel(name = "数据时间戳 (触发器自动处理)")
+    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opTimestamp;
+
+
+    /**
+     * 数据操作数据库用户 (触发器自动处理)
+     */
+    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
+    private String opDbUser;
+
+
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    /*
+     * 关联属性 + 查询条件
+     * @TableField(exist = false)
+     */
+
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/dk/common/model/pojo/mst/StaffRight.java

@@ -0,0 +1,150 @@
+package com.dk.common.model.pojo.mst;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.*;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.time.LocalDateTime;
+
+/**
+ *  员工权限
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("员工权限")
+@TableName(value = "t_mst_staff_right", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：员工权限", description="表名：t_mst_staff_right")
+public class StaffRight extends PageInfo<StaffRight> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 员工ID
+     */
+    @TableId(value = "staff_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "员工ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 功能权限
+     */
+    @Excel(name = "功能权限")
+    @ApiModelProperty(value = "功能权限")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String funUuid;
+
+
+    /**
+     * 权限类型 (1：授予 -1：拒绝)
+     */
+    @Excel(name = "权限类型 (1：授予 -1：拒绝)")
+    @ApiModelProperty(value = "权限类型 (1：授予 -1：拒绝)")
+    private Integer rightType;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer cpId;
+
+
+    /**
+     * 创建时间 (触发器自动处理)
+     */
+    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opCreateTime;
+
+
+    /**
+     * 创建用户 (触发器自动处理)
+     */
+    @Excel(name = "创建用户 (触发器自动处理)")
+    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opUpdateTime;
+
+
+    /**
+     * 修改用户 (触发器自动处理)
+     */
+    @Excel(name = "修改用户 (触发器自动处理)")
+    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
+
+
+    /**
+     * 数据操作应用 (触发器自动处理)
+     */
+    @Excel(name = "数据操作应用 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
+    private String opAppCode;
+
+
+    /**
+     * 数据时间戳 (触发器自动处理)
+     */
+    @Excel(name = "数据时间戳 (触发器自动处理)")
+    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opTimestamp;
+
+
+    /**
+     * 数据操作数据库用户 (触发器自动处理)
+     */
+    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
+    private String opDbUser;
+
+
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    /*
+     * 关联属性 + 查询条件
+     * @TableField(exist = false)
+     */
+
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/dk/common/model/vo/mst/StaffVO.java

@@ -0,0 +1,143 @@
+package com.dk.common.model.vo.mst;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.UuidListTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.model.pojo.PageInfo;
+import com.dk.common.model.pojo.mst.StaffPurview;
+import com.dk.common.model.pojo.mst.StaffRight;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  员工
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("员工")
+@TableName(value = "t_mst_staff", autoResultMap = true)
+@ApiModel(value="实体类：员工", description="表名：t_mst_staff")
+public class StaffVO extends PageInfo<StaffVO> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+    /**
+     * 员工ID
+     */
+    @TableId(value = "staff_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "员工ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 员工编码
+     */
+    @Excel(name = "员工编码", width = 20, type = 10)
+    @ApiModelProperty(value = "员工编码")
+    private String staffCode;
+
+
+    /**
+     * 员工名称
+     */
+    @Excel(name = "员工名称", width = 20, type = 10)
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+
+    /**
+     * 员工电话
+     */
+    @Excel(name = "员工电话")
+    @ApiModelProperty(value = "员工电话")
+    private String staffPhone;
+
+    /**
+     * 微信用户
+     */
+    @Excel(name = "微信用户")
+    @ApiModelProperty(value = "微信用户")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String wxUserId;
+
+    /**
+     * 组织部门
+     */
+    @ApiModelProperty(value = "组织部门")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 30, orderNum = "99")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+    /**
+     * 登录标识
+     */
+    @ApiModelProperty(value = "登录标识")
+    private Boolean flgCanLogin;
+    /**
+     * @desc   : 角色list
+     */
+    @ApiModelProperty(value = "员工状态list")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String>  roleIds;
+
+    /**
+     * 工厂ID
+     */
+    @ApiModelProperty(value = "工厂ID")
+    private Integer cpId;
+    /**
+     * 登录标识1能登录 0不能登录
+     */
+    @Excel(name = "登录标识")
+    @ApiModelProperty(value = "登录标识")
+    private Integer hrStatus;
+
+
+    /**
+     * 部门
+     */
+    @Excel(name = "部门", width = 20)
+    @ApiModelProperty(value = "部门")
+    private String orgName;
+
+    private List<StaffRight> staffRightList;
+
+    private List<StaffPurview> staffPurviewList;
+
+
+
+    private static final long serialVersionUID = 1L;
+
+}