From fc543916cfac06f0cf16d018b9751417e3a119f7 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 26 五月 2025 10:02:02 +0800
Subject: [PATCH] 人员培训讲师生成签名
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java | 4 ++++
cnas-personnel/src/main/java/com/ruoyi/personnel/dto/PersonTrainingDetailedDto.java | 7 +++++++
cnas-personnel/src/main/resources/static/person-training-record.docx | 0
cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml | 3 ++-
4 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/dto/PersonTrainingDetailedDto.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/dto/PersonTrainingDetailedDto.java
index 2c6f9aa..c5d3b11 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/dto/PersonTrainingDetailedDto.java
+++ b/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;
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
index 6d32a41..6a4bb62 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
+++ b/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);
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
index 97653c7..e0013ed 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
+++ b/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}
diff --git a/cnas-personnel/src/main/resources/static/person-training-record.docx b/cnas-personnel/src/main/resources/static/person-training-record.docx
index af56928..360dbcb 100644
--- a/cnas-personnel/src/main/resources/static/person-training-record.docx
+++ b/cnas-personnel/src/main/resources/static/person-training-record.docx
Binary files differ
--
Gitblit v1.9.3