From 680879499d64c0872e6e2d2db27ce48c21c23abf Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 22 Apr 2024 20:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=89=A9=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/mapper/xml/ProjectExtendMapper.xml   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectExtendMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectExtendMapper.xml
index 355073d80..74f06eb30 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectExtendMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectExtendMapper.xml
@@ -3,12 +3,11 @@
 <mapper namespace="com.zhgd.xmgl.modules.project.mapper.ProjectExtendMapper">
 
     <select id="getProjectExtendInfo" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
-        select *,
+        select p.*,
                (CASE WHEN engineering_end_time is not null and engineering_end_time!=''
                    and date_format(engineering_end_time,'%Y-%m-%d')>=date_format(now(),'%Y-%m-%d') THEN DATEDIFF(date_format(engineering_end_time,'%Y-%m-%d'),date_format(now(),'%Y-%m-%d'))
-                   else 0 END) end_day_num
-        from project_extend
-        where project_sn=#{projectSn}
-
+                   else 0 END) end_day_num, e.edu_course_name
+        from project_extend p left join worker_safe_education e on p.education_id = e.id
+        where p.project_sn=#{projectSn}
     </select>
 </mapper>
\ No newline at end of file