diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index a8e0f13..0d3ffb7 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -522,8 +522,8 @@ namespace NP.BO.Controllers // "attscds_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day); return ExportExcel( - new String[] { "No", "아이디", "교육생이름", "교육생 전화번호", "이메일", "과정명", "기술인분류", "교육목적", "등급", "교육시작일", "교육종료일", "출석일", "집합교육출석여부", "수료여부" }, - new String[] { "rnorvt", "userid", "username", "mobile", "email", "cname", "zstring0", "zstring1", "zstring2", "sdatestr", "edatestr", "zstring3", "istatusname", "iscompletename" }, + new String[] { "No", "교육장","아이디", "교육생이름", "교육생 전화번호", "이메일", "과정명", "기술인분류", "교육목적", "등급", "직무분야", "전문분야", "교육시작일", "교육종료일", "출석일", "집합교육출석여부", "수료여부" }, + new String[] { "rnorvt", "studyplacename", "userid", "username", "mobile", "email", "cname", "zstring0", "zstring1", "zstring2", "zstring4", "zstring5", "sdatestr", "edatestr", "zstring3", "istatusname", "iscompletename" }, vm.Lects, "attscds_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day); } diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 7fec7d3..8f34e88 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -874,6 +874,8 @@ ,cc.cname zstring0 ,cc2.cname zstring1 ,cc3.cname zstring2 + ,(case when cc4.cname is null then '-' else cc4.cname end) zstring4 + ,(case when cc5.cname is null then '-' else cc5.cname end) zstring5 ,row_number() over(order by a.cdt desc,e.username) rno ,count(a.cdt) over() pagetotalcount from lect a @@ -882,6 +884,8 @@ INNER JOIN comcode cc ON pp.typeman = cc.ccode INNER JOIN comcode cc2 ON pp.typeedu = cc2.ccode INNER JOIN comcode cc3 ON pp.typegrade = cc3.ccode + LEFT OUTER JOIN comcode cc4 ON pp.typejob = cc4.ccode + LEFT OUTER JOIN comcode cc5 ON pp.typejobitem = cc5.ccode inner join ( select c.cmno, c.cshape, c.cname, ci.cmino,d.cmisno,d.sseq,d.estart,d.eend,d.studyplace from cm c