From 4c7e25e4c5acd983f7eb7f5f75a38f663d6bd0ed Mon Sep 17 00:00:00 2001
From: zdrcft <zdrcft  @example.com>
Date: Thu, 26 Jan 2023 08:50:32 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?=
 =?UTF-8?q?MS=20NO=20:=20{7344}=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20-{=EC=A7=91=ED=95=A9=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=20=EC=B6=9C=EC=84=9D=EB=A9=94=EB=89=B4=EC=9D=98=20?=
 =?UTF-8?q?=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?=
 =?UTF-8?q?=EC=8B=9C=20=ED=91=9C=EA=B8=B0=EB=90=A0=20=ED=95=AD=EB=AA=A9=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Controllers/croomController.cs | 4 ++--
 Dao/MyBatis/Maps/Lect.xml         | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

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