1、增加人员证照类型名称
parent
0f8427ba41
commit
84e57c4eb2
|
|
@ -22,8 +22,10 @@ public class UserCertificateE extends BaseE {
|
||||||
private Long corpinfoId;
|
private Long corpinfoId;
|
||||||
//用户id
|
//用户id
|
||||||
private Long userId;
|
private Long userId;
|
||||||
//1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员
|
//字典码
|
||||||
private String type;
|
private String type;
|
||||||
|
//类型名称
|
||||||
|
private String typeName;
|
||||||
//证书名称
|
//证书名称
|
||||||
private String certificateName;
|
private String certificateName;
|
||||||
//证书编号
|
//证书编号
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ public class UserCertificateDO extends BaseDO {
|
||||||
@ApiModelProperty(value = "用户id")
|
@ApiModelProperty(value = "用户id")
|
||||||
private Long userId;
|
private Long userId;
|
||||||
//1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员
|
//1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员
|
||||||
@ApiModelProperty(value = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员")
|
@ApiModelProperty(value = "字典编码")
|
||||||
private String type;
|
private String type;
|
||||||
@ApiModelProperty(value = "人员类型名称")
|
@ApiModelProperty(value = "人员类型名称")
|
||||||
private String typeName;
|
private String typeName;
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,12 @@
|
||||||
<select id="selectPageWithUser" resultType="com.zcloud.certificate.persistence.dataobject.UserCertificateDO">
|
<select id="selectPageWithUser" resultType="com.zcloud.certificate.persistence.dataobject.UserCertificateDO">
|
||||||
SELECT
|
SELECT
|
||||||
uc.*,
|
uc.*,
|
||||||
u.name AS userName,
|
u.name AS userName,
|
||||||
u.employment_flag AS employmentStatus,
|
u.employment_flag AS employmentStatus,
|
||||||
d.name AS departmentName,
|
d.name AS departmentName,
|
||||||
p.corpinfo_name AS corpinfoName,
|
p.corpinfo_name AS corpinfoName,
|
||||||
uc.post_name AS postName
|
uc.post_name AS postName,
|
||||||
|
uc.type_name AS typeName
|
||||||
FROM
|
FROM
|
||||||
user_certificate uc
|
user_certificate uc
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
|
|
@ -63,7 +64,8 @@
|
||||||
u.employment_flag AS employmentStatus,
|
u.employment_flag AS employmentStatus,
|
||||||
d.name AS departmentName,
|
d.name AS departmentName,
|
||||||
p.corpinfo_name AS corpinfoName,
|
p.corpinfo_name AS corpinfoName,
|
||||||
uc.post_name AS postName
|
uc.post_name AS postName,
|
||||||
|
uc.type_name AS typeName
|
||||||
FROM
|
FROM
|
||||||
user_certificate uc
|
user_certificate uc
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue