admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

安全教育bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-07-01 09:07:44 +08:00
parent a37f302fd1
commit e099a6d971
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationWorkerMapper.xml
View File

@ -102,16 +102,11 @@
<select id="selectEdusByWorkerId" resultType="com.alibaba.fastjson.JSONObject"> <select id="selectEdusByWorkerId" resultType="com.alibaba.fastjson.JSONObject">
SELECT w.*, SELECT w.*,
a.worker_name, a.worker_name,
a.sex, e.edu_course_name
a.field_acquisition_url,
a.id_card idcardnumber,
(case
when a.birthday != '' then year(from_days(datediff(NOW(), a.birthday)))
else '-' end) age
FROM worker_safe_education_worker w FROM worker_safe_education_worker w
inner join worker_safe_education wse on w.edu_id = wse.id
LEFT JOIN worker_info a ON w.worker_id = a.id LEFT JOIN worker_info a ON w.worker_id = a.id
WHERE w.id = #{workerId} LEFT JOIN worker_safe_education e on e.id=w.edu_id
WHERE w.worker_id = #{workerId}
and w.project_sn = #{projectSn} and w.project_sn = #{projectSn}
</select> </select>
</mapper> </mapper>

1
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationServiceImpl.java
View File

@ -132,6 +132,7 @@ public class WorkerSafeEducationServiceImpl extends ServiceImpl<WorkerSafeEducat
workerSafeEducationWorkerMapper.delete(queryWrapper); workerSafeEducationWorkerMapper.delete(queryWrapper);
if (workerSafeEducation.getList() != null && workerSafeEducation.getList().size() > 0) { if (workerSafeEducation.getList() != null && workerSafeEducation.getList().size() > 0) {
for (WorkerSafeEducationWorker worker : workerSafeEducation.getList()) { for (WorkerSafeEducationWorker worker : workerSafeEducation.getList()) {
worker.setId(null);
worker.setEduId(workerSafeEducation.getId()); worker.setEduId(workerSafeEducation.getId());
worker.setStudyTime(workerSafeEducation.getEduTime()); worker.setStudyTime(workerSafeEducation.getEduTime());
worker.setProjectSn(workerSafeEducation.getProjectSn()); worker.setProjectSn(workerSafeEducation.getProjectSn());