diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 56608ee..09e4d22 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -813,13 +813,13 @@ namespace NP.BO.Controllers
{
return ExportExcel(
new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분"
- , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "집체교육 출석일", "과정명","수료번호","교육이수시간"
+ , "기술인분류", "직무분야","전문분야","교육목적","등급", "교육시작일", "교육종료일", "집체교육 출석일", "과정명","수료번호","교육이수시간"
, "진도율", "평가점수", "과제점수", "총점", "온라인집체교육출석여부", "강의평가"
,"업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","대표자","학력","직위","업체담당자","업체담당자 연락처"
,"교육비","환급여부","환급액","환급은행명","환급계좌","환급계좌예금주","계산서이메일","소속협회"
,"교육상위분류","교육하위분류","교육장소","교육연도", "수료여부"},
new String[] { "rno","payno", "userid", "username","userpno", "mobile","cshapename","edukind"
- , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "zstring3", "cname","completeno","studytime"
+ , "typemanname","typejobname", "zstring0","typeeduname","typegradename", "sdatestr", "edatestr", "zstring3", "cname","completeno","studytime"
, "attrate", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point"
,"asname","addr","brno","eino","btype","bkind","ceoname","slevelName","uduty","mname","mphone"
,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association"
diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs
index 54c3880..895ad61 100644
--- a/Base/Controller/FOCommon.cs
+++ b/Base/Controller/FOCommon.cs
@@ -250,7 +250,7 @@ namespace NP.Base.Controllers
return JsonOK(GetInt(ht["asno"]));
}
[HttpPost]
- public JsonResult Join_old(Users u)
+ public JsonResult Join(Users u)
{
u.uip = GetUserIP();
//이메일, 아이디 중복 체크
@@ -265,7 +265,9 @@ namespace NP.Base.Controllers
Dao.Insert("users.in", u);
return JsonOK(u.userno);
}
- public JsonResult Join(Users u)
+
+ // 이후 전문건설과 같이 본인인증시 팝업을 제한할 경우 Join -> Join_new 서로 매서드 변경할것
+ public JsonResult Join_new(Users u)
{
if (!string.IsNullOrWhiteSpace(u.zstring0))
{
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index b4991a9..a35c617 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -1004,6 +1004,7 @@
,pi.tbankuser rbankuser,pi.rbank,pi.pino,pi.rbankamt
,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), ) AS char) as rbankaccnum
, date_format(f.stime, '%Y-%m-%d') zstring3
+ , cc2.cname as zstring0
from (
select a.lectno
,(b.attrate / 100) * (case when b.isrebate=1 then d.attendrfd else d.attend end / 100) * 100 apoint
@@ -1299,6 +1300,7 @@
left outer join lectinning f on f.lectno = b.lectno and f.cmino = e.cmino
left outer join comcode cc on cc.ccode = e.studyplace and cc.isuse=1
left outer join pplog ppl on ppl.pplno = p.pplno
+ left outer join comcode cc2 on ppl.typejobitem = cc2.ccode
left outer join comcode tm on tm.ccode = ppl.typeman
left outer join comcode te on te.ccode = ppl.typeedu
left outer join comcode tg on tg.ccode = ppl.typegrade
diff --git a/FO/Views/Course/XpayREQ.cshtml b/FO/Views/Course/XpayREQ.cshtml
index 893b5a3..4e191f2 100644
--- a/FO/Views/Course/XpayREQ.cshtml
+++ b/FO/Views/Course/XpayREQ.cshtml
@@ -2,7 +2,7 @@
@if (ViewBag.isPayTest == "1")
{
//테스트일 경우
-
+
}
else
{