From 18188a3d279d90884d6ec32973b61945c46814eb Mon Sep 17 00:00:00 2001
From: hyunho <hyunho  @example.com>
Date: Thu, 3 Dec 2020 06:33:30 +0000
Subject: [PATCH]

---
 BO/Controllers/croomController.cs |  7 ++++---
 Dao/MyBatis/Maps/CM.xml           |  2 +-
 Dao/MyBatis/Maps/Lect.xml         |  9 ++++++++-
 Model/CM.cs                       | 21 +++++++++++++++++++++
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 7e839cf..70ea2a7 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -163,10 +163,11 @@ namespace NP.BO.Controllers
             {
                 vm.Lects = Dao.Get<Lect>("lect.lects.att",ht);
                 return ExportExcel(
-                        new String[] { "분류", "고객사", "신청자이름", "신청자ID", "교육생이름", "교육생ID", "교육생이메일", "전화번호", "휴대폰번호", "신청일", "수강상태", "결제상태", "사업장과의관계", "직위", "부서", "공정거래업무경력", "연합회교육이력" },
-                        new String[] { "isjoinname", "asname", "cnoname", "cnoid", "username", "userid", "email", "telno", "mobile", "cdtymd", "statusname", "pstatusname", "assignuser", "ccpositionname", "depart", "ckfcfyear", "edu" },
+                        new String[] { "고객사", "이름","직위", "교육생ID", "이메일", "전화번호", "휴대폰번호", "신청일", "수강상태", "결제상태" , "교육일", "기술인구분","직무분야","교육목적","등급"},
+                        new String[] { "asname", "username", "uduty", "userid", "email", "telno", "mobile", "cdtymd", "statusname", "pstatusname", "estartstring", "typemanname", "typejobname", "typeeduname", "typegradename" },
                         vm.Lects,
-                        "출석부");
+                        "신청자명단");
+
             }
             else
             {
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 6ed86c3..043565e 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -1903,7 +1903,7 @@
         from users a
         left outer join lect b on a.userno = b.userno
         where a.userno = #userno#
-        and b.cmno = #cmno# and b.iscomplete = 1
+        and b.cmno = #cmno# and (b.iscomplete = 1 or b.iscomplete is null)
       </select>
       <select id="cm.cminningscdcheck" parameterClass="hashtable" resultClass="int">
         select
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 256aac6..486b322 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -183,11 +183,16 @@
             select a.lectno,a.cdt,a.status
             ,p.pstatus,p.rstatus
             ,pu.username cnoname,pu.userid cnoid
-            ,b.username,b.userid
+            ,b.username,b.userid,b.uduty
             ,CAST(AES_DECRYPT(UNHEX(b.email), <include refid="sql.digest"></include>) AS char) email
             ,CAST(AES_DECRYPT(UNHEX(b.mobile), <include refid="sql.digest"></include>) AS char) mobile
             ,CAST(AES_DECRYPT(UNHEX(b.telno), <include refid="sql.digest"></include>) AS char) telno
             ,b.depart,b.kfcfyear,b.isassignuser,b.edus
+            ,(select cname from comcode com where com.ccode = pp.typeman) as typemanname
+            ,(select cname from comcode com where com.ccode = pp.typeedu) as typeeduname
+            ,(select cname from comcode com where com.ccode = pp.typegrade) as typegradename
+            ,(select cname from comcode com where com.ccode = pp.typejob) as typejobname
+            ,scd.estart,scd.eend
             ,cc.cname ccpositionname
             ,c.isjoin,c.asname
             ,row_number() over(order by b.username) rno
@@ -198,6 +203,8 @@
             inner join users b on b.userno=a.userno <isNotNull property="status"> and b.status=#status#</isNotNull>
             left outer join comcode cc on cc.ccode=b.ccposition
             left outer join assign c on c.asno=b.asno
+            left outer join pplog pp on p.pplno = pp.pplno
+            left outer join cminningscd scd on a.cmisno = scd.cmisno
             where a.cmno=#cmno# 
             <isNotNull property="isready"> and ifnull(a.isready,0)  = #isready# </isNotNull>
             <isNotNull property="status"> and a.status &lt; 5 and p.pstatus in (1,22 )  </isNotNull>
diff --git a/Model/CM.cs b/Model/CM.cs
index f5de40a..930cdb1 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -1081,6 +1081,27 @@ namespace NP.Model
         public int taxno { get; set; }
         public DateTime taxdate { get; set; }
         public Int64 cmisno { get; set; }
+        /// <summary>
+        /// 기술인분류
+        /// </summary>
+        public String typemanname { get; set; }
+        /// <summary>
+        /// 교육목적
+        /// </summary>
+        public String typeeduname { get; set; }
+        /// <summary>
+        /// 직무분야
+        /// </summary>
+        public String typejobname { get; set; }
+        /// <summary>
+        /// 등급
+        /// </summary>
+        public String typegradename { get; set; }
+        public String estartstring {
+            get {
+                return (estart != null && estart > Convert.ToDateTime("1900-01-01")) ? estart.ToShortDateString() : "";
+            }
+        }
     }
     /// <summary>
     /// 자격검정시험