From e3026dae68fc425df7ca46c1b416aae32e036098 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 三月 2025 23:50:05 +0800
Subject: [PATCH] 修改cnas部分导出
---
cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
index 93360e5..395dfec 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
@@ -59,10 +59,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 +82,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 +98,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 +111,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