diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java index b320474..ea0bc66 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java @@ -117,5 +117,9 @@ public class TrainingApplyRecordCO extends ClientObject { @ApiModelProperty(value = "是否审批") private Boolean isApproval = true; + private String postName; + + private String userIdCard; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java index 3db6160..283521a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java @@ -79,7 +79,9 @@ public class TrainingApplyRecordDO extends BaseDO { @TableField(exist = false) private String entrustProcessId; + private String postName; + private String userIdCard; diff --git a/web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml index 4727d44..4dd77a3 100644 --- a/web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml @@ -51,13 +51,19 @@ r.version, u.name AS apply_user_name, 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 training_apply_record r LEFT JOIN user u ON u.id = r.apply_user_id AND u.delete_enum = 'false' + left join post p on p.id = u.post_id LEFT JOIN corp_info ci ON ci.id = r.apply_corpinfo_id AND ci.delete_enum = 'false'