From bfa06453c5cbf24810cb51693c90fe02ab52202e Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 8 Jun 2026 14:46:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(training):=20=E6=B7=BB=E5=8A=A0=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E7=94=B3=E8=AF=B7=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=90=8D=E7=A7=B0=E5=92=8C=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/clientobject/training/TrainingApplyRecordCO.java | 4 ++++ .../edu/persistence/dataobject/TrainingApplyRecordDO.java | 2 ++ .../main/resources/mapper/TrainingApplyRecordMapper.xml | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) 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'