feat(training): 添加培训申请记录中的岗位名称和身份证字段
parent
efbef9fe41
commit
bfa06453c5
|
|
@ -117,5 +117,9 @@ public class TrainingApplyRecordCO extends ClientObject {
|
||||||
@ApiModelProperty(value = "是否审批")
|
@ApiModelProperty(value = "是否审批")
|
||||||
private Boolean isApproval = true;
|
private Boolean isApproval = true;
|
||||||
|
|
||||||
|
private String postName;
|
||||||
|
|
||||||
|
private String userIdCard;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,9 @@ public class TrainingApplyRecordDO extends BaseDO {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String entrustProcessId;
|
private String entrustProcessId;
|
||||||
|
|
||||||
|
private String postName;
|
||||||
|
|
||||||
|
private String userIdCard;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,13 +51,19 @@
|
||||||
r.version,
|
r.version,
|
||||||
u.name AS apply_user_name,
|
u.name AS apply_user_name,
|
||||||
COALESCE(tau_cnt.apply_user_count, 0) AS apply_user_count,
|
COALESCE(tau_cnt.apply_user_count, 0) AS apply_user_count,
|
||||||
tap.training_apply_process_id entrust_process_id
|
tap.training_apply_process_id entrust_process_id,
|
||||||
|
CASE
|
||||||
|
WHEN ci.type IN (3,4, 5) THEN u.post_name
|
||||||
|
ELSE p.post_name
|
||||||
|
END AS post_name as postName,
|
||||||
|
u.user_id_card as userIdCard
|
||||||
FROM
|
FROM
|
||||||
training_apply_record r
|
training_apply_record r
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
user u
|
user u
|
||||||
ON u.id = r.apply_user_id
|
ON u.id = r.apply_user_id
|
||||||
AND u.delete_enum = 'false'
|
AND u.delete_enum = 'false'
|
||||||
|
left join post p on p.id = u.post_id
|
||||||
LEFT JOIN corp_info ci
|
LEFT JOIN corp_info ci
|
||||||
ON ci.id = r.apply_corpinfo_id
|
ON ci.id = r.apply_corpinfo_id
|
||||||
AND ci.delete_enum = 'false'
|
AND ci.delete_enum = 'false'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue