cnas-personnel/src/main/java/com/ruoyi/personnel/dto/PersonTrainingDetailedDto.java
@@ -1,6 +1,7 @@ package com.ruoyi.personnel.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.deepoove.poi.data.PictureRenderData; import com.ruoyi.personnel.pojo.PersonTrainingDetailed; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,6 +15,12 @@ @ApiModelProperty("培训讲师名称") private String trainingLecturerName; @ApiModelProperty("培训老师地址") private String trainingLecturerSignatureUrl; @ApiModelProperty("培训老师地址流") private PictureRenderData trainingLecturerRender; @ApiModelProperty("当前登录人是否认领") private Boolean whetherClaim; cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
@@ -306,6 +306,10 @@ // 查询人员培训明细 PersonTrainingDetailedDto detailedDto = personTrainingDetailedMapper.selectTrainingDetail(id); // 生成培训老师签名 detailedDto.setTrainingLecturerRender(StringUtils.isNotBlank(detailedDto.getTrainingLecturerSignatureUrl()) ? Pictures.ofLocal(imgUrl + "/" + detailedDto.getTrainingLecturerSignatureUrl()).create() : null); // 查询培训的人员 List<PersonTrainingRecordDto> recordDtos = personTrainingRecordMapper.selectListByTrainingDetailedId(id); cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
@@ -38,7 +38,8 @@ <!-- 查询详细 --> <select id="selectTrainingDetail" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto"> SELECT cptd.*, u1.name training_lecturer_name u1.name training_lecturer_name, u1.signature_url training_lecturer_signature_url FROM cnas_person_training_detailed cptd left join user u1 on cptd.training_lecturer_id = u1.id where cptd.id = #{id} cnas-personnel/src/main/resources/static/person-training-record.docxBinary files differ