zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:人员人脸审批

Browse Source
This commit is contained in:
dzc committed 2025-03-13 18:12:27 +08:00
1 parent 4c8c94a804
commit 4c4c7e9081
23 files changed
+787 -144
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java
+10 -1
View File
@@ -1,12 +1,15 @@
package com.bsd.pjcloud.admin.api.dto;
import com.bsd.pjcloud.admin.api.entity.SysUserFaceEntity;
import com.bsd.pjcloud.admin.api.vo.base.BaseIsDeepDeptTreeInterface;
import com.bsd.pjcloud.admin.api.vo.base.BaseIsIncludeTreeInterface;
import lombok.Data;
import java.util.List;
@Data
public class SysUserFaceDto extends SysUserFaceEntity {
public class SysUserFaceDto extends SysUserFaceEntity implements BaseIsIncludeTreeInterface {
private Long merchantDeptId;
@@ -18,4 +21,10 @@ public class SysUserFaceDto extends SysUserFaceEntity {
private Long merchantDeptIdOrGlobal;
private Boolean isProcessIdNotNull = false;
/**
* 是否包含部门ids
*/
private Boolean isInclude;
}
pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUser.java
+20 -4
View File
@@ -23,8 +23,10 @@ import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.bsd.pjcloud.common.core.util.TenantTable;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.javers.core.metamodel.annotation.DiffInclude;
import org.javers.core.metamodel.annotation.PropertyName;
@@ -53,6 +55,24 @@ public class SysUser extends Model<SysUser> implements Serializable {
@Schema(description = "主键id")
private Long userId;
/**
* 流程id
*/
@Schema(description = "流程id")
private String processId;
/**
* 流程状态
*/
@Schema(description = "流程状态")
private String processStatus;
/**
* 审核时间
*/
@Schema(description = "审核时间")
private LocalDateTime processTime;
/**
* 用户名
*/
@@ -120,14 +140,12 @@ public class SysUser extends Model<SysUser> implements Serializable {
@Schema(description = "密码过期标记")
private String passwordExpireFlag;
/**
* 密码修改时间
*/
@Schema(description = "密码修改时间")
private LocalDateTime passwordModifyTime;
/**
* 手机号
*/
@@ -216,14 +234,12 @@ public class SysUser extends Model<SysUser> implements Serializable {
@Schema(description = "邮箱")
private String email;
/**
* 员工浙政钉编码
*/
@Schema(description = "员工浙政钉编码")
private String dingtalkEmployeeCode;
@Schema(description = "员工所属系统类型")
private String systemType;
pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUserFaceEntity.java
+69 -43
View File
@@ -2,10 +2,16 @@ package com.bsd.pjcloud.admin.api.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import com.bsd.pjcloud.common.core.util.TenantTable;
import java.time.LocalDateTime;
/**
@@ -14,6 +20,9 @@ import java.time.LocalDateTime;
* @author pjcloud
* @date 2024-12-31 11:20:04
*/
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Data
@TenantTable
@TableName("sys_user_face")
@@ -21,71 +30,88 @@ import java.time.LocalDateTime;
@Schema(description = "人脸样本表")
public class SysUserFaceEntity extends Model<SysUserFaceEntity> {
/**
* 编号
*/
/**
* 编号
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description="编号")
@Schema(description = "编号")
private Long id;
/**
* 自增code
*/
@Schema(description="自增code")
@Schema(description = "自增code")
private String autoCode;
/**
* 用户ID
*/
@Schema(description="用户ID")
/**
* 用户ID
*/
@Schema(description = "用户ID")
private Long userId;
/**
* 人脸图片
*/
@Schema(description="人脸图片")
/**
* 流程id
*/
@Schema(description = "流程id")
private String processId;
/**
* 流程状态
*/
@Schema(description = "流程状态")
private String processStatus;
/**
* 审核时间
*/
@Schema(description = "审核时间")
private LocalDateTime processTime;
/**
* 人脸图片
*/
@Schema(description = "人脸图片")
private String faceImg;
/**
* 创建人
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建人")
/**
* 创建人
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description = "创建人")
private String createBy;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建时间")
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description = "创建时间")
private LocalDateTime createTime;
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description="修改人")
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description = "修改人")
private String updateBy;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description="修改时间")
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description = "修改时间")
private LocalDateTime updateTime;
/**
* 删除标记
*/
/**
* 删除标记
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@Schema(description="删除标记")
@TableField(fill = FieldFill.INSERT)
@Schema(description = "删除标记")
private String delFlag;
/**
* 租户ID
*/
@Schema(description="租户ID")
/**
* 租户ID
*/
@Schema(description = "租户ID")
private Long tenantId;
}
pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java
+19 -1
View File
@@ -25,6 +25,7 @@ import com.bsd.pjcloud.admin.api.entity.SysPost;
import com.bsd.pjcloud.admin.api.entity.SysRole;
import com.bsd.pjcloud.common.sensitive.annotation.Sensitive;
import com.bsd.pjcloud.common.sensitive.core.SensitiveTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -48,6 +49,24 @@ public class UserVO implements BaseFacesInterface, Serializable {
@Schema(description = "主键")
private Long userId;
/**
* 流程id
*/
@Schema(description = "流程id")
private String processId;
/**
* 流程状态
*/
@Schema(description = "流程状态")
private String processStatus;
/**
* 审核时间
*/
@Schema(description = "审核时间")
private LocalDateTime processTime;
/**
* 用户名
*/
@@ -198,7 +217,6 @@ public class UserVO implements BaseFacesInterface, Serializable {
@Schema(description = "邮箱")
private String email;
@Schema(description = "员工浙政钉编码")
private String dingtalkEmployeeCode;