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 ea0bc66..cbd504c 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,9 +117,6 @@ public class TrainingApplyRecordCO extends ClientObject { @ApiModelProperty(value = "是否审批") private Boolean isApproval = true; - private String postName; - - private String userIdCard; } diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyUserCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyUserCO.java index e7e3f96..d607616 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyUserCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyUserCO.java @@ -84,6 +84,9 @@ public class TrainingApplyUserCO extends ClientObject { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime approvalTime; + + private String postName; + //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version; diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/CurriculumAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/CurriculumAddCmd.java index c456630..c7ceac0 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/CurriculumAddCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/CurriculumAddCmd.java @@ -34,7 +34,6 @@ public class CurriculumAddCmd { private String curriculumIntroduce; @ApiModelProperty(value = "封面路径url", name = "coverPath", required = true) - @NotEmpty(message = "封面路径url不能为空") private String coverPath; 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 283521a..d3fcadd 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,11 +79,6 @@ public class TrainingApplyRecordDO extends BaseDO { @TableField(exist = false) private String entrustProcessId; - private String postName; - - private String userIdCard; - - diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyUserDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyUserDO.java index 3502094..4db1032 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyUserDO.java @@ -84,6 +84,9 @@ public class TrainingApplyUserDO extends BaseDO { @TableField(exist = false) private LocalDateTime approvalTime; + @TableField(exist = false) + private String postName; + public TrainingApplyUserDO(String trainingApplyUserId) { this.trainingApplyUserId = trainingApplyUserId; } diff --git a/web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml index 4dd77a3..51398a4 100644 --- a/web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml @@ -51,19 +51,14 @@ 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, - 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 + tap.training_apply_process_id entrust_process_id + 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' diff --git a/web-infrastructure/src/main/resources/mapper/TrainingApplyUserMapper.xml b/web-infrastructure/src/main/resources/mapper/TrainingApplyUserMapper.xml index 60dc8ff..b58d254 100644 --- a/web-infrastructure/src/main/resources/mapper/TrainingApplyUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/TrainingApplyUserMapper.xml @@ -15,12 +15,20 @@ tau.apply_status as applyStatus, tau.remarks, u.name as userName, - tau.id_card as idCard + tau.id_card as idCard, + CASE + WHEN ci.type IN (3,4, 5) THEN u.post_name + ELSE p.post_name + END AS postName FROM training_apply_user tau LEFT JOIN user u ON tau.user_id = u.id AND u.delete_enum = 'false' + left join post p on p.id = u.post_id + LEFT JOIN corp_info ci + ON ci.id = u.corpinfo_id + AND ci.delete_enum = 'false' WHERE tau.training_apply_record_id = #{trainingApplyRecordId} AND tau.delete_enum = 'false' diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml index 1b83739..b2201e1 100644 --- a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml @@ -428,7 +428,10 @@ GROUP_CONCAT(DISTINCT p.project_id SEPARATOR ', ') AS project_id, GROUP_CONCAT(DISTINCT p.project_name SEPARATOR ', ') AS project_name, u.name, - po.post_name, + CASE + WHEN c.type IN (3,4, 5) THEN u.post_name + ELSE po.post_name + END AS post_name, d.name dept_name, u.phone, u.user_id_card,