Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

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>