<기능개선>

통합테스트목록 . 623
엑셀다운로드 열추가

BO/Controllers/croomController.cs

@@ -831,8 +831,8 @@ namespace NP.BO.Controllers
                     payItem.cmistudyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.cmistudyplace).FirstOrDefault()?.cname;
                 }
                 return ExportExcel(
-                        new String[] { "결제번호", "신청자이름", "ID", "핸드폰", "회사명", "상품유형", "환급여부", "상품명", "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태", "환급은행명", "환급계좌번호", "환급예금주", "교육장소", "강좌교육시작일", "강좌교육종료일", "신청교육장소", "교육종료일","등급","목적","수료여부" },
+                        new String[] { "결제번호", "신청자이름", "ID","주민번호", "핸드폰", "회사명", "상품유형", "환급여부", "상품명", "결제금액", "결제방법", "입금금액", "환불금액", "신청일","신청일시", "입금일", "결제상태", "환급은행명", "환급계좌번호", "환급예금주", "교육장소", "강좌교육시작일", "강좌교육종료일", "신청교육장소", "교육종료일","기술인분류","교육구분","직무분야","등급","목적","수료여부" },
-                        new String[] { "payno", "username", "userid", "mobile", "asname", "cshapename", "isrebatename", "itemname", "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2", "rbank", "rbankaccnum", "tbankuser", "studyplacename", "sdateymd", "edateymd", "cmistudyplacename", "cmiestartymd","tgname","tename", "completename" },
+                        new String[] { "payno", "username", "userid"," userpno", "mobile", "asname", "cshapename", "isrebatename", "itemname", "payamt", "pptypename", "payamt", "refundamt", "cdtymd","cdtymdhms", "payymd", "pstatusname2", "rbank", "rbankaccnum", "tbankuser", "studyplacename", "sdateymd", "edateymd", "cmistudyplacename", "cmiestartymd","tmname","edukind","tjname","tgname","tename", "completename" },
                         vm.PayItems,
                         "ProductSales_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day);
             }

Dao/MyBatis/Maps/CRoom.xml

@@ -807,6 +807,7 @@
 			      ,case when a.isexamready=1 then 0 else p.isunpay end isunpay
 			      ,case when p.rstatus=0 and pr.rstatus = 0 and pri.rfdno is not null then 1 else 0 end isrefundcall
 			      ,u.userno,u.userid,u.username
+            ,concat(substring(CAST(AES_DECRYPT(UNHEX(u.userpno),<include refid="sql.digest"></include>) as char),1,6),'-',substring(CAST(AES_DECRYPT(UNHEX(u.userpno),<include refid="sql.digest"></include>) as char),7,7)) userpno
 			      ,cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) as mobile
 			      ,ua.asname,ua.isjoin
 			      ,cm.cshape,cm.sstime,cm.setime,cm.studyplace
@@ -818,6 +819,7 @@
             ,scd.estart cmiestart, scd.eend cmieeend, scd.studyplace cmistudyplace
             ,pi.rbank , CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) rbankaccnum, pi.tbankuser
             ,cc1.cname tgname,cc2.cname tename
+            ,cc3.cname tmname,cc4.cname tjname
           from (
               select 0 isexamready,p.payno,max(case when pi.ptype in (0,1,3,4) then pi.pino else 0 end) pi1,min(pi.pino) pi2,count(pi.pino) ccount
               from pay p
@@ -901,6 +903,8 @@
             left outer join cminningscd scd on scd.cmisno = le.cmisno    
             left outer join comcode cc1 on cc1.ccode = ppl.typegrade
             left outer join comcode cc2 on cc2.ccode = ppl.typeedu
+            left outer join comcode cc3 on cc3.ccode = ppl.typeman
+            left outer join comcode cc4 on cc4.ccode = ppl.typejob
             <dynamic prepend="where">
                <isNotNull property="estart" prepend="and">scd.estart &gt;= #estart#</isNotNull>
                <isNotNull property="eend" prepend="and">scd.eend &lt;= #eend#</isNotNull>

Model/Pay.cs

@@ -593,8 +593,17 @@ namespace NP.Model
         /// </summary>
         public int studydays { get; set; }
         public DateTime? estart { get; set; }
+        public String tmname { get; set; }
+        public String tjname { get; set; }
         public String tgname { get; set; }
         public String tename { get; set; }
+        public String edukind
+        {
+            get
+            {
+                return tename == null ? "" : tename.Contains("기본교육") ? "기본" : "전문";
+            }
+        }
         /// <summary>
         /// 수료여부
         /// </summary>
@@ -606,7 +615,7 @@ namespace NP.Model
             }
         }
         public int attrate { get; set; }
-
+        public String userpno { get; set; }
     }
 
     /// <summary>