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/resources/mapper/PersonTrainingRecordMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
index 93360e5..88eabe4 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
@@ -45,7 +45,8 @@
<select id="selectListByTrainingDetailedId" resultType="com.ruoyi.personnel.dto.PersonTrainingRecordDto">
select cptr.*,
u.name userName,
- dl.name department
+ dl.name department,
+ u.signature_url
from cnas_person_training_record cptr
left join user u on u.id = cptr.user_id
left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1
@@ -59,10 +60,9 @@
dl.name depart_lims_name,
cpbi.professional_title,
cpbi.official_academic_redentials,
- cpbi.unit_time,
cpbi.major1,
u.id user_id,
- DATE_FORMAT(cpbi.unit_time, '%Y-%m-%d') AS unitTimeSting
+ DATE_FORMAT(cpbi.group_time, '%Y-%m-%d') AS unitTimeSting
from user u
left join cnas_person_basic_info cpbi on cpbi.user_id = u.id
left join department_lims dl on dl.id = SUBSTRING_INDEX(SUBSTRING_INDEX(u.depart_lims_id, ',', -2), ',', 1)
@@ -83,7 +83,7 @@
and cptr.user_id = #{userId}
<where>
<if test="year!= null and year!= ''">
- and YEAR(cptd.training_date) = ${year}
+ and cptd.training_date like concat('%', #{year}, '%')}
</if>
</where>
</select>
@@ -99,7 +99,7 @@
and cptr.user_id = #{userId}
</if>
<if test="year!= null and year!= ''">
- and YEAR(cptd.training_date) = ${year}
+ and cptd.training_date like concat('%', #{year}, '%')
</if>
</where>
</select>
@@ -112,14 +112,16 @@
cptd.class_hour,
cptr.examination_results,
cptd.remarks,
- DATE_FORMAT(cptd.training_date, '%Y-%m-%d') AS trainingDateString
+ cptd.training_date AS trainingDateString
from cnas_person_training_record cptr
inner join cnas_person_training_detailed cptd on cptd.id = cptr.course_id
and cptr.user_id = #{userId}
<where>
<if test="year!= null and year!= ''">
- and YEAR(cptd.training_date) = ${year}
+ and cptd.training_date like concat('%', #{year}, '%')
</if>
</where>
+ order by STR_TO_DATE(CONCAT(cptd.training_date, '.01'), '%Y.%m.%d')
+
</select>
</mapper>
--
Gitblit v1.9.3