KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2021-08-23 06:10:15 +00:00
parent 4da3724a67
commit 3daf52c671
55 changed files with 813 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BO/Views/croom/completions.cshtml
View File

@ -123,7 +123,7 @@
<th>직무분야</th> <th>직무분야</th>
<th>교육목적</th> <th>교육목적</th>
<th>등급</th> <th>등급</th>
<th>교육시작일</th> <th>교육신청일</th>
<th>교육종료일</th> <th>교육종료일</th>
<th>과정명</th> <th>과정명</th>
<th>수료번호</th> <th>수료번호</th>
@ -145,8 +145,8 @@
<td>@item.typejobName</td> <td>@item.typejobName</td>
<td>@item.typeeduName</td> <td>@item.typeeduName</td>
<td>@item.typegradeName</td> <td>@item.typegradeName</td>
<td>@Convert.ToDateTime(@item.sdate).ToShortDateString()</td> <td>@Convert.ToDateTime(item.cshape == 1 ? item.sdate : item.paycdt).ToShortDateString()</td>
<td>@Convert.ToDateTime(@item.edate).ToShortDateString()</td> <td>@Convert.ToDateTime(item.cshape == 1 ? item.edate : item.estart).ToShortDateString()</td>
<td>@item.cname</td> <td>@item.cname</td>
<td>@item.completeno</td> <td>@item.completeno</td>
</tr> </tr>
@ -249,7 +249,7 @@
<td>@Html.Partial("./Partial/Date", null, new ViewDataDictionary { { "name", "completion.edate" } })</td> <td>@Html.Partial("./Partial/Date", null, new ViewDataDictionary { { "name", "completion.edate" } })</td>
</tr> </tr>
<tr id="trcshape2"> <tr id="trcshape2">
<th>교육시작일(결제완료일) <spn style="color:red;">*</spn></th> <th>교육시작일<spn style="color:red;">*</spn></th>
<td id="completion_payoktime"></td> <td id="completion_payoktime"></td>
<th>교육종료일(집체교육일) <spn style="color:red;">*</spn></th> <th>교육종료일(집체교육일) <spn style="color:red;">*</spn></th>
<td> <td>

2
BO/Views/croom/lectreg.cshtml
View File

@ -360,6 +360,8 @@
function cbsave() { function cbsave() {
if (capResult.obj == -4) { if (capResult.obj == -4) {
msg("강좌에 해당 회원이 이미 수강중입니다."); msg("강좌에 해당 회원이 이미 수강중입니다.");
} else if (capResult.obj == -5) {
msg("이미 수강/수료한 과정입니다.");
} else if (capResult.code == 1000) { } else if (capResult.code == 1000) {
msg2("저장되었습니다.", 10, null, null, true); msg2("저장되었습니다.", 10, null, null, true);
submit("mform", 500); submit("mform", 500);

2
BO/Views/croom/pay.cshtml
View File

@ -149,7 +149,7 @@
&nbsp;@d.itemname@(d.ccount > 1 ? string.Format(" 외 {0} 건", d.ccount - 1) : "") &nbsp;@d.itemname@(d.ccount > 1 ? string.Format(" 외 {0} 건", d.ccount - 1) : "")
</a> </a>
</td> </td>
<td>@d.sdateymd~<span style="display: inline-block">@d.sdateymd</span></td> <td>@d.sdateymd~<span style="display: inline-block">@d.edateymd</span></td>
<td>@d.payamt.ToString("#,0")<br />(@(d.pptype == 0 ? "미정" : d.pptypename))</td> <td>@d.payamt.ToString("#,0")<br />(@(d.pptype == 0 ? "미정" : d.pptypename))</td>
<td class="link" style="text-align: right !important;"><a href="#" onclick="gorefund(@d.payno, @d.pstatus)">@(d.pstatus == 1 ? d.payamt.ToString("#,0") : "0")<br /><span class="red">(@(d.refundamt.ToString("#,0")))</span></a></td> <td class="link" style="text-align: right !important;"><a href="#" onclick="gorefund(@d.payno, @d.pstatus)">@(d.pstatus == 1 ? d.payamt.ToString("#,0") : "0")<br /><span class="red">(@(d.refundamt.ToString("#,0")))</span></a></td>
<td>@d.cdtymd</td> <td>@d.cdtymd</td>

4
BO/Views/croom/tax.cshtml
View File

@ -20,7 +20,7 @@
<col /> <col />
</colgroup> </colgroup>
<tr> <tr>
<th>발행요청일</th> <th>계산서날짜</th>
<td class="text-left"> <td class="text-left">
@Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval7) ? (DateTime?)null : Convert.ToDateTime(Model.stringval7), new ViewDataDictionary { { "name", "stringval7" } }) @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval7) ? (DateTime?)null : Convert.ToDateTime(Model.stringval7), new ViewDataDictionary { { "name", "stringval7" } })
</td> </td>
@ -64,7 +64,7 @@
<th>수량<br />(인원)</th> <th>수량<br />(인원)</th>
<th>발행요청금액</th> <th>발행요청금액</th>
<th>신청일</th> <th>신청일</th>
<th>발행요청일</th> <th>계산서날짜</th>
<th>발행일</th> <th>발행일</th>
<th>영수구분</th> <th>영수구분</th>
<th>상태</th> <th>상태</th>

4
BO/Views/croom/taxdetail.cshtml
View File

@ -24,7 +24,7 @@
<th>수량<br />(인원)</th> <th>수량<br />(인원)</th>
<th>발행요청금액</th> <th>발행요청금액</th>
<th>신청일</th> <th>신청일</th>
<th>발행요청일</th> <th>계산서날짜</th>
<th>발행일</th> <th>발행일</th>
<th>상태</th> <th>상태</th>
</tr> </tr>
@ -190,7 +190,7 @@
{ {
<input type="text" class="form-control dev" style="width:130px;display:initial;text-align:center;" name="taxdate" id="taxdate" value="@(t.taxdate == null ? "" : t.taxdate.Value.ToString("yyyy-MM-dd"))" readonly /> <input type="text" class="form-control dev" style="width:130px;display:initial;text-align:center;" name="taxdate" id="taxdate" value="@(t.taxdate == null ? "" : t.taxdate.Value.ToString("yyyy-MM-dd"))" readonly />
} }
@(t.taxdatereq==null?"": string.Format("[발행요청일 : {0}]", t.taxdatereq.Value.ToString("yyyy-MM-dd"))) @(t.taxdatereq==null?"": string.Format("[계산서날짜 : {0}]", t.taxdatereq.Value.ToString("yyyy-MM-dd")))
</td> </td>
</tr> </tr>
<tr> <tr>

11
BO/Views/user/us.cshtml
View File

@ -12,7 +12,7 @@
<br /> <br />
} }
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "name", "stringval3" }, { "selected", Model.stringval3 }, { "valuetext", "1:활성;8:휴면;9:비활성" }, { "df", ":-상태" } }) @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "name", "stringval3" }, { "selected", Model.stringval3 }, { "valuetext", "1:활성;8:휴면;9:비활성" }, { "df", ":-상태" } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "valuetext", "username:이름;userid:ID;email:이메일;mobile:휴대폰" } }) @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "valuetext", "username:이름;userid:ID;email:이메일;mobile:휴대폰;userpno:주민등록번호" } })
@Html.Partial("./Partial/Text", Model.stringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval5", Value = Model.stringval5, PH = "검색어를 입력하세요.", CssClass = "esitem" })) @Html.Partial("./Partial/Text", Model.stringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval5", Value = Model.stringval5, PH = "검색어를 입력하세요.", CssClass = "esitem" }))
@Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" }) @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" })
</div> </div>
@ -44,6 +44,7 @@
<th>소속</th> <th>소속</th>
<th>이름(ID)</th> <th>이름(ID)</th>
<th>핸드폰</th> <th>핸드폰</th>
<th>생년월일</th>
<th style="width:60px;">상태</th> <th style="width:60px;">상태</th>
<th>최근로그인</th> <th>최근로그인</th>
<th>상담하기</th> <th>상담하기</th>
@ -82,6 +83,14 @@ else if (Model.viewname == "admin")
<td>@item.asname</td> <td>@item.asname</td>
<td class="link"><a href="#" onclick="reg(@item.userno)">@string.Format("{0}({1})", item.username, item.userid)</a></td> <td class="link"><a href="#" onclick="reg(@item.userno)">@string.Format("{0}({1})", item.username, item.userid)</a></td>
<td>@item.mobile</td> <td>@item.mobile</td>
@if((item.userpno ?? "").Length > 6)
{
<td>@(item.userpno.Substring(0,6))</td>
}
else
{
<td></td>
}
<td>@item.statusname</td> <td>@item.statusname</td>
<td>@item.logintime.ToString("yy-MM-dd HH:mm")</td> <td>@item.logintime.ToString("yy-MM-dd HH:mm")</td>
<td><a href="#" onclick="gocouncel(@item.userno)">[상담하기]</a></td> <td><a href="#" onclick="gocouncel(@item.userno)">[상담하기]</a></td>

8
Base/Controller/ACommonCRoom.cs
View File

@ -190,9 +190,13 @@ namespace NP.Base.Controllers
pplno = pplog.pplno, pplno = pplog.pplno,
uno = SUserInfo.UserNo, uno = SUserInfo.UserNo,
uip = GetUserIP() uip = GetUserIP()
}; };
#endregion #endregion
var result = Dao.Get<int>("cm.lectcheckuser", new System.Collections.Hashtable() { { "userno", pplog.userno }, { "cmnos", pay.cmnos } }).First();
if(result > 0)
{
return JsonOK(-5);
}
//등록된 교육생인가 확인 //등록된 교육생인가 확인
var checklectuser = Dao.Get<Lect>("lect.checkuser", new Hashtable() { {"userno", pplog.userno }, { "cmnos", pay.cmnos } }).Count(); var checklectuser = Dao.Get<Lect>("lect.checkuser", new Hashtable() { {"userno", pplog.userno }, { "cmnos", pay.cmnos } }).Count();
if(checklectuser > 0) if(checklectuser > 0)

8
Base/Controller/FCommon.cs
View File

@ -277,6 +277,12 @@ namespace NP.Base.Controllers
pplog.cmisno = !string.IsNullOrEmpty(Request["cmisno"]) ? Convert.ToInt64(Request["cmisno"]) : (long?)null; pplog.cmisno = !string.IsNullOrEmpty(Request["cmisno"]) ? Convert.ToInt64(Request["cmisno"]) : (long?)null;
pplog.isrebate = !string.IsNullOrEmpty(Request["isrebate"]) ? Convert.ToInt32(Request["isrebate"]) : (int?)null; pplog.isrebate = !string.IsNullOrEmpty(Request["isrebate"]) ? Convert.ToInt32(Request["isrebate"]) : (int?)null;
pplog.isaccommodation = !string.IsNullOrEmpty(Request["isaccommodation"]) ? Convert.ToInt32(Request["isaccommodation"].ToString()) : (int?)null; pplog.isaccommodation = !string.IsNullOrEmpty(Request["isaccommodation"]) ? Convert.ToInt32(Request["isaccommodation"].ToString()) : (int?)null;
#region 집체교육 종료일 체크
if(pplog.cmisno != null && Dao.Get<int>("lect.checkuser.cmisno", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cmisno",pplog.cmisno} }).First() > 0)
{
return JsonBack(new JsonRtn() { code = -1 });
}
#endregion
#region 환급금 수령계좌 #region 환급금 수령계좌
if (pplog.isrebate == 1) if (pplog.isrebate == 1)
@ -364,7 +370,7 @@ namespace NP.Base.Controllers
if (asno != 0) if (asno != 0)
{ {
var assign = Dao.Get<Assign>("users.assigns2", new System.Collections.Hashtable() { { "asno", asno }, { "excel1", ",a.post" }, { "orderby", "a.asname" } }) var assign = Dao.Get<Assign>("users.assigns2", new System.Collections.Hashtable() { { "asno", asno }, { "excel1", ",a.post" }, { "orderby", "a.asname" } })
.Select( s => new { s.brno, s.ceoname, s.post, s.address1, s.address2, s.btype, s.bkind, s.eino, s.mname, s.mphone, s.taxemail, s.fgnobno }) .Select( s => new { s.asname,s.brno, s.ceoname, s.post, s.address1, s.address2, s.btype, s.bkind, s.eino, s.mname, s.mphone, s.taxemail, s.fgnobno,s.fileno,s.orgname })
.FirstOrDefault(); .FirstOrDefault();
return JsonBack(assign); return JsonBack(assign);
} }

4
Base/Controller/FCommonCRoom.cs
View File

@ -64,6 +64,10 @@ namespace NP.Base.Controllers
issubmit = 0; issubmit = 0;
OverTime = "1"; OverTime = "1";
} }
if(Exam.estart == null)
{
return JsonOK(-44,true);
}
var qis = Dao.Get<QuestionItem>("cr.questionitem.listforcheck", qnos); var qis = Dao.Get<QuestionItem>("cr.questionitem.listforcheck", qnos);
var ue = new LectEX() {lectno=lectno, userno = SUserInfo.UserNo, uno = SUserInfo.UserNo, uip = GetUserIP(), exno = Exam.exno, cblock = cblock }; var ue = new LectEX() {lectno=lectno, userno = SUserInfo.UserNo, uno = SUserInfo.UserNo, uip = GetUserIP(), exno = Exam.exno, cblock = cblock };
//ue.sip = SIP; //ue.sip = SIP;

62
Base/Controller/FCommonMy.cs
View File

@ -127,15 +127,16 @@ namespace NP.Base.Controllers
LogSet(new ActLog() { logtype = 30, logtarget = 21, logdata = u.username, userno = u.userno, uno = SUserInfo.UserNo, uip = GetUserIP() }); LogSet(new ActLog() { logtype = 30, logtarget = 21, logdata = u.username, userno = u.userno, uno = SUserInfo.UserNo, uip = GetUserIP() });
u.savefrontbuy = 1; u.savefrontbuy = 1;
var result = Dao.Save("users.up", u); var result = Dao.Save("users.up", u);
if (result > 0) //직장변경제거
{ //if (result > 0)
var asno = u.asno ?? 0; //{
if (SUserInfo.ASNo != asno) // var asno = u.asno ?? 0;
{ // if (SUserInfo.ASNo != asno)
SUserInfo.ASNo = asno; // {
AuthCookie(true); // SUserInfo.ASNo = asno;
} // AuthCookie(true);
} // }
//}
return JsonOK(result); return JsonOK(result);
} }
} }
@ -155,19 +156,46 @@ namespace NP.Base.Controllers
[HttpPost] [HttpPost]
public JsonResult AssignUpdate(Assign a) public JsonResult AssignUpdate(Assign a)
{ {
if(Dao.Get<Assign>("users.assign.check.brno", new Hashtable() { { "asnonot" + (a.asno < 1 ? "xxx" : ""), a.asno }, { "brno", a.brno } }).Count() > 0) var user = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault();
//사용자체크
if (user != null)
{ {
return JsonBack(new JsonRtn() { code = -1 }); var result = Dao.Save("users.up.asno", new Hashtable() { {"userno",SUserInfo.UserNo },{"asno",a.asno ==0 ? (int?)null : a.asno },{"uno",SUserInfo.UserNo },{"uip",GetUserIP() } });
if(result > 0)
{
var nasno = a.asno;
if (SUserInfo.ASNo != nasno)
{
SUserInfo.ASNo = nasno;
AuthCookie(true);
}
}
} }
else else
{ {
if(Request.Files.GetMultiple("file1").Where(w=>!string.IsNullOrEmpty(w.FileName)).Count() > 0) //사용자 없을시 오류
{ return JsonOK(0);
a.fgnobno = SetFile(Request.Files.GetMultiple("file1").Where(w => !string.IsNullOrEmpty(w.FileName)).ToList(), a.fgnobno ?? 0, "assign", "fgnobno");
}
a.uno = SUserInfo.UserNo; a.uip = GetUserIP(); a.saveflag = null;
return JsonOK(Dao.Save("users.assign.up", a));
} }
//기업정보변경
if(a.asno > 0)
{
//사업자번호체크
if (Dao.Get<Assign>("users.assign.check.brno", new Hashtable() { { "asnonot" + (a.asno < 1 ? "xxx" : ""), a.asno }, { "brno", a.brno } }).Count() > 0)
{
return JsonBack(new JsonRtn() { code = -1 });
}
else
{
if(Request.Files.GetMultiple("file1").Where(w=>!string.IsNullOrEmpty(w.FileName)).Count() > 0)
{
a.fgnobno = SetFile(Request.Files.GetMultiple("file1").Where(w => !string.IsNullOrEmpty(w.FileName)).ToList(), a.fgnobno ?? 0, "assign", "fgnobno");
}
a.uno = SUserInfo.UserNo; a.uip = GetUserIP(); a.saveflag = null;
return JsonOK(Dao.Save("users.assign.up", a));
}
}
//정상으로 된거로 판단
return JsonOK(1);
} }
} }

21
Base/Controller/FOCommon.cs
View File

@ -322,6 +322,23 @@ namespace NP.Base.Controllers
} }
} }
[HttpPost] [HttpPost]
public JsonResult StudyClose(Int64 logno, int issample = 0)
{
if (SUserInfo.UserNo > 0 || issample > 0)
{
int rtn = 0;
if (issample < 1)
{
rtn = Dao.Save("cr.studyclose", new Hashtable() { { "logno", logno }, {"uno", SUserInfo.UserNo },{"uip",GetUserIP() } });
}
return JsonOK(rtn);
}
else
{
return JsonOK(0);
}
}
[HttpPost]
public JsonResult checklectdate(Int64 lectno) public JsonResult checklectdate(Int64 lectno)
{ {
Lect lect = Dao.Get<Lect>("cr.checklectdate", new Hashtable() { { "lectno", lectno } }).First(); Lect lect = Dao.Get<Lect>("cr.checklectdate", new Hashtable() { { "lectno", lectno } }).First();
@ -427,9 +444,9 @@ namespace NP.Base.Controllers
} }
[HttpPost] [HttpPost]
public JsonResult GetScdForMixEdu(int cmno, int? month) public JsonResult GetScdForMixEdu(int cmno,int? lectno, int? month)
{ {
var result = Dao.Get<CMinningscd>("cm.cminningscds.applyedu", new System.Collections.Hashtable() { { "cmno", cmno }, { "month", (month == null) ? null : month } }); var result = Dao.Get<CMinningscd>("cm.cminningscds.applyedu"+(lectno != null ? ".lectno" : ""), new System.Collections.Hashtable() { { "cmno", cmno },{"lectno",lectno }, { "month", (month == null) ? null : month } });
foreach (var item in result) foreach (var item in result)
{ {
//item.scdInfoSummary = string.Format("[{0}] {1}", item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm")); //item.scdInfoSummary = string.Format("[{0}] {1}", item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm"));

2
Base/Popbill/PopbillService.cs
View File

@ -60,7 +60,7 @@ namespace NP.Base.Popbill
} }
else else
{ {
var payTax = Dao.Get<PayTax>("cr.paytax.formgtkey", new Hashtable() { { "writeDate", writeDate } }).FirstOrDefault(); var payTax = Dao.Get<PayTax>("cr.paytax.formgtkey", new Hashtable() { { "writeDate", writeDate.ToString("yyyy-MM-dd") } }).FirstOrDefault();
if (payTax != null && !string.IsNullOrEmpty(payTax.mgtkey)) if (payTax != null && !string.IsNullOrEmpty(payTax.mgtkey))
{ {
var strNo = payTax.mgtkey.Substring(payTax.mgtkey.IndexOf("L") + 1); var strNo = payTax.mgtkey.Substring(payTax.mgtkey.IndexOf("L") + 1);

68
Dao/MyBatis/Maps/CM.xml
View File

@ -1804,8 +1804,8 @@
,a.cdt,a.udt ,a.cdt,a.udt
,a.cmno value,a.cname text ,a.cmno value,a.cname text
,e.ccode, e.cname studyplacename ,e.ccode, e.cname studyplacename
,g.attendcut,g.finalcut ,g.attendcut,g.finalcut,g.subjectcut
,i.username ,h.username
from cm a from cm a
inner join cg b on b.cgno=a.cgno inner join cg b on b.cgno=a.cgno
inner join cg c on c.cgno=b.pcgno inner join cg c on c.cgno=b.pcgno
@ -1813,8 +1813,14 @@
left outer join cm d on a.ismaster=0 and d.cmno=a.pcmno left outer join cm d on a.ismaster=0 and d.cmno=a.pcmno
left outer join comcode e on a.studyplace = e.ccode left outer join comcode e on a.studyplace = e.ccode
left outer join cmev g on a.cmno = g.cmno left outer join cmev g on a.cmno = g.cmno
left outer join cmprof h on a.cmno = h.cmno left outer join (
left outer join users i on h.userno = i.userno select group_concat(b.username separator ', ') username,a.cmno
from cmprof a
inner join users b on b.userno = a.userno
where b.status =1
<isNotNull property="cmno">and a.cmno=#cmno#</isNotNull>
group by a.cmno
) h on a.cmno = h.cmno
where a.isdel=0 where a.isdel=0
<isNotNull property="cmno">and a.cmno=#cmno#</isNotNull> <isNotNull property="cmno">and a.cmno=#cmno#</isNotNull>
<isNotNull property="studyplace">and a.studyplace=#studyplace#</isNotNull> <isNotNull property="studyplace">and a.studyplace=#studyplace#</isNotNull>
@ -1823,12 +1829,14 @@
select select
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
,a.studyplace, a.studyplacename,a.remainPeople ,a.studyplace, a.studyplacename,a.remainPeople
,a.isselected
,case when a.estart &lt; now() or a.remainPeople &lt;= 0 then 0 else 1 end isend ,case when a.estart &lt; now() or a.remainPeople &lt;= 0 then 0 else 1 end isend
from from
( (
select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status =1 and z.ischanged=0)) remainPeople ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status =1 and z.ischanged=0)) remainPeople
,a.studyplace, e.cname studyplacename ,a.studyplace, e.cname studyplacename
,case when date_format(d.setime,'%Y%m%d') = date_format(a.estart,'%Y%m%d') then 1 else 0 end isselected
from cminningscd a from cminningscd a
left outer join cminning c on c.cmino = a.cmino left outer join cminning c on c.cmino = a.cmino
left outer join cm d on d.cmno = c.cmno left outer join cm d on d.cmno = c.cmno
@ -1842,6 +1850,32 @@
</dynamic> </dynamic>
order by isend desc,a.estart order by isend desc,a.estart
</select> </select>
<select id="cm.cminningscds.applyedu.lectno" parameterClass="hashtable" resultClass="cminningscd">
select
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
,a.studyplace, a.studyplacename,a.remainPeople
,a.isselected
,case when a.estart &lt; now() or a.remainPeople &lt;= 0 then 0 else 1 end isend
from
(
select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status =1 and z.ischanged=0)) remainPeople
,a.studyplace, e.cname studyplacename
,case when f.cmisno = a.cmisno then 1 else 0 end isselected
from cminningscd a
left outer join cminning c on c.cmino = a.cmino
left outer join cm d on d.cmno = c.cmno
left outer join comcode e on e.ccode = a.studyplace
left outer join lect f on f.lectno = #lectno#
<dynamic prepend="where">
<isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull>
</dynamic>
)a
<dynamic prepend="where">
<isNotNull property="month" prepend="and">a.startmonth=#month#</isNotNull>
</dynamic>
order by isend desc,a.estart
</select>
<select id="cm.user.applyedu" parameterClass="hashtable" resultClass="users"> <select id="cm.user.applyedu" parameterClass="hashtable" resultClass="users">
select select
a.userno,a.usertype,a.jointype,a.snsid,a.userkind,a.userid,a.userpass,a.username,a.usernameeng,a.gender,a.birthday,a.isacceptemail,a.isacceptmobile,a.telno,a.asno,a.pasname a.userno,a.usertype,a.jointype,a.snsid,a.userkind,a.userid,a.userpass,a.username,a.usernameeng,a.gender,a.birthday,a.isacceptemail,a.isacceptmobile,a.telno,a.asno,a.pasname
@ -1930,12 +1964,14 @@
where userno=#userno# where userno=#userno#
</update> </update>
<select id="cm.lectcheckuser" parameterClass="hashtable" resultClass="int"> <select id="cm.lectcheckuser" parameterClass="hashtable" resultClass="int">
select count(b.lectno) select count(c.lectno)
from users a from cm a
left outer join lect b on a.userno = b.userno left outer join cm b on b.pcmno = a.pcmno
left outer join pay c on c.payno = b.payno left outer join lect c on c.cmno = b.cmno and c.userno = #userno#
where a.userno = #userno# where b.isdel=0
and b.cmno = #cmno# and (b.iscomplete = 1 or (b.status &lt; 5 or b.status = 6)) and (c.iscomplete = 1 or (c.status &lt; 5 or c.status = 6))
<isNotNull property="cmno">and a.cmno = #cmno# </isNotNull>
<isNotEmpty property="cmnos">and a.cmno in ($cmnos$)</isNotEmpty>
</select> </select>
<select id="cm.cminningscdcheck" parameterClass="hashtable" resultClass="int"> <select id="cm.cminningscdcheck" parameterClass="hashtable" resultClass="int">
select select
@ -1946,7 +1982,17 @@
<update id="cm.lectcmisno.up" parameterClass="hashtable"> <update id="cm.lectcmisno.up" parameterClass="hashtable">
update lect set <include refid="sql.up"></include> update lect set <include refid="sql.up"></include>
,cmisno =case when #cmisno# is not null then #cmisno# else cmisno end ,cmisno =case when #cmisno# is not null then #cmisno# else cmisno end
where lectno=#lectno# where lectno=#lectno#;
update pplog a
left outer join (
select a.lectno,a.payno,b.pplno,a.cmisno
from lect a
inner join pay b on b.payno = a.payno
where a.lectno = #lectno#
) b on b.pplno = a.pplno
set a.cmisno = case when b.cmisno is not null then b.cmisno else a.cmisno end
where b.lectno = #lectno#;
</update> </update>
<select id="cm.cms.offs" parameterClass="hashtable" resultClass="cm"> <select id="cm.cms.offs" parameterClass="hashtable" resultClass="cm">
select select

16
Dao/MyBatis/Maps/CRoom.xml
View File

@ -165,7 +165,7 @@
,case when a.sdate is null then a2.sstime else a.sdate end as sdate ,case when a.sdate is null then a2.sstime else a.sdate end as sdate
,case when a.edate is null then a2.setime else a.edate end as edate ,case when a.edate is null then a2.setime else a.edate end as edate
,b.cmino,b.iseq,b.isonline,b.ititle,b.sttime,b.idate,b.ist,b.iet,b.icontent ,b.cmino,b.iseq,b.isonline,b.ititle,b.sttime,b.idate,b.ist,b.iet,b.icontent
,scd.estart,scd.eend,com.cname ,p.cdt,scd.estart,scd.eend,com.cname
,cp.istatus preistatus ,cp.istatus preistatus
,c.totstudy,c.istatus,c.stime, c.lectno existslectinning ,c.totstudy,c.istatus,c.stime, c.lectno existslectinning
,case when b.isonline=1 then d.tfurl else null end tfurl ,case when b.isonline=1 then d.tfurl else null end tfurl
@ -174,6 +174,7 @@
<!--,concat('/', d.ccode, '/', e.srcp) tasteurl--> <!--,concat('/', d.ccode, '/', e.srcp) tasteurl-->
,df2.fileurl tasteurl ,df2.fileurl tasteurl
from lect a from lect a
inner join pay p on p.payno = a.payno
inner join cm a2 on a2.cmno=a.cmno inner join cm a2 on a2.cmno=a.cmno
inner join cminning b on b.cmno=a2.cmno inner join cminning b on b.cmno=a2.cmno
left outer join lectinning c on c.lectno=a.lectno and c.cmino=b.cmino left outer join lectinning c on c.lectno=a.lectno and c.cmino=b.cmino
@ -1331,7 +1332,7 @@
<select id="cr.paytax.formgtkey" parameterClass="hashtable" resultClass="paytax"> <select id="cr.paytax.formgtkey" parameterClass="hashtable" resultClass="paytax">
select taxno, mgtkey select taxno, mgtkey
from paytax from paytax
where mgtkey like concat(#taxdate#,'%') where mgtkey like concat(#writeDate#,'%')
order by mgtkey desc order by mgtkey desc
limit 1 limit 1
</select> </select>
@ -1527,7 +1528,10 @@
select a.* select a.*
from ( from (
select select
l.lectno,l.iscomplete,l.completetime,l.completeno,l.cmisno,l.sdate,l.edate,l.cmno,l.payno l.lectno,l.iscomplete,l.completetime,l.completeno,l.cmisno
,l.sdate
,l.edate
,l.cmno,l.payno
,l.cdt,l.cno,pp.udt,l.uno,l.uip ,l.cdt,l.cno,pp.udt,l.uno,l.uip
,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace ,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace
,cmi.estart ,cmi.estart
@ -1541,6 +1545,7 @@
,pi.tbankuser as rbankuser,pi.rbank,pi.pino,pi.rbankamt ,pi.tbankuser as rbankuser,pi.rbank,pi.pino,pi.rbankamt
,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum ,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum
,p.payamt,p.payoktime ,p.payamt,p.payoktime
,case when ifnull(cmi.estart,<include refid="sql.digest"></include>) &lt; '2021-08-15' then p.payoktime else p.cdt end paycdt
,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob ,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob
,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association ,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association
,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone ,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone
@ -1639,5 +1644,10 @@
<isNotNull property="taxemail">,taxemail=HEX(AES_ENCRYPT(#taxemail#, <include refid="sql.digest"></include>))</isNotNull> <isNotNull property="taxemail">,taxemail=HEX(AES_ENCRYPT(#taxemail#, <include refid="sql.digest"></include>))</isNotNull>
where pplno=#pplno# and userno=#userno#; where pplno=#pplno# and userno=#userno#;
</update> </update>
<update id="cr.studyclose" parameterClass="hashtable">
update lectinningpage a
set a.etime=now(),a.eip=#uip#,a.udt=now(),a.uno=#uno#,a.uip=#uip#
where a.logno=#logno#;
</update>
</statements> </statements>
</sqlMap> </sqlMap>

1
Dao/MyBatis/Maps/Common.xml
View File

@ -6,7 +6,6 @@
<typeAlias alias="memo" type="NP.Model.Memo, NP.Model" /> <typeAlias alias="memo" type="NP.Model.Memo, NP.Model" />
<typeAlias alias="memouser" type="NP.Model.MemoUser, NP.Model" /> <typeAlias alias="memouser" type="NP.Model.MemoUser, NP.Model" />
<typeAlias alias="basemodel" type="NP.Model.BaseModel, NP.Model" /> <typeAlias alias="basemodel" type="NP.Model.BaseModel, NP.Model" />
<typeAlias alias="data" type="NP.Model.Data, NP.Model" />
<typeAlias alias="emailsend" type="NP.Model.EmailSend, NP.Model" /> <typeAlias alias="emailsend" type="NP.Model.EmailSend, NP.Model" />
<typeAlias alias="smsauth" type="NP.Model.SmsAuth, NP.Model" /> <typeAlias alias="smsauth" type="NP.Model.SmsAuth, NP.Model" />
</alias> </alias>

82
Dao/MyBatis/Maps/Lect.xml
View File

@ -1092,19 +1092,23 @@
values (#etype#,#userno#,#edate#,#esubject#,#etarget#,#ecount#,#eplace#,#ecomment#,#compname#,#ceoname#,#brno#,#addr#,#btype#,#bkind#,#manname#,HEX(AES_ENCRYPT(#email#, <include refid="sql.digest"></include>)),HEX(AES_ENCRYPT(#telno#, <include refid="sql.digest"></include>)),#fgno#,<include refid="sql.inv"></include>) values (#etype#,#userno#,#edate#,#esubject#,#etarget#,#ecount#,#eplace#,#ecomment#,#compname#,#ceoname#,#brno#,#addr#,#btype#,#bkind#,#manname#,HEX(AES_ENCRYPT(#email#, <include refid="sql.digest"></include>)),HEX(AES_ENCRYPT(#telno#, <include refid="sql.digest"></include>)),#fgno#,<include refid="sql.inv"></include>)
</update> </update>
<select id="lect.mydata" parameterClass="int" resultClass="data"> <select id="lect.mydata" parameterClass="int" resultClass="data">
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,a.intval9
,a.longval,a.longval2 ,a.longval,a.longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
,null time3 ,null time4 ,a.time3,a.time4
,a.time5,a.time6
,a.rno ,a.rno
from( from(
select 1 dtype select 1 dtype
,d.tyear intval,d.tseq intval2,c.cshape intval3,a.pstatus intval4,case when e.rfdno is null then 0 else 1 end intval5,a.isrebate intval6,a.itemno intval7 ,d.tyear intval,d.tseq intval2,c.cshape intval3,a.pstatus intval4,case when e.rfdno is null then 0 else 1 end intval5,a.isrebate intval6,a.itemno intval7
,case when c.sstime &lt; now() and c.setime &gt; now() then 1 else 0 end intval8 ,case when (case when l.sdate is null then c.sstime else l.sdate end) &lt; now() and (case when l.edate is null then c.setime else l.edate end) &gt; now() then 1 else 0 end intval8
,c.studydays intval9
,l.lectno longval,a.payno longval2 ,l.lectno longval,a.payno longval2
,c.cname strval,null strval2,null strval3 ,c.cname strval,null strval2,null strval3
,c.rstime time,c.retime time2 ,c.rstime time,c.retime time2
,b.cdt time3,f.estart time4
,case when l.sdate is null then c.sstime else l.sdate end time5,case when l.edate is null then c.setime else l.edate end time6
,case when b.pstatus = 1 then 99 else b.pstatus end as sortpstatus ,case when b.pstatus = 1 then 99 else b.pstatus end as sortpstatus
,row_number() over(order by sortpstatus, c.retime, b.payno,a.pino) rno ,row_number() over(order by sortpstatus, c.retime, b.payno,a.pino) rno
from payitem a from payitem a
@ -1112,17 +1116,19 @@
inner join cm c on c.cmno=a.itemno and c.rstime &lt; <include refid="sql.now"></include> and c.retime &gt; <include refid="sql.now"></include> inner join cm c on c.cmno=a.itemno and c.rstime &lt; <include refid="sql.now"></include> and c.retime &gt; <include refid="sql.now"></include>
inner join lect l on l.cmno=c.cmno and (l.status &lt; 5 or l.status = 6) and l.ischanged=0 and l.userno=b.userno inner join lect l on l.cmno=c.cmno and (l.status &lt; 5 or l.status = 6) and l.ischanged=0 and l.userno=b.userno
inner join term d on d.tmno=c.tmno inner join term d on d.tmno=c.tmno
left outer join payrfd e on e.payno=a.payno and e.payno=a.payno and e.rstatus=0 left outer join payrfd e on e.payno=a.payno and e.payno=a.payno and e.rstatus=0
left outer join cminningscd f on f.cmisno = l.cmisno
where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (21,22,51,55) and a.rstatus=0 where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (21,22,51,55) and a.rstatus=0
and 1 = case when c.retime = '2099-12-31 23:59:59' and l.stime is not null then 0 else 1 end and 1 = case when c.retime = '2099-12-31 23:59:59' and l.stime is not null then 0 else 1 end
order by sortpstatus, c.retime, b.payno,a.pino order by sortpstatus, c.retime, b.payno,a.pino
) a ) a
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
,a.time3,a.time4 ,a.time3,a.time4
,a.time5,a.time6
,a.rno ,a.rno
from ( from (
select 2 dtype select 2 dtype
@ -1132,9 +1138,11 @@
,case when a.sdate is null then b.sstime else a.sdate end as time ,case when a.sdate is null then b.sstime else a.sdate end as time
,case when a.edate is null then b.setime else a.edate end as time2 ,case when a.edate is null then b.setime else a.edate end as time2
,d.estart time3,d.eend time4 ,d.estart time3,d.eend time4
,e.cdt time5,null time6
,row_number() over(order by b.setime desc) rno ,row_number() over(order by b.setime desc) rno
,case when d.eend is not null then d.eend else a.edate end as sortedate ,case when d.eend is not null then d.eend else a.edate end as sortedate
from lect a from lect a
inner join pay e on e.payno = a.payno
inner join cm b on b.cmno=a.cmno inner join cm b on b.cmno=a.cmno
inner join term c on c.tmno=b.tmno inner join term c on c.tmno=b.tmno
left outer join cminningscd d on a.cmisno = d.cmisno left outer join cminningscd d on a.cmisno = d.cmisno
@ -1143,11 +1151,12 @@
order by case when time2 > now() then 1 else 0 end desc ,sortedate desc, time2 desc order by case when time2 > now() then 1 else 0 end desc ,sortedate desc, time2 desc
) a ) a
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
,null time3, null time4 ,null time3, null time4
,null time5, null time6
,a.rno ,a.rno
from ( from (
select 3 dtype select 3 dtype
@ -1166,11 +1175,12 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
,null time3, null time4 ,null time3, null time4
,null time5, null time6
,a.rno ,a.rno
from ( from (
select 3 dtype select 3 dtype
@ -1189,11 +1199,12 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
,null time3, null time4 ,null time3, null time4
,null time5, null time6
,a.rno ,a.rno
from ( from (
select 3 dtype select 3 dtype
@ -1212,11 +1223,12 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
,null time3, null time4 ,null time3, null time4
,null time5, null time6
,a.rno ,a.rno
from ( from (
select 3 dtype select 3 dtype
@ -1235,11 +1247,12 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
,null time3, null time4 ,null time3, null time4
,null time5, null time6
,a.rno ,a.rno
from ( from (
select 3 dtype select 3 dtype
@ -1258,11 +1271,12 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
,a.longval,a.longval2 ,a.longval,a.longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
,null time3, null time4 ,null time3, null time4
,null time5, null time6
,a.rno ,a.rno
from ( from (
select 4 dtype select 4 dtype
@ -1295,6 +1309,7 @@
,e.isgroup,e.payno ,e.isgroup,e.payno
,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname
,1 rno ,1 rno
,e.cdt
,scd.estart,scd.eend ,scd.estart,scd.eend
,cc.ccode studyplace ,cc.ccode studyplace
,cc.cname studyplacename ,cc.cname studyplacename
@ -1320,7 +1335,7 @@
,e.isgroup,e.payno ,e.isgroup,e.payno
,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname
,row_number() over(partition by e.payno) rno ,row_number() over(partition by e.payno) rno
,null estart, null eend ,e.cdt,null estart, null eend
,null studyplace ,null studyplace
,null studyplacename ,null studyplacename
,a.edate as sortedate ,a.edate as sortedate
@ -1342,7 +1357,7 @@
,e.isgroup,e.payno ,e.isgroup,e.payno
,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname
,row_number() over(partition by e.payno) rno ,row_number() over(partition by e.payno) rno
,null estart, null eend ,e.cdt,null estart, null eend
,null studyplace ,null studyplace
,null studyplacename ,null studyplacename
,a.edate as sortedate ,a.edate as sortedate
@ -1522,6 +1537,7 @@
,cc.ccode studyplace ,cc.ccode studyplace
,pt.taxno,pt.taxdate taxdate2,pt.mgtkey,pt.iscancel,pt.statecode ,pt.taxno,pt.taxdate taxdate2,pt.mgtkey,pt.iscancel,pt.statecode
,a.cdt ,a.cdt
,e.cdt paycdt
,pv.cshrpgkey ,pv.cshrpgkey
,ifnull(pi.isrebate,0) isrebate ,ifnull(pi.isrebate,0) isrebate
,row_number() over(order by a.cdt desc) rno ,row_number() over(order by a.cdt desc) rno
@ -1540,7 +1556,7 @@
left outer join cm c0 on c.ptype in (0,1,4) and c0.cmno=c.itemno left outer join cm c0 on c.ptype in (0,1,4) and c0.cmno=c.itemno
left outer join book c2 on c.ptype=2 and c2.bkno=c.itemno left outer join book c2 on c.ptype=2 and c2.bkno=c.itemno
left outer join exam c3 on c.ptype=3 and c3.exno=c.itemno left outer join exam c3 on c.ptype=3 and c3.exno=c.itemno
where a.status=1 and a.ischanged = 0 <isNotNull property="userno">and a.userno = #userno#</isNotNull> where a.status in (1,2) and a.ischanged = 0 <isNotNull property="userno">and a.userno = #userno#</isNotNull>
group by a.payno group by a.payno
) e2 on e2.payno = e.payno ) e2 on e2.payno = e.payno
left outer join pplog e1 on e1.pplno = e.pplno left outer join pplog e1 on e1.pplno = e.pplno
@ -1608,8 +1624,44 @@
<update id="lect.cmisno.up" parameterClass="hashtable"> <update id="lect.cmisno.up" parameterClass="hashtable">
update lect update lect
set cmisno = #cmisno# set cmisno = #cmisno#
where lectno = #lectno# where lectno = #lectno#;
update pplog a
left outer join (
select a.lectno,a.payno,b.pplno,a.cmisno
from lect a
inner join pay b on b.payno = a.payno
where a.lectno = #lectno#
) b on b.pplno = a.pplno
set a.cmisno = b.cmisno
where b.lectno = #lectno#;
</update> </update>
<select id="lect.checkuser.cmisno" parameterClass="hashtable" resultClass="int">
select count(c.cmisno )
from lect a
inner join cminningscd b on b.cmisno = a.cmisno
left outer join cminningscd c on c.cmisno = #cmisno# and date_format(c.estart ,'%Y%m%d') = date_format(b.estart ,'%Y%m%d')
where a.status in (1,2) and a.ischanged =0
<isNotNull property="userno">and a.userno = #userno#</isNotNull>
</select>
<select id="lect.lectinning.new" parameterClass="hashtable" resultClass="data">
select a.logno longval
,a.lectno intval,a.cmino intval2,max(a.intval+a.intval2) intval3
,a.strval,a.strval2,a.intval3 intval4
from(
select a.logno,a.lectno,a.cmino
,case when b.edate &lt; <include refid="sql.now"></include> then 0 else case when a.stime = a.etime then 1 else 0 end end intval
,case when b.edate &lt; <include refid="sql.now"></include> then 0 else case when (timestampdiff(second,a.stime,a.etime)%300) = 0 then 1 else 0 end end intval2
,c.cname strval,d.ititle strval2,d.iseq intval3
from lectinningpage a
inner join lect b on b.lectno = a.lectno
inner join cm c on c.cmno = b.cmno
inner join cminning d on d.cmino = a.cmino
where b.userno = #userno#
order by a.cdt desc
limit 1
) a
</select>
</statements> </statements>
</sqlMap> </sqlMap>

35
Dao/MyBatis/Maps/Pay.xml
View File

@ -530,7 +530,7 @@
<select id="pay.mypayitems" parameterClass="hashtable" resultClass="payitem"> <select id="pay.mypayitems" parameterClass="hashtable" resultClass="payitem">
select a.payno,a.isgroup,a.pstatus ppstatus,a.rstatus prstatus select a.payno,a.isgroup,a.pstatus ppstatus,a.rstatus prstatus
,b.pino,b.ptype,b.pcno,b.itemno,b.userno,b.pstatus,b.rstatus,b.isrebate ,b.pino,b.ptype,b.pcno,b.itemno,b.userno,b.pstatus,b.rstatus,b.isrebate
,c.cname,c.classno,c.rstime,c.retime,c.sstime,c.setime,c.cshape,c.isrefund ,c.cname,c.classno,c.rstime,c.retime,c.sstime,c.setime,c.cshape,c.isrefund,c.studydays
,cc.cname studyplacename ,cc.cname studyplacename
,d.tyear,d.tseq ,d.tyear,d.tseq
,u.username ,u.username
@ -539,7 +539,7 @@
,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email ,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email
,case when max(e.rfdno) &gt; 0 then 1 else 0 end rfdstatus ,case when max(e.rfdno) &gt; 0 then 1 else 0 end rfdstatus
,lect.cmisno ,lect.cmisno
,cmis.estart cmiestart,cmis.eend cmieend ,a.cdt,cmis.estart cmiestart,cmis.eend cmieend
,case when lect.sdate is null then c.sstime else lect.sdate end as sdate ,case when lect.sdate is null then c.sstime else lect.sdate end as sdate
,case when lect.edate is null then c.setime else lect.edate end as edate ,case when lect.edate is null then c.setime else lect.edate end as edate
,case when b.pstatus = 1 then 99 else b.pstatus end as sortpstatus ,case when b.pstatus = 1 then 99 else b.pstatus end as sortpstatus
@ -708,8 +708,10 @@
,a2.taxno ,a2.taxno
,case when t.sdate is null then c0.sstime else t.sdate end as sdate ,case when t.sdate is null then c0.sstime else t.sdate end as sdate
,case when t.edate is null then c0.setime else t.edate end as edate ,case when t.edate is null then c0.setime else t.edate end as edate
,p.cdt,csd.estart
,c0.studydays ,c0.studydays
from payitem a from payitem a
inner join pay p on p.payno = a.payno
left outer join paytax a3 on a3.payno = a.payno and (a3.iscancel is null or a3.iscancel &lt;&gt; 1) left outer join paytax a3 on a3.payno = a.payno and (a3.iscancel is null or a3.iscancel &lt;&gt; 1)
left outer join paytaxitem a2 on a2.pino=a.pino and a3.taxno = a2.taxno left outer join paytaxitem a2 on a2.pino=a.pino and a3.taxno = a2.taxno
left outer join cm c0 on a.ptype in (0,1,4) and c0.cmno=a.itemno left outer join cm c0 on a.ptype in (0,1,4) and c0.cmno=a.itemno
@ -720,6 +722,7 @@
left outer join comcode uc on uc.ccode=u.ccposition left outer join comcode uc on uc.ccode=u.ccposition
left outer join cmrs rs on rs.cmno=c0.cmno and rs.rstype=1 and rs.isdel=0 left outer join cmrs rs on rs.cmno=c0.cmno and rs.rstype=1 and rs.isdel=0
left outer join lect t on a.ptype in (0,1,4) and t.cmno=c0.cmno and t.payno=a.payno and t.pino=a.pino and t.userno=a.userno left outer join lect t on a.ptype in (0,1,4) and t.cmno=c0.cmno and t.payno=a.payno and t.pino=a.pino and t.userno=a.userno
left outer join cminningscd csd on csd.cmisno = t.cmisno
where a.payno=#payno# where a.payno=#payno#
</select> </select>
<select id="pay.mypayrfd" parameterClass="long" resultClass="payrfd"> <select id="pay.mypayrfd" parameterClass="long" resultClass="payrfd">
@ -734,10 +737,12 @@
<select id="pay.mypayrfdinfo" parameterClass="long" resultClass="payrfd"> <select id="pay.mypayrfdinfo" parameterClass="long" resultClass="payrfd">
select select
a.rfdno,a.payno,a.rtext,a.bankname a.rfdno,a.payno,a.rtext,a.bankname
,b.ptype
,CAST(AES_DECRYPT(UNHEX(a.bankno), <include refid="sql.digest"></include>) AS char) bankno ,CAST(AES_DECRYPT(UNHEX(a.bankno), <include refid="sql.digest"></include>) AS char) bankno
,CAST(AES_DECRYPT(UNHEX(a.rphone), <include refid="sql.digest"></include>) AS char) rphone ,CAST(AES_DECRYPT(UNHEX(a.rphone), <include refid="sql.digest"></include>) AS char) rphone
,a.bankowner,a.isowner,a.rstatus,a.statustime,a.ramt,a.rreason,a.ruser,a.fgnor,a.fgnob,a.rback,a.cdt,a.udt,a.cno,a.uno,a.uip ,a.bankowner,a.isowner,a.rstatus,a.statustime,a.ramt,a.rreason,a.ruser,a.fgnor,a.fgnob,a.rback,a.cdt,a.udt,a.cno,a.uno,a.uip
from payrfd a from payrfd a
left outer join pay b on b.payno = a.payno
<dynamic prepend="where"> <dynamic prepend="where">
<isNotNull property="payno" prepend="and">a.payno=#payno#</isNotNull> <isNotNull property="payno" prepend="and">a.payno=#payno#</isNotNull>
<isNotNull property="withoutrstatus" prepend="and">a.rstatus not in($withoutrstatus$)</isNotNull> <isNotNull property="withoutrstatus" prepend="and">a.rstatus not in($withoutrstatus$)</isNotNull>
@ -887,6 +892,16 @@
update pay update pay
set pstatus=1,isunpay=1,udt=now(),uno=#uno#,uip=#uip# set pstatus=1,isunpay=1,udt=now(),uno=#uno#,uip=#uip#
where payno=#payno# and pstatus=22 and ptype=3 and ispg=1 <!--and paylimit &lt; now()--> and isunpay is null; where payno=#payno# and pstatus=22 and ptype=3 and ispg=1 <!--and paylimit &lt; now()--> and isunpay is null;
update lect a
inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno
set
a.sdate = case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' and b.cshape &lt;&gt; 1 then date_format(<include refid="sql.now"></include>,'%Y-%m-%d 00:00:00')
else b.sstime end,
a.edate = case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' and b.cshape &lt;&gt; 1 then date_format(date_add(<include refid="sql.now"></include>,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime end
where a.payno = #payno# and c.pstatus = 1;
</update> </update>
<update id="pay.abspay" parameterClass="hashtable"> <update id="pay.abspay" parameterClass="hashtable">
update examuser a update examuser a
@ -925,6 +940,16 @@
update pay update pay
set isunpay=2,payoktime=#payoktime#,udt=now(),uno=#uno#,uip=#uip# set isunpay=2,payoktime=#payoktime#,udt=now(),uno=#uno#,uip=#uip#
where payno=#payno# and isunpay=1; where payno=#payno# and isunpay=1;
update lect a
inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno
set
a.sdate = case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' and b.cshape &lt;&gt; 1 then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end,
a.edate = case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' and b.cshape &lt;&gt; 1 then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime end
where a.payno = #payno# and c.pstatus = 1;
</update> </update>
<select id="pay.pplogs" parameterClass="hashtable" resultClass="pplog"> <select id="pay.pplogs" parameterClass="hashtable" resultClass="pplog">
select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,CAST(AES_DECRYPT(UNHEX(a.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,a.rbankowner,a.isaccommodation,a.cshape,a.isreceipt,a.taxdatereq select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,CAST(AES_DECRYPT(UNHEX(a.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,a.rbankowner,a.isaccommodation,a.cshape,a.isreceipt,a.taxdatereq
@ -933,15 +958,15 @@
,b.isbill ,b.isbill
,a.asname, a.ceoname, a.brno, a.btype, a.bkind, a.mname, a.post, a.address1, a.address2, a.eino ,a.asname, a.ceoname, a.brno, a.btype, a.bkind, a.mname, a.post, a.address1, a.address2, a.eino
,CAST(AES_DECRYPT(UNHEX(a.mphone), <include refid="sql.digest"></include>) AS char) mphone ,CAST(AES_DECRYPT(UNHEX(a.mphone), <include refid="sql.digest"></include>) AS char) mphone
,CAST(AES_DECRYPT(UNHEX(a.taxemail), <include refid="sql.digest"></include>) AS char) taxemail ,CAST(AES_DECRYPT(UNHEX(a.taxemail), <include refid="sql.digest"></include>) AS char) taxemail
,b.cdt
from pplog a from pplog a
inner join cm a2 on a2.cmno=a.cmno inner join cm a2 on a2.cmno=a.cmno
left outer join pay b on b.pplno=a.pplno left outer join pay b on b.pplno=a.pplno
<dynamic prepend="where"> <dynamic prepend="where">
<isNotNull property="pplno" prepend="and">a.pplno=#pplno#</isNotNull> <isNotNull property="pplno" prepend="and">a.pplno=#pplno#</isNotNull>
<isNotNull property="userno" prepend="and">a.userno=#userno#</isNotNull> <isNotNull property="userno" prepend="and">a.userno=#userno#</isNotNull>
<isNotNull property="istax" prepend="and">b.pstatus &gt; 0</isNotNull> </dynamic>
</dynamic>
</select> </select>
<select id="pay.payresult" parameterClass="hashtable" resultClass="payitem"> <select id="pay.payresult" parameterClass="hashtable" resultClass="payitem">
select a.payno,a.payamt,a.ptype,a.pstatus select a.payno,a.payamt,a.ptype,a.pstatus

32
Dao/MyBatis/Maps/User.xml
View File

@ -11,6 +11,7 @@
<typeAlias alias="assignman" type="NP.Model.AssignMan, NP.Model" /> <typeAlias alias="assignman" type="NP.Model.AssignMan, NP.Model" />
<typeAlias alias="users.lect" type="NP.Model.Lect, NP.Model" /> <typeAlias alias="users.lect" type="NP.Model.Lect, NP.Model" />
<typeAlias alias="councel" type="NP.Model.Councel, NP.Model" /> <typeAlias alias="councel" type="NP.Model.Councel, NP.Model" />
<typeAlias alias="data" type="NP.Model.Data, NP.Model" />
</alias> </alias>
<cacheModels> <cacheModels>
@ -83,7 +84,8 @@
from ( from (
select a.asno,a.astype,a.asctg,a.askey,a.brno,a.ismain select a.asno,a.astype,a.asctg,a.askey,a.brno,a.ismain
,a.asname,a.asno value,a.asname text,a.isjoin,a.joinyear,a.joinprice,a.ascode,a.joindate ,a.asname,a.asno value,a.asname text,a.isjoin,a.joinyear,a.joinprice,a.ascode,a.joindate
,year(a.joindate) joindateyear, a.exitdate,a.aday,a.status,a.ceoname <!--,case when a.joindate is not null then year(a.joindate) else null end joindateyear-->
, a.exitdate,a.aday,a.status,a.ceoname
$excel1$ $excel1$
,a.address1,a.address2,concat(a.address1, a.address2) adr1,a.grno,a.btype,a.bkind,a.salesamount,a.homeurl,a.mcount ,a.address1,a.address2,concat(a.address1, a.address2) adr1,a.grno,a.btype,a.bkind,a.salesamount,a.homeurl,a.mcount
,a.fgnobno,a.fgnobank,a.issite ,a.fgnobno,a.fgnobank,a.issite
@ -94,17 +96,20 @@
,a.cdt ,a.cdt
,c.fdate ,c.fdate
,case when c.status = 1 then 1 else 0 end fstatus ,case when c.status = 1 then 1 else 0 end fstatus
,case when c.fyear=year(now()) then c.status else c.status end fnstatus <!--,case when c.fyear=year(now()) then c.status else c.status end fnstatus-->
,case when c.fyear=year(now()) then c.fprice else 0 end fnprice <!--,case when c.fyear=year(now()) then c.fprice else 0 end fnprice-->
,c1.cname astypename,c2.cname asctgname,c3.cname askeyname ,c1.cname astypename,c2.cname asctgname,c3.cname askeyname
,f.fileno,f.orgname
,row_number() over(order by $orderby$) rno ,row_number() over(order by $orderby$) rno
,count(a.cdt) over() pagetotalcount ,count(a.cdt) over() pagetotalcount
from ( from (
select distinct a.asno select distinct a.asno
from assign a from assign a
left outer join assignman b on b.asno=a.asno and b.isdel=0 and b.mname = ifnull(#mname#, 'xx박효동 xx') left outer join assignman b on b.asno=a.asno and b.isdel=0 and b.mname = ifnull(#mname#, 'xx박효동 xx')
left outer join users c on c.asno = a.asno
where a.isdel=0 where a.isdel=0
<isNotNull property="asno" prepend="and">a.asno=#asno#</isNotNull> <isNotNull property="userno" prepend="and">c.userno=#userno#</isNotNull>
<isNotNull property="asno" prepend="and">a.asno=#asno#</isNotNull>
<isNotNull property="status" prepend="and">a.status=#status#</isNotNull> <isNotNull property="status" prepend="and">a.status=#status#</isNotNull>
<isNotNull property="statuses" prepend="and">a.status in ($statuses$)</isNotNull> <isNotNull property="statuses" prepend="and">a.status in ($statuses$)</isNotNull>
<isNotNull property="asname" prepend="and">a.asname like concat('%',#asname#,'%')</isNotNull> <isNotNull property="asname" prepend="and">a.asname like concat('%',#asname#,'%')</isNotNull>
@ -128,6 +133,7 @@
) b ) b
inner join assign a on a.asno=b.asno inner join assign a on a.asno=b.asno
left outer join assignfee c on c.asno=a.asno <isNull property="fyear">and c.fyear=0</isNull> <isNotNull property="fyear">and c.fyear=#fyear#</isNotNull> and c.asno &gt;0 left outer join assignfee c on c.asno=a.asno <isNull property="fyear">and c.fyear=0</isNull> <isNotNull property="fyear">and c.fyear=#fyear#</isNotNull> and c.asno &gt;0
left outer join fileinfo f on f.fgno = a.fgnobno
left outer join comcode c1 on c1.ccode=a.astype left outer join comcode c1 on c1.ccode=a.astype
left outer join comcode c2 on c2.ccode=a.asctg left outer join comcode c2 on c2.ccode=a.asctg
left outer join comcode c3 on c3.ccode=a.askey left outer join comcode c3 on c3.ccode=a.askey
@ -270,6 +276,9 @@
<isNotEmpty property="mobile" prepend="and"> <isNotEmpty property="mobile" prepend="and">
CAST(AES_DECRYPT(UNHEX(a.mobile), <include refid="sql.digest"></include>) AS char) like concat('%',#mobile#,'%') CAST(AES_DECRYPT(UNHEX(a.mobile), <include refid="sql.digest"></include>) AS char) like concat('%',#mobile#,'%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="userpno" prepend="and">
CAST(AES_DECRYPT(UNHEX(a.userpno), <include refid="sql.digest"></include>) AS char) like concat('%',#userpno#,'%')
</isNotEmpty>
<isNotNull property="usertypeover" prepend="and">a.usertype &gt; #usertypeover#</isNotNull> <isNotNull property="usertypeover" prepend="and">a.usertype &gt; #usertypeover#</isNotNull>
<isNotNull property="vssn" prepend="and">a.vssn = #vssn#</isNotNull> <isNotNull property="vssn" prepend="and">a.vssn = #vssn#</isNotNull>
<isNotNull property="di" prepend="and">a.di = #di#</isNotNull> <isNotNull property="di" prepend="and">a.di = #di#</isNotNull>
@ -714,6 +723,7 @@
inner join users c on c.userno = a.cno inner join users c on c.userno = a.cno
left outer join comcode b on b.ccode = a.bldgcat left outer join comcode b on b.ccode = a.bldgcat
where a.userno = #userno# and a.isdel = 0 where a.userno = #userno# and a.isdel = 0
order by a.cdt desc
</select> </select>
<insert id="councel.in" parameterClass="hashtable"> <insert id="councel.in" parameterClass="hashtable">
@ -735,6 +745,20 @@
,isdel = 1 ,isdel = 1
where bno = #bno# where bno = #bno#
</update> </update>
<update id="users.up.asno" parameterClass="hashtable">
update users set <include refid="sql.up"></include>
,asno =#asno#
where userno=#userno#
</update>
<select id="assign.assings3" parameterClass="hashtable" resultClass="data">
select a.asno intval,a.fgnobno longval
from assign a
left outer join users b on b.asno = a.asno
where a.isdel=0
<isNotNull property="userno" prepend="and">b.userno=#userno#</isNotNull>
</select>
</statements> </statements>
</sqlMap> </sqlMap>

9
FO/Controllers/CDMSController.cs
View File

@ -17,6 +17,7 @@ namespace NP.FO.Controllers
vm.pseq = 1; vm.pseq = 1;
vm.istaste = 1; vm.istaste = 1;
vm.status = 1; vm.status = 1;
vm.ErrLi = new Data() { };
if (vm.cmino < 1 && vm.ctno < 1) if (vm.cmino < 1 && vm.ctno < 1)
{ {
vm.status = 0; vm.status = 0;
@ -108,6 +109,14 @@ namespace NP.FO.Controllers
{ {
Logger.Error("ExamStart Get UserAgent Info Error" + ex.StackTrace); Logger.Error("ExamStart Get UserAgent Info Error" + ex.StackTrace);
} }
var li = Dao.Get<Data>("lect.lectinning.new", new Hashtable() {{ "userno", SUserInfo.UserNo } }).FirstOrDefault();
vm.ErrLi = new Data() { };
//longval:logno,intval:lectno,intval2:cmino,intval3:maxcnt
if(li.intval3 > 0 && li.intval2 != vm.cmino)
{
vm.ErrLi = li;
return View("ViewTaste", vm);
}
vm.lip = new LectInningPage() vm.lip = new LectInningPage()
{ {
lectno = vm.lectno, lectno = vm.lectno,

2
FO/Controllers/CourseController.cs
View File

@ -817,7 +817,7 @@ namespace NP.FO.Controllers
} }
else if (typemanName.Contains("발주청기술인")) else if (typemanName.Contains("발주청기술인"))
{ {
vm.ComCodes3 = vm.ComCodes3.Where(x => x.cname == "최초교육").ToList(); vm.ComCodes3 = vm.ComCodes3.Where(x => x.cname == "기본교육" || x.cname == "최초교육").ToList();
vm.ComCodes5 = vm.ComCodes5.Where(x => x.cname != "품질관리").ToList(); vm.ComCodes5 = vm.ComCodes5.Where(x => x.cname != "품질관리").ToList();
} }
else else

19
FO/Controllers/FOBaseController.cs
View File

@ -325,7 +325,8 @@ namespace NP.FO.Controllers
} }
else else
{ {
sbmauth.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><span></span><ul>", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl)); //sbmauth.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><span></span><ul>", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl));
sbmauth.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" style=\"cursor:default;\">{0}</a><span></span><ul>", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl));
} }
if (m.usertype == 0) if (m.usertype == 0)
{ {
@ -335,7 +336,8 @@ namespace NP.FO.Controllers
} }
else else
{ {
sbm.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><span></span><ul>", m.pagename, m.pno, menu.pno, menu.pagetype, menu.pageurl)); //sbm.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><span></span><ul>", m.pagename, m.pno, menu.pno, menu.pagetype, menu.pageurl));
sbm.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" style=\"cursor:default;\">{0}</a><span></span><ul>", m.pagename, m.pno, menu.pno, menu.pagetype, menu.pageurl));
} }
} }
@ -657,7 +659,7 @@ namespace NP.FO.Controllers
if (vm.Pay.ptype == 3) { if (vm.Pay.ptype == 3) {
try try
{ {
vm.PPLog = Dao.Get<PPLog>("pay.pplogs", new Hashtable() { { "pplno", vm.pplno }, { "userno", SUserInfo.UserNo },{"istax",1 } }).FirstOrDefault(); vm.PPLog = Dao.Get<PPLog>("pay.pplogs", new Hashtable() { { "pplno", vm.pplno }, { "userno", SUserInfo.UserNo } }).OrderByDescending(w=>w.cdt).FirstOrDefault();
if (payno > 0 && vm.PPLog != null && vm.PPLog.pstatus == 22 && vm.PPLog.isbill == 1) if (payno > 0 && vm.PPLog != null && vm.PPLog.pstatus == 22 && vm.PPLog.isbill == 1)
{ {
PayTax payTax = new PayTax(); PayTax payTax = new PayTax();
@ -665,10 +667,13 @@ namespace NP.FO.Controllers
payTax.uip = GetUserIP(); payTax.uip = GetUserIP();
if (Dao.Get<PayTax>("cr.paytaxes", new Hashtable() { { "payno", payTax.payno }, { "cno", SUserInfo.UserNo }, { "iscancel", 0 } }).Count() == 0) if (Dao.Get<PayTax>("cr.paytaxes", new Hashtable() { { "payno", payTax.payno }, { "cno", SUserInfo.UserNo }, { "iscancel", 0 } }).Count() == 0)
{ {
var assign = Dao.Get<Assign>("users.assigns2", new System.Collections.Hashtable() { { "asno", SUserInfo.ASNo }, { "orderby", "a.asname" } }).FirstOrDefault(); var afgnobno = Dao.Get<Data>("assign.assings3", new Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault();
if(assign != null) if(afgnobno != null)
{ {
payTax.fgno = assign.fgnobno; if (afgnobno.longval > 0)
{
payTax.fgno = afgnobno.longval;
}
} }
payTax.payno = payno; payTax.payno = payno;
payTax.pinos = string.Join(",", vm.PayItems.Select(s => s.pino)); payTax.pinos = string.Join(",", vm.PayItems.Select(s => s.pino));
@ -695,7 +700,7 @@ namespace NP.FO.Controllers
} }
catch (Exception exresult) catch (Exception exresult)
{ {
SetError(cancelMsg += "|세금계산서신청처리|" + exresult.StackTrace); SetError(cancelMsg += "|세금계산서신청처리|"+exresult.Message+"|" + exresult.StackTrace);
} }
} }
#endregion #endregion

5
FO/Controllers/MyController.cs
View File

@ -429,12 +429,13 @@ namespace NP.FO.Controllers
{ {
vm.FileList = GetFiles(vm.Assign.fgnobno.Value); vm.FileList = GetFiles(vm.Assign.fgnobno.Value);
} }
return View(vm);
} }
else else
{ {
return Redirect("/"); vm.Assign = new Assign() { };
//return Redirect("/");
} }
return View(vm);
} }
public ActionResult Document(VMMy vm) public ActionResult Document(VMMy vm)

2
FO/Spring/ControllersStaging.xml
View File

@ -7,7 +7,7 @@
<!--<property name="Sms" ref="objSms" />--> <!--<property name="Sms" ref="objSms" />-->
<property name="TopMenuNo" value="2" /> <property name="TopMenuNo" value="2" />
<property name="PageRowCount" value="10" /> <property name="PageRowCount" value="10" />
<property name="MainSubDomain" value="ynicte" /> <property name="MainSubDomain" value="www" />
<property name="IsDupCheck" value="1" /> <property name="IsDupCheck" value="1" />
</object> </object>

3
FO/Views/Account/IndexAssign.cshtml
View File

@ -99,7 +99,8 @@
<li><a href="/Account/JoinTSel">회원가입</a></li> <li><a href="/Account/JoinTSel">회원가입</a></li>
</ul> </ul>
@*<ul class="lgnSns"> @*<div id="naverIdLogin" style="display:none"></div>
<ul class="lgnSns">
<li><a href="#">네이버 아이디로 로그인</a></li> <li><a href="#">네이버 아이디로 로그인</a></li>
<li><a href="#">카카오톡 아이디로 로그인</a></li> <li><a href="#">카카오톡 아이디로 로그인</a></li>
<li><a href="#">구글 아이디로 로그인</a></li> <li><a href="#">구글 아이디로 로그인</a></li>

2
FO/Views/Account/IndexBase.cshtml
View File

@ -29,7 +29,7 @@
<br /> <br />
<div id="naverIdLogin" style="display:none"></div> <div id="naverIdLogin" style="display:none"></div>
<ul class="lgnSns" style="display:none"> <ul class="lgnSns">
<li> <li>
<a href="javascript:loginWithNaver()">네이버 아이디로 로그인</a> <a href="javascript:loginWithNaver()">네이버 아이디로 로그인</a>
</li> </li>

34
FO/Views/CDMS/Contents.cshtml
View File

@ -5,7 +5,7 @@
<div id="player"> <div id="player">
<div class="plyTop"> <div class="plyTop">
<h1>콘텐츠 플레이어</h1> <h1>콘텐츠 플레이어</h1>
<a href="#" onclick="javascript:window.close();">닫기</a> <a href="#" onclick="closestudy()">닫기</a>
</div> </div>
<div class="plyTitle"> <div class="plyTitle">
<h3>@(Model.CMInning.iseq)회. @Model.CMInning.ititle</h3> <h3>@(Model.CMInning.iseq)회. @Model.CMInning.ititle</h3>
@ -109,7 +109,7 @@
var _mtime = @Model.CMInning.mtime; var _mtime = @Model.CMInning.mtime;
var _ctype = @Model.CMInning.ctype; var _ctype = @Model.CMInning.ctype;
//var hasurlmp4 = @(hasurlmp4?1:0) == 1; //var hasurlmp4 = @(hasurlmp4?1:0) == 1;
var _logtime = 10; var _logtime = 300;
var _mtimesec = 0; var _mtimesec = 0;
var _loging = false; var _loging = false;
var _isload = false; var _isload = false;
@ -122,10 +122,10 @@
} }
} }
function closestudy() { function closestudy() {
if (@Model.istaste != 1 && !_islogout) { if (@Model.istaste != 1 && !_islogout) {
golog(false, true, false, true); golog(false, true, false, true);
_passunload = true; _passunload = true;
} }
self.close(); self.close();
} }
$(window).load(function () { $(window).load(function () {
@ -176,7 +176,7 @@
if (($("#video1").attr("src") || "") != "") { if (($("#video1").attr("src") || "") != "") {
_passunload = true; _passunload = true;
clearInterval(_timerlog); clearInterval(_timerlog);
msg("콘텐츠를 학습할 수 없는 상태입니다. 운영자에게 문의해주세요.", null, null, null, "self.close()", 3000); msg("콘텐츠를 학습할 수 없는 상태입니다. 운영자에게 문의해주세요.", null, null, null, "goclose()", 3000);
} }
}); });
if (ismobile()) { if (ismobile()) {
@ -293,7 +293,7 @@
} else { } else {
_passunload = true; _passunload = true;
clearInterval(_timerlog); clearInterval(_timerlog);
msg("콘텐츠를 학습할 수 없는 상태입니다. 운영자에게 문의해주세요...", null, null, null, "self.close()", 3000); msg("콘텐츠를 학습할 수 없는 상태입니다. 운영자에게 문의해주세요...", null, null, null, "goclose()", 3000);
} }
} }
}); });
@ -360,7 +360,7 @@
//} //}
} }
function golog(ispaging, isunload, isinning, sync) { function golog(ispaging, isunload, isinning, sync) {
ispaging = ispaging || false; ispaging = ispaging || false;
isunload = isunload || false; isunload = isunload || false;
isinning = isinning || false; isinning = isinning || false;
@ -368,7 +368,7 @@
_tsec++; _tsec++;
if (!ispaging && !isunload && !isinning) { if (!ispaging && !isunload && !isinning) {
_sec++; _sec++;
} }
if (_mtimesec > 0) { if (_mtimesec > 0) {
_mtimesec++; _mtimesec++;
if (_mtimesec > 10) { if (_mtimesec > 10) {
@ -412,7 +412,7 @@
} }
} }
} }
msg("중간출석 확인 메시지입니다. 10초안에 확인을 눌러주세요.", null, null, null, "okmid()"); msg("중간출석 확인 메시지입니다. 10초안에 확인을 눌러주세요.", null, null, null, "okmid()");
} }
} }
function okmid() { function okmid() {
@ -540,7 +540,7 @@
window.onbeforeunload = function () { window.onbeforeunload = function () {
if (!_passunload && @Model.istaste != 1 && !_islogout) { if (!_passunload && @Model.istaste != 1 && !_islogout) {
clearInterval(_timerlog); clearInterval(_timerlog);
golog(false, true, false, false); golog(false, true, false, false);
} }
if (opener) { if (opener) {
opener.location.href = opener.location.href.replace(/#/gi, ''); opener.location.href = opener.location.href.replace(/#/gi, '');
@ -605,7 +605,17 @@
result = -1; result = -1;
} }
} }
}); });
return result; return result;
} }
function goclose() {
if (@Model.istaste != 1 && !_islogout) {
capp("/focommon/studyclose", { logno: _logno, issample : @Model.istaste}, "cbgoclose", null, null, true, null, true, null, true);
}
self.close();
}
function cbgoclose(){
_passunload = true;
self.close();
}
</script> </script>

7
FO/Views/CDMS/ViewTaste.cshtml
View File

@ -17,9 +17,12 @@
@section scripts{ @section scripts{
<script> <script>
$(document).ready(function () { $(document).ready(function () {
if (@Model.status == 0) { if (@Model.ErrLi.longval > 0 ) {
msg("진행중인 학습회차가 존재합니다. 해당회차 완료후 진행해주세요.<br/><br/>과목명 : @(Model.ErrLi.strval)<br/>회차명 : @(Model.ErrLi.intval4)회. @(Model.ErrLi.strval2)", null, null, null, "self.close()", 3000);
}
else if (@Model.status == 0) {
self.close(); self.close();
} }
}); });
</script> </script>
} }

14
FO/Views/CRoom/Exam.cshtml
View File

@ -336,7 +336,14 @@
capp("/fcommon/saveexam", { lectno: @Model.croomlectno, isbackup: true, estno: @Model.estno, savedata: sd.substr(1), issubmit: 0, qnos: '@(string.Join(",", Model.UserExamDatas.Select(s=>s.qno)))', cblock: getint(cblock) }, "cbsave2"); capp("/fcommon/saveexam", { lectno: @Model.croomlectno, isbackup: true, estno: @Model.estno, savedata: sd.substr(1), issubmit: 0, qnos: '@(string.Join(",", Model.UserExamDatas.Select(s=>s.qno)))', cblock: getint(cblock) }, "cbsave2");
} }
function cbsave2() { function cbsave2() {
msg("임시저장했습니다."); if (capResult.code == 1000 && capResult.obj == -44) {
msg("시험진행 중 재응시 처리되었습니다. 재응시를 진행해주세요.");
setTimeout(function () {
openerrefresh();
}, 1000);
} else {
msg("임시저장했습니다.");
}
} }
var _absalertclose = true; var _absalertclose = true;
function cbsave() { function cbsave() {
@ -345,6 +352,11 @@
setTimeout(function () { setTimeout(function () {
openerrefresh(); openerrefresh();
}, 1000); }, 1000);
} else if (capResult.code == 1000 && capResult.obj == -44) {
msg("시험진행 중 재응시 처리되었습니다. 재응시를 진행해주세요.");
setTimeout(function () {
openerrefresh();
}, 1000);
} }
else if (capResult.code == 1000 && capResult.obj < 1 && _issubmit) { else if (capResult.code == 1000 && capResult.obj < 1 && _issubmit) {
msg("시험제출 시간 초과되어 제출하지 못했습니다."); msg("시험제출 시간 초과되어 제출하지 못했습니다.");

12
FO/Views/CRoom/Index.cshtml
View File

@ -117,17 +117,21 @@
else else
{ {
<dl> <dl>
<dt>@(d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt> <dt>@(d.edate < DateTime.Now ? "학습기간종료" : d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt>
<dd><span>@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "강의기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dd> <dt style="color:#888888"><span style="color:red;">@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) :d.cshape != 1 ? d.cdt.ToString("MM/dd")+" ~ "+d.estart.ToString("MM/dd") : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dt>
@if(d.cshape != 1 && d.isonline == 1)
{
<dd><span>복습기간</span> : @(d.edate.AddYears(1).ToString("yy-MM-dd"))</dd>
}
@if (d.isonline == 0) @if (d.isonline == 0)
{ {
if (d.cshape != 2) if (d.cshape != 2)
{ {
<dd style="margin-left:10px;"><span style="color:#222">강의실</span> : @(d.icontent ?? "-")</dd> <dd><span style="color:#222">강의실</span> : @(d.icontent ?? "-")</dd>
} }
else else
{ {
<dd style="margin-left:10px;"><span style="color:#222">장소</span> : @(d.cname ?? "-")</dd> <dd><span style="color:#222">장소</span> : @(d.cname ?? "-")</dd>
} }
} }
</dl> </dl>

30
FO/Views/CRoom/Innings.cshtml
View File

@ -2,9 +2,9 @@
@{ @{
} }
<div class="lrnSch"> @*<div class="lrnSch">
<a href="#" onclick="showatt()">출결이력조회</a> <a href="#" onclick="showatt()">출결이력조회</a>
</div> </div>*@
<div class="lctcWeek lrnList"> <div class="lctcWeek lrnList">
<input type="hidden" id="mobile" name="mobile" value="@(ViewBag.Mobile)" /> <input type="hidden" id="mobile" name="mobile" value="@(ViewBag.Mobile)" />
<table> <table>
@ -22,17 +22,21 @@
else else
{ {
<dl> <dl>
<dt>@(d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt> <dt>@(d.edate < DateTime.Now ? "학습기간종료" : d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt>
<dd><span>@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "강의기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dd> <dt style="color:#888888"><span style="color:red;">@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : d.cshape != 1 ? (d.cdt.ToString("MM/dd")+" ~ "+d.estart.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dt>
@if(d.cshape != 1 && d.isonline == 1)
{
<dd><span>복습기간</span> : @(d.edate.AddYears(1).ToString("yy-MM-dd"))</dd>
}
@if (d.isonline == 0) @if (d.isonline == 0)
{ {
if (d.cshape != 2) if (d.cshape != 2)
{ {
<dd style="margin-left:10px;"><span style="color:#222">강의실</span> : @(d.icontent ?? "-")</dd> <dd><span style="color:#222">강의실</span> : @(d.icontent ?? "-")</dd>
} }
else else
{ {
<dd style="margin-left:10px;"><span style="color:#222">장소</span> : @(d.cname ?? "-")</dd> <dd><span style="color:#222">장소</span> : @(d.cname ?? "-")</dd>
} }
} }
</dl> </dl>
@ -182,9 +186,13 @@
function cbchkcontent() { function cbchkcontent() {
if (capResult.code == 1000) { if (capResult.code == 1000) {
if (capResult.obj == 1) { if (capResult.obj == 1) {
viewcontents(_cmino, false,@Model.croomlectno); msg("학습을 시작합니다.", null, null, null, "viewcontents("+_cmino+",false,@(Model.croomlectno))");
return false;
//viewcontents(_cmino, false,@Model.croomlectno);
} else if (capResult.obj == 2) { } else if (capResult.obj == 2) {
viewcontents(_cmino, false,@Model.croomlectno); msg("학습을 시작합니다.", null, null, null, "viewcontents("+_cmino+",false,@(Model.croomlectno))");
return false;
//viewcontents(_cmino, false,@Model.croomlectno);
} else { } else {
_authplatform = capResult.msg; _authplatform = capResult.msg;
if(_authplatform == "0"){ if(_authplatform == "0"){
@ -193,7 +201,7 @@
confirmtoggle(true, "학습을 처음 시작할 때 본인인증이 필요합니다. 본인인증은 회차 당 1회에 한 해 진행됩니다.<br/> 본인인증을 하시겠습니까?", "chkipin()"); confirmtoggle(true, "학습을 처음 시작할 때 본인인증이 필요합니다. 본인인증은 회차 당 1회에 한 해 진행됩니다.<br/> 본인인증을 하시겠습니까?", "chkipin()");
} else if (_authplatform == "2") { } else if (_authplatform == "2") {
confirmtoggle(true, "학습을 처음 시작할 때 본인인증이 필요합니다. 본인인증은 회차 당 1회에 한 해 진행됩니다.<br/> 본인인증을 하시겠습니까?", "chkmobile()"); confirmtoggle(true, "학습을 처음 시작할 때 본인인증이 필요합니다. 본인인증은 회차 당 1회에 한 해 진행됩니다.<br/> 본인인증을 하시겠습니까?", "chkmobile()");
} }
} }
} else { } else {
msg("휴대폰 번호가 공란입니다.<br/>정보수정을 통해 번호를 입력해주세요."); msg("휴대폰 번호가 공란입니다.<br/>정보수정을 통해 번호를 입력해주세요.");
@ -218,7 +226,9 @@
//msg("인증이 성공하였습니다.\n 확인 버튼을 클릭하시면 학습이 가능합니다."); //msg("인증이 성공하였습니다.\n 확인 버튼을 클릭하시면 학습이 가능합니다.");
$("#mobile").css("background", "#ddd"); $("#mobile").css("background", "#ddd");
mobilechkclose(); mobilechkclose();
viewcontents(_cmino, false,@Model.croomlectno); msg("학습을 시작합니다.", null, null, null, "viewcontents("+_cmino+",false,@(Model.croomlectno))");
return false;
//viewcontents(_cmino, false,@Model.croomlectno);
} else if (capResult.code == 1) { } else if (capResult.code == 1) {
msg("유효시간이 만료되었습니다.\n 창을 닫고 인증을 다시 진행해주세요."); msg("유효시간이 만료되었습니다.\n 창을 닫고 인증을 다시 진행해주세요.");
} else { } else {

12
FO/Views/Course/ApplyAgree.cshtml
View File

@ -23,33 +23,33 @@
{ {
if (!isallday) if (!isallday)
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> (@(Model.CM.studytime)시간) | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
} }
else else
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studytime)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
} }
} }
else if (Model.CM.cshape == 1) else if (Model.CM.cshape == 1)
{ {
if (!isallday) if (!isallday)
{ {
<p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> (@(Model.CM.ssretimeToDay)일) | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
} }
else else
{ {
<p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studytime)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
} }
} }
else if (Model.CM.cshape == 2) else if (Model.CM.cshape == 2)
{ {
if (!isallday) if (!isallday)
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> (@(Model.CM.studytime)시간) | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p>
} }
else else
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studytime)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p>
} }
} }
</li> </li>

29
FO/Views/Course/ApplyEdu.cshtml
View File

@ -34,7 +34,7 @@
{ {
if (!isallday) if (!isallday)
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> (@(Model.CM.studytime)시간) | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원</span></label></p>
} }
else else
{ {
@ -45,7 +45,7 @@
{ {
if (!isallday) if (!isallday)
{ {
<p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> (@(Model.CM.ssretimeToDay)일) | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원</span></label></p>
} }
else else
{ {
@ -56,8 +56,7 @@
{ {
if (!isallday) if (!isallday)
{ {
<!--<p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원--> @*※ 집체교육 선택 필수*@<!--</span></label></p>--> <p><label>@(Model.CM.tseq)기 | <span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> (@(Model.CM.studytime)시간) | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원 @*※ 집체교육 선택 필수*@</span></label></p>
<p><label>@(Model.CM.tseq)기 | <span class='gry'>교육종료일(@(Model.CM.setimeymd)) (@(Convert.ToInt32(Model.CM.studytime))시간) </span> | @Model.CM.cname | <span class='red'><span id="spninfee"></span>원 @*※ 집체교육 선택 필수*@</span></label></p>
} }
else else
{ {
@ -570,7 +569,7 @@
function renderScd() { function renderScd() {
var ulScd = $("#ulScd"); var ulScd = $("#ulScd");
ulScd.empty(); ulScd.empty();
var seq = 0; //var seq = 0;
$.each(capResult.obj, function (i, d) { $.each(capResult.obj, function (i, d) {
var li = $("<li />"); var li = $("<li />");
if (d.isEnd == true) if (d.isEnd == true)
@ -584,24 +583,36 @@
li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>"); li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
} }
else { else {
if (seq == 0) { if (d.isselected == 1) {
li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>"); li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
} }
else { else {
li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>"); li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
} }
//if (seq == 0) {
// li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
//}
//else {
// li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
//}
} }
} }
else { else {
if (seq == 0) { if (d.isselected == 1) {
li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "</label>"); li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "</label>");
} }
else { else {
li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "</label>"); li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "</label>");
} }
//if (seq == 0) {
// li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "</label>");
//}
//else {
// li.append("<label><input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "</label>");
//}
} }
} }
seq++; //seq++;
ulScd.append(li); ulScd.append(li);
}); });
@ -670,6 +681,8 @@
$("#historyForm > input[name='isCompany']").val($("input:radio[name='isCompany']:checked").val()); $("#historyForm > input[name='isCompany']").val($("input:radio[name='isCompany']:checked").val());
$("#historyForm").attr("action", "/Course/ApplyAgree"); $("#historyForm").attr("action", "/Course/ApplyAgree");
$("#historyForm").submit(); $("#historyForm").submit();
} else if (capResult.code == -1) {
msg("이미 신청된 교육 중 교육종료일이 같은 교육이 있습니다.<br/> 다른 일정으로 신청해 주시기 바랍니다.");
} else { } else {
msg("저장을 실패하였습니다."); msg("저장을 실패하였습니다.");
} }

16
FO/Views/Course/ApplyPay.cshtml
View File

@ -36,33 +36,33 @@
{ {
if (!isallday) if (!isallday)
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> (@(Model.CM.studytime)시간) | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
} }
else else
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studytime)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
} }
} }
else if (Model.CM.cshape == 1) else if (Model.CM.cshape == 1)
{ {
if (!isallday) if (!isallday)
{ {
<p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
} }
else else
{ {
<p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studytime)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
} }
} }
else if (Model.CM.cshape == 2) else if (Model.CM.cshape == 2)
{ {
if (!isallday) if (!isallday)
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='red'>교육종료일(@(Model.CM.setimeymd)까지)</span> (@(Model.CM.studytime)시간) | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p>
} }
else else
{ {
<p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p> <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studytime)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p>
} }
} }
</li> </li>
@ -109,7 +109,7 @@
<ul class="apyRdo" id="taxinvoice_option" style="display:none;margin-top:-1px"> <ul class="apyRdo" id="taxinvoice_option" style="display:none;margin-top:-1px">
<li><input type="radio" name="isreceipt" id="isreceipt1" value="1" @(Model.PPLog.isreceipt == null ? "checked" : Model.PPLog.isreceipt == 1 ? "checked" : "")/><label for="isreceipt1"> 영수</label></li> <li><input type="radio" name="isreceipt" id="isreceipt1" value="1" @(Model.PPLog.isreceipt == null ? "checked" : Model.PPLog.isreceipt == 1 ? "checked" : "")/><label for="isreceipt1"> 영수</label></li>
<li><input type="radio" name="isreceipt" id="isreceipt0" value="0" @(Model.PPLog.isreceipt == 0 ? "checked" : "") /><label for="isreceipt0"> 청구</label></li> <li><input type="radio" name="isreceipt" id="isreceipt0" value="0" @(Model.PPLog.isreceipt == 0 ? "checked" : "") /><label for="isreceipt0"> 청구</label></li>
<li style="vertical-align:sub;">발행요청일 : <input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="@(Model.PPLog.taxdatereq == null ? "" : Model.PPLog.taxdatereq.Value.ToString("yyyy-MM-dd"))" autocomplete="off" /></li> <li style="vertical-align:sub;">계산서날짜 : <input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="@(Model.PPLog.taxdatereq == null ? "" : Model.PPLog.taxdatereq.Value.ToString("yyyy-MM-dd"))" autocomplete="off" /></li>
</ul> </ul>
</div> </div>
@ -202,7 +202,7 @@
} else if ($("#isbill").val() == 1 && !isCompanyInfo) { } else if ($("#isbill").val() == 1 && !isCompanyInfo) {
msg("계산서 발급 시 회사정보가 필요합니다. 뒤로가기를 클릭하여 회사정보를 입력해주세요."); msg("계산서 발급 시 회사정보가 필요합니다. 뒤로가기를 클릭하여 회사정보를 입력해주세요.");
} else if ($("#isbill").val() == 1 && $("#taxdatereq").val() == "") { } else if ($("#isbill").val() == 1 && $("#taxdatereq").val() == "") {
msg("발행요청일을 입력해주세요."); msg("계산서날짜를 입력해주세요.");
}else { }else {
cap("/fcommon/paystart", "mform", "cbsave"); cap("/fcommon/paystart", "mform", "cbsave");
} }

216
FO/Views/Course/SmartSearch.cshtml
View File

@ -1,107 +1,113 @@
@model NP.Model.VMCourse @model NP.Model.VMCourse
<div class="container"> <div class="container">
<div class="schBox"> <div class="schBox" style="display:none;">
<form id="smartSearchForm" method="post"> <form id="smartSearchForm" method="post">
<input type="hidden" name="cmno" id="cmno" /> <input type="hidden" name="cmno" id="cmno" />
<input type="hidden" name="stringval" id="stringval" value="@Model.stringval" /> <input type="hidden" name="stringval" id="stringval" value="@Model.stringval" />
@if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "") @if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "")
{
<ul class="schTab">
<li id="liTab1" class="current" style="font-size:16pt;"><a href="#">건설기술진흥법교육</a></li>
<li id="liTab2" style="font-size:16pt;display:none;"><a href="#">기타교육</a></li>
</ul>
<ul class="schCont">
<li>
<select name="stringval2" id="stringval2">
@*<option value="0" @(Model.stringval2 == "0" ? "selected" : "")>온라인교육</option>*@
@*<option value="1" @(Model.stringval2 == "1" ? "selected" : "")>교육장교육</option>*@
<option value="2" @(Model.stringval2 == "2" ? "selected" : "")>온라인교육</option>
</select>
</li>
<li>
@*typeman는 데이터가 model.comcodes2임, 수정시 주의할것*@
@Html.DropDownListFor(x => x.stringval3, new SelectList(Model.ComCodes2, "ccode", "cname"), "-선택-")
</li>
<li>
@*typeedu는 데이터가 model.comcodes3임, 수정시 주의할것*@
@Html.DropDownListFor(x => x.stringval4, new SelectList(Model.ComCodes3, "ccode", "cname"), "-선택-")
</li>
<li>
@*typegrade는 데이터가 model.comcodes4임, 수정시 주의할것*@
@Html.DropDownListFor(x => x.stringval5, new SelectList(Model.ComCodes4, "ccode", "cname"), "-선택-")
</li>
<li>
@Html.DropDownListFor(x => x.stringval6, new SelectList(Model.ComCodes5, "ccode", "cname"), "-선택-")
</li>
<li><a href="#" id="btnSearch">검색</a></li>
</ul>
}
else if (Model.stringval == "1")
{
<ul class="schTab">
<li id="liTab1"><a href="#" style="font-size:16pt;">건설기술진흥법교육</a></li>
<li id="liTab2" class="current" style="font-size:16pt;"><a href="#">기타교육</a></li>
</ul>
<ul class="schCont">
<li>
<select name="stringval2" id="stringval2">
@*<option value="0" @(Model.stringval2 == "0" ? "selected" : "")>온라인교육</option>*@
<option value="1" @(Model.stringval2 == "1" ? "selected" : "")>교육장교육</option>
<option value="2" @(Model.stringval2 == "2" ? "selected" : "")>온라인교육</option>
</select>
</li>
<li>
@Html.DropDownListFor(x => x.stringval3, new SelectList(Model.CMsEtc, "cgno", "cgname"), "-선택-")
</li>
<li><a href="#" id="btnSearch">검색</a></li>
</ul>
}
</form>
</div>
<p class="subDsc mt15">본인의 기술인 정보를 모르실 경우에는 아래링크를 클릭하여 정보 확인 후 교육신청을 하여 주시기 바랍니다.</p>
<ul class="smtLnk">
<li><a href="https://homenet.kocea.or.kr:1443" target="_blank">한국건설기술인협회 이동</a></li>
<li><a href="https://www.kira.or.kr" target="_blank">건축사협회 이동</a></li>
</ul>
<input type="hidden" id="hidCmno" />
<ul class="smtList" style="margin-bottom:150px">
@foreach (var item in Model.CMs)
{
<li>
<div class="smtlCont">
<h5><em style="font-size:15px" class="@(item.cshape == 0 ? "org" : item.cshape == 1 ? "grn" : "blu")">@(item.cshape == 0 ? "온라인" : item.cshape == 1 ? "교육장교육" : "온라인교육")</em> <span style="font-size:22px">@item.cname</span></h5>
<ul class="smtlBtn">
<li style="font-size:18px;"><a href="#" class="smtlBtn02" onclick="javascript: getSubCm(@item.cshape, @item.cmno)">조회하기</a></li>
</ul>
</div>
@if (item.cshape == 1)
{ {
<ul class="smtlTab" id="divTab_@item.cmno" style="display:none"> <ul class="schTab">
<li class="current" onclick="javascript:setStudyplace(this,@item.cmno);"><a href="javascript:getSubCm(1, @item.cmno);">전체</a></li> <li id="liTab1" class="current" style="font-size:16pt;"><a href="#">건설기술진흥법교육</a></li>
@foreach (var t in Model.ComCodes) <li id="liTab2" style="font-size:16pt;display:none;"><a href="#">기타교육</a></li>
{ </ul>
<li onclick="javascript:setStudyplace(this,@item.cmno);"><a href="javascript:getSubCm(1, @item.cmno, @t.ccode);">@t.cname 교육장</a></li> <ul class="schCont">
} <li>
<select name="stringval2" id="stringval2">
@*<option value="0" @(Model.stringval2 == "0" ? "selected" : "")>온라인교육</option>*@
@*<option value="1" @(Model.stringval2 == "1" ? "selected" : "")>교육장교육</option>*@
<option value="2" @(Model.stringval2 == "2" ? "selected" : "")>온라인교육</option>
</select>
</li>
<li>
@*typeman는 데이터가 model.comcodes2임, 수정시 주의할것*@
@Html.DropDownListFor(x => x.stringval3, new SelectList(Model.ComCodes2, "ccode", "cname"), "-선택-")
</li>
<li>
@*typeedu는 데이터가 model.comcodes3임, 수정시 주의할것*@
@Html.DropDownListFor(x => x.stringval4, new SelectList(Model.ComCodes3, "ccode", "cname"), "-선택-")
</li>
<li>
@*typegrade는 데이터가 model.comcodes4임, 수정시 주의할것*@
@Html.DropDownListFor(x => x.stringval5, new SelectList(Model.ComCodes4, "ccode", "cname"), "-선택-")
</li>
<li>
@Html.DropDownListFor(x => x.stringval6, new SelectList(Model.ComCodes5, "ccode", "cname"), "-선택-")
</li>
<li><a href="#" id="btnSearch">검색</a></li>
</ul>
}
else if (Model.stringval == "1")
{
<ul class="schTab">
<li id="liTab1"><a href="#" style="font-size:16pt;">건설기술진흥법교육</a></li>
<li id="liTab2" class="current" style="font-size:16pt;"><a href="#">기타교육</a></li>
</ul>
<ul class="schCont">
<li>
<select name="stringval2" id="stringval2">
@*<option value="0" @(Model.stringval2 == "0" ? "selected" : "")>온라인교육</option>*@
<option value="1" @(Model.stringval2 == "1" ? "selected" : "")>교육장교육</option>
<option value="2" @(Model.stringval2 == "2" ? "selected" : "")>온라인교육</option>
</select>
</li>
<li>
@Html.DropDownListFor(x => x.stringval3, new SelectList(Model.CMsEtc, "cgno", "cgname"), "-선택-")
</li>
<li><a href="#" id="btnSearch">검색</a></li>
</ul> </ul>
} }
<ul class="smtlChk" id="ulSubCm_@item.cmno"></ul>
</li>
}
@if (Model.CMs.Count == 0)
{
<li style="border:0px;">
<div style="margin: 0 auto;display: table;text-align: center;">
<p style="font-size: 25px;line-height: 50px;">현재 개설된 과정이 없습니다.</p><p class="subDsc">자세한 사항은 1544-7660으로 문의 하세요.</p>
</div>
</li>
}
</ul>
</div>
<div class="clsPop" id="divIntro" style="display:none">
</form>
</div>
<p class="subDsc mt15">본인의 기술인 정보를 모르실 경우에는 아래링크를 클릭하여 정보 확인 후 교육신청을 하여 주시기 바랍니다.</p>
<ul class="smtLnk">
<li><a href="https://homenet.kocea.or.kr:1443" target="_blank">한국건설기술인협회 이동</a></li>
<li><a href="https://www.kira.or.kr" target="_blank">건축사협회 이동</a></li>
</ul>
<input type="hidden" id="hidCmno" />
<ul class="smtList" style="margin-bottom:150px">
@foreach (var item in Model.CMs)
{
<li>
<div class="smtlCont">
<h5><em style="font-size:15px" class="@(item.cshape == 0 ? "org" : item.cshape == 1 ? "grn" : "blu")">@(item.cshape == 0 ? "온라인" : item.cshape == 1 ? "교육장교육" : "온라인교육")</em> <span style="font-size:22px">@item.cname</span></h5>
<ul class="smtlBtn">
<li style="font-size:18px;"><a href="#" class="smtlBtn02" onclick="javascript: getSubCm(@item.cshape, @item.cmno)">조회하기</a></li>
</ul>
</div>
@if (item.cshape == 1)
{
<ul class="smtlTab" id="divTab_@item.cmno" style="display:none">
<li class="current" onclick="javascript:setStudyplace(this,@item.cmno);"><a href="javascript:getSubCm(1, @item.cmno);">전체</a></li>
@foreach (var t in Model.ComCodes)
{
<li onclick="javascript:setStudyplace(this,@item.cmno);"><a href="javascript:getSubCm(1, @item.cmno, @t.ccode);">@t.cname 교육장</a></li>
}
</ul>
}
<ul class="smtlChk" id="ulSubCm_@item.cmno"></ul>
</li>
}
@if (Model.CMs.Count == 0)
{
<li style="border:0px;">
<div style="margin: 0 auto;display: table;text-align: center;">
<p style="font-size: 25px;line-height: 50px;">현재 개설된 과정이 없습니다.</p><p class="subDsc">자세한 사항은 1544-7660으로 문의 하세요.</p>
</div>
</li>
}
</ul>
<ul class="clsBtn society">
<li style="display:none;"><a href="/" >뒤로가기</a></li>
<li><a href="/" >뒤로가기</a></li>
</ul>
</div>
<div class="clsPop" id="divIntro" style="display:none;">
<div> <div>
<div> <div>
<div class="clsPopWrap"> <div class="clsPopWrap">
@ -117,7 +123,7 @@
<div class="gry"> <div class="gry">
<p>교육분류 : <span id="spnCmKind"></span></p> <p>교육분류 : <span id="spnCmKind"></span></p>
<p>인정시간 : <span class="sky"><span id="spnCmStudyHour"></span></span>시간</p> <p>인정시간 : <span class="sky"><span id="spnCmStudyHour"></span></span>시간</p>
<p>수료기준 : 진도 <span id="spnCmAttend"></span>%, 시험 <span id="spnCmFinal"></span>%</p> <p>수료기준 : 진도 <span id="spnCmAttend"></span>% 이상, 시험 <span id="spnCmFinal"></span>점 이상, 과제 <span id="spnCmSubject"></span>점 이상</p>
</div> </div>
</div> </div>
</li> </li>
@ -128,7 +134,7 @@
</dl> </dl>
<dl class="fairIntro"> <dl class="fairIntro">
<dt>강좌소개</dt> <dt>강좌소개</dt>
<dd><span id="spnCmIntroHtml"></span></dd> <div id="spnCmIntroHtml"></div>
</dl> </dl>
</div><!-- clsPopCont --> </div><!-- clsPopCont -->
</div><!-- clsPopWrap --> </div><!-- clsPopWrap -->
@ -227,9 +233,11 @@
$("#spnCmStudyHour").text(d.studytime); $("#spnCmStudyHour").text(d.studytime);
$("#spnCmAttend").text(d.attendcut); $("#spnCmAttend").text(d.attendcut);
$("#spnCmFinal").text(d.finalcut); $("#spnCmFinal").text(d.finalcut);
$("#spnCmSubject").text(d.subjectcut);
$("#spnCmUsername").text(d.username); $("#spnCmUsername").text(d.username);
if (d.introhtml != null && d.introhtml != "" && d.introhtml != undefined) { if (d.introhtml != null && d.introhtml != "" && d.introhtml != undefined) {
$("#spnCmIntroHtml").text(d.introhtml.replace(/(<([^>]+)>)/ig, "")); $("#spnCmIntroHtml").html(d.introhtml);
//$("#spnCmIntroHtml").text($('<div/>').html(d.introhtml).text());
} }
}); });
} }
@ -264,7 +272,7 @@
var cmno = _cmno; var cmno = _cmno;
var ulSubCm = $("#ulSubCm_" + cmno); var ulSubCm = $("#ulSubCm_" + cmno);
ulSubCm.empty(); ulSubCm.empty();
var applyClass = "<li><p class='subDsc' style='color:red;'>※ 대기접수는 해당 교육과정의 정원이 마감되어 교육입교 확정은 아니지만 결원 발생 시 대기신청 차례에 따라 교육생 연락처로 연락 드리는 시스템 입니다</p ></li>"; var applyClass = "<li><p class='subDsc' style='color:red;'>※ 입금완료시 교육이 바로 시작되며 동영상 시청이 가능합니다</p >※ 각 기수별 <span style='color:red;'>교육종료일을 꼭 확인하시고</span> 교육신청 부탁드립니다.</li>";
$.each(capResult.obj, function (i, d) { $.each(capResult.obj, function (i, d) {
var li = $("<li />"); var li = $("<li />");
var p = $("<p />"); var p = $("<p />");
@ -295,7 +303,7 @@
} }
else if (d.cshape == 2) { else if (d.cshape == 2) {
//p.html("<label style='cursor:default; font-size:18px'>" + d.tseq + "기 | " + d.cname + " | <span style='" + ((d.retimeymd == "2099-12-31") ? 'display:none' : '') + "'><span class='gry'>" + d.ssrename + "</span></span><span class='red'> " + (d.retimeymd == "2099-12-31" ? "신청일로부터 " + d.studydays + "일 (" + d.studytime + " 시간)" : "(" + d.studytime + "시간)") + "</span> | <span class=red>" + bindComma(d.infee) + "원 ※ 집체교육 선택 필수</span></label>"); //p.html("<label style='cursor:default; font-size:18px'>" + d.tseq + "기 | " + d.cname + " | <span style='" + ((d.retimeymd == "2099-12-31") ? 'display:none' : '') + "'><span class='gry'>" + d.ssrename + "</span></span><span class='red'> " + (d.retimeymd == "2099-12-31" ? "신청일로부터 " + d.studydays + "일 (" + d.studytime + " 시간)" : "(" + d.studytime + "시간)") + "</span> | <span class=red>" + bindComma(d.infee) + "원 ※ 집체교육 선택 필수</span></label>");
p.html("<label style='cursor:default; font-size:18px'>" + d.tseq + "기 | " + d.cname + " | <span style='" + ((d.retimeymd == "2099-12-31") ? 'display:none' : '') + "'><span class='gry'>교육종료일(" + d.setimeymd + ")</span></span><span class='red'> " + (d.retimeymd == "2099-12-31" ? "신청일로부터 " + d.studydays + "일 (" + d.studytime + " 시간)" : "(" + d.studytime + "시간)") + "</span></label>"); p.html("<label style='cursor:default; font-size:18px'>" + d.tseq + "기 | " + d.cname + " | <span style='" + ((d.retimeymd == "2099-12-31") ? 'display:none' : '') + "'><span class='red'>교육종료일(" + d.setimeymd + "까지)</span></span><span> " + (d.retimeymd == "2099-12-31" ? "신청일로부터 " + d.studydays + "일 (" + d.studytime + " 시간)" : "(" + d.studytime + "시간)") + "</span></label>");
} }
spanIntro.text("강좌소개"); spanIntro.text("강좌소개");
li.append(p); li.append(p);

7
FO/Views/Home/Index.cshtml
View File

@ -18,7 +18,7 @@
<div class="container"> <div class="container">
<div class="mainTop"> <div class="mainTop">
<h2><span style="font:bold; font-size:50pt">YICTE</span> Smart Search</h2> <h2><span style="font:bold; font-size:50pt">YICTE</span> Smart Search</h2>
<p style="margin-top:0px">개설된 교육 중 나에게 필요한 교육을 찾아드립니다.</p> <p style="margin-top:0px">교육신청은 아래의 검색창을 이용하세요.</p>
</div> </div>
<input type="hidden" id="sch1" value="" /> <input type="hidden" id="sch1" value="" />
<input type="hidden" id="sch2" value="" /> <input type="hidden" id="sch2" value="" />
@ -120,7 +120,7 @@
</div> </div>
</div> </div>
</li> </li>
<li><a href="#" class="msBtn">검색하기</a></li> <li><a href="#" class="msBtn">검색/교육신청</a></li>
</ul> </ul>
} }
else if (Model.stringval == "1") else if (Model.stringval == "1")
@ -176,7 +176,7 @@
<div class="msSel disable" id="msSel5"> <div class="msSel disable" id="msSel5">
</div> </div>
</li> </li>
<li><a href="#" class="msBtn">검색하기</a></li> <li><a href="#" class="msBtn">검색/교육신청</a></li>
</ul> </ul>
} }
</div> </div>
@ -325,7 +325,6 @@
$("#msSel5 li").show(); $("#msSel5 li").show();
} }
if (num == 2 && name == "발주청기술인") { if (num == 2 && name == "발주청기술인") {
$("#liedu01").hide();
$("#liedu03").hide(); $("#liedu03").hide();
$("#liedu04").hide(); $("#liedu04").hide();
$("#liedu05").hide(); $("#liedu05").hide();

38
FO/Views/My/Document.cshtml
View File

@ -15,7 +15,7 @@
</style> </style>
<div class="mpgInfo"> <div class="mpgInfo">
<ul> <ul>
<li>증빙자료는 현금영수증이나 전자세금계산서 중 하나만 출력할 수 있습니다.</li> <li>증빙서류는 현금영수증이나 전자계산서 중 하나만 출력할 수 있습니다.</li>
<li>환급금 지급내역서는 환급을 신청한 강좌만 출력하실 수 있습니다.</li> <li>환급금 지급내역서는 환급을 신청한 강좌만 출력하실 수 있습니다.</li>
</ul> </ul>
</div> </div>
@ -69,10 +69,10 @@
else else
{ {
<dd> <dd>
수강기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd")) 교육기간 : @item.paycdt.ToString("yy-MM-dd") ~ @(item.estart.ToString("yy-MM-dd"))
@if (item.cshape == 2 && item.estart > Convert.ToDateTime("1900-01-01") && item.eend > Convert.ToDateTime("1900-01-01")) @if (item.cshape == 2 && item.estart > Convert.ToDateTime("1900-01-01") && item.eend > Convert.ToDateTime("1900-01-01"))
{ {
@:| 집체교육기간 : @("[" + item.studyplacename + "] " + string.Format("{0}", item.estart.ToString("yy-MM-dd"))) @:| 집체교육일자 : @("[" + item.studyplacename + "] " + string.Format("{0}", item.estart.ToString("yy-MM-dd")))
} }
</dd> </dd>
@ -90,7 +90,7 @@
} }
else else
{ {
<dd>수강기간 : 상시</dd> <dd>교육기간 : 상시</dd>
} }
} }
<dd>미결제 : @(item.payamt)원</dd> <dd>미결제 : @(item.payamt)원</dd>
@ -110,7 +110,7 @@
} }
</td> </td>
<td class="ltaBtn" data-th="입교통지서 : "> <td class="ltaBtn" data-th="입교통지서 : ">
@if (item.status == 1) @if (item.status == 1 || item.status == 2)
{ {
<a href="#" onclick="javascript: eduannotation(@(item.lectno));"><img src="~/img/mypage/print.png"><br />[인쇄]</a> <a href="#" onclick="javascript: eduannotation(@(item.lectno));"><img src="~/img/mypage/print.png"><br />[인쇄]</a>
} }
@ -129,7 +129,7 @@
@Html.Raw("-") @Html.Raw("-")
} }
</td> </td>
<td class="ltaBtn" data-th="계산서/영수증 : "> <td class="ltaBtn" data-th="계산서/영수증 : ">
@if (item.pstatus == 1 && item.rstatus == 0) @if (item.pstatus == 1 && item.rstatus == 0)
{ {
if (item.ptype == 6) if (item.ptype == 6)
@ -144,7 +144,7 @@
{ {
if (item.iscashrct == 1) /*현금영수증신청*/ if (item.iscashrct == 1) /*현금영수증신청*/
{ {
if (!string.IsNullOrEmpty(item.cshrpgkey) && item.cshrpgkey != "0" ) //현금영수증 승인번호가 있으면 영수증팝업 호출 if (!string.IsNullOrEmpty(item.cshrpgkey) && item.cshrpgkey != "0") //현금영수증 승인번호가 있으면 영수증팝업 호출
{ {
<a href="#" onclick="viewtaxcash('@(item.payno)')">[인쇄]</a> <a href="#" onclick="viewtaxcash('@(item.payno)')">[인쇄]</a>
} }
@ -176,11 +176,11 @@
//{ //{
<a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a> <a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a>
@*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@ @*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@
//} @*}
//else else
//{ {
@*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@ <a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>
//} }*@
} }
} }
} }
@ -200,13 +200,17 @@
else else
{ {
<a href="#" onclick="showtax('@(item.payno)')">[신청중]</a> <a href="#" onclick="showtax('@(item.payno)')">[신청중]</a>
} }
}
else if (item.ptype == 3 && item.ispg == 1 && item.iscashrct != 1)
{
<a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a>
} }
else else
{ {
@Html.Raw("-") @Html.Raw("-")
} }
} }
</td> </td>
</tr> </tr>
@ -286,7 +290,7 @@ else
</td> </td>
</tr> </tr>
<tr class="pd5"> <tr class="pd5">
<th>발행요청일</th> <th>계산서날짜</th>
<td><input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="" autocomplete="off" /></td> <td><input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="" autocomplete="off" /></td>
</tr> </tr>
</table> </table>
@ -425,7 +429,7 @@ else
</td> </td>
</tr> </tr>
<tr class="pd5"> <tr class="pd5">
<th>발행요청일</th> <th>계산서날짜</th>
<td><input type="text" name="ttaxdatereq" id="ttaxdatereq" disabled value="" /></td> <td><input type="text" name="ttaxdatereq" id="ttaxdatereq" disabled value="" /></td>
</tr> </tr>
</table> </table>
@ -554,7 +558,7 @@ else
} }
function save() { function save() {
if (val("taxdatereq") == "") { if (val("taxdatereq") == "") {
msg("발행요청일을 입력해주세요."); msg("계산서날짜를 입력해주세요.");
} }
else if (check("asname", null, "회사명을 입력해주세요.")) { } else if (check("asname", null, "회사명을 입력해주세요.")) { }
else if (check("ceoname", null, "대표자명을 입력해주세요.")) { } else if (check("ceoname", null, "대표자명을 입력해주세요.")) { }

8
FO/Views/My/Index.cshtml
View File

@ -65,11 +65,11 @@
</h5> </h5>
<dl> <dl>
<dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt> <dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>
<dd>교육기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd> <dt style="color:#888888">교육기간 : @(d.intval3 == 1 ? d.time.ToString("yy-MM-dd") : d.time5.ToString("yy-MM-dd")) ~ @(d.intval3 == 1 ? d.time2.ToString("yy-MM-dd") : d.time3.ToString("yy-MM-dd"))</dt>
<dd>복습기간 : @(d.time2.AddYears(1).ToString("yy-MM-dd"))</dd>
@if (false && d.intval3 == 2 && d.time3 > Convert.ToDateTime("1900-01-01")) @if (false && d.intval3 == 2 && d.time3 > Convert.ToDateTime("1900-01-01"))
{ {
<dt class="mpglSta3">&nbsp;&nbsp;&nbsp;</dt> <dd>집체교육 : @d.time3.ToString("yy/MM/dd")</dd>
<dd> 집체교육 : @d.time3.ToString("yy/MM/dd")</dd>
} }
</dl> </dl>
@ -129,7 +129,7 @@
</h5> </h5>
<dl> <dl>
<dt class="mpglSta@(d.intval5 == 0 && d.intval4 == 1 ? 3 : 1)">@(d.intval5 == 1 ? "환불요청" : d.intval4 == 1 ? "결제완료" : d.intval4 == 21 ? "결제대기" : d.intval4 == 22 ? "입금대기" : d.intval4 == 51 ? "심사중" : d.intval4 == 55 ? "승인대기" : "")</dt> <dt class="mpglSta@(d.intval5 == 0 && d.intval4 == 1 ? 3 : 1)">@(d.intval5 == 1 ? "환불요청" : d.intval4 == 1 ? "결제완료" : d.intval4 == 21 ? "결제대기" : d.intval4 == 22 ? "입금대기" : d.intval4 == 51 ? "심사중" : d.intval4 == 55 ? "승인대기" : "")</dt>
<dd>신청기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd> <dd>교육기간 : @(d.time2.Year == 2099 ? "결제완료일로부터 "+d.intval9+"일" : (d.intval3 == 1 ? d.time5.ToString("yy-MM-dd") : d.time3.ToString("yy-MM-dd"))+ " ~ "+ (d.intval3 == 1 ? d.time6.ToString("yy-MM-dd") : d.time4.ToString("yy-MM-dd")))</dd>
</dl> </dl>
</a> </a>
</li> </li>

40
FO/Views/My/Lecture.cshtml
View File

@ -52,14 +52,18 @@
<b>@d.cname (@(d.classno))</b> <b>@d.cname (@(d.classno))</b>
</h5> </h5>
<dl class="ltaDl"> <dl class="ltaDl">
<dt class="@(d.edate > DateTime.Now ? "ltaDlbk" : "ltaDlred")">@(d.edate > DateTime.Now ? "수강기간 학습중" : "종료")</dt> <dt class="@(d.edate > DateTime.Now ? "ltaDlbk" : "ltaDlred")">@(d.edate > DateTime.Now ? "교육기간 학습중" : "종료")</dt>
<dd> <dt style="color:#888888">
수강기간 : @d.sdate.Value.ToString("yy-MM-dd") ~ @d.edate.Value.ToString("yy-MM-dd") 교육기간 : @(string.Format("{0} ~ {1}", d.cshape == 1 ? d.sdate.Value.ToString("yy-MM-dd") : d.cdt.ToString("yy-MM-dd") , d.cshape == 1 ? d.edate.Value.ToString("yy-MM-dd") : d.estart.ToString("yy-MM-dd")))
@if (false && d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01")) @if (false && d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01"))
{ {
@:| 집체교육기간 : @("[" + d.studyplacename + "] " + string.Format("{0}", d.estart.ToString("yy-MM-dd"))) @:| 집체교육기간 : @("[" + d.studyplacename + "] " + string.Format("{0}", d.estart.ToString("yy-MM-dd")))
} }
</dd> </dt>
@if(d.cshape != 1)
{
<dd>복습기간 : @(d.edate.Value.AddYears(1).ToString("yy-MM-dd"))까지</dd>
}
</dl> </dl>
</a> </a>
@if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01") && d.iscomplete != 1 && Convert.ToDateTime(d.estart) > DateTime.Now) @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01") && d.iscomplete != 1 && Convert.ToDateTime(d.estart) > DateTime.Now)
@ -220,12 +224,12 @@
setScd(cmno); setScd(cmno);
} }
function setScd(cmno) { function setScd(cmno) {
capp("/focommon/GetScdForMixEdu", { cmno: cmno }, "renderScd"); capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScd");
} }
function renderScd() { function renderScd() {
var ulScd = $("#ulScd"); var ulScd = $("#ulScd");
ulScd.empty(); ulScd.empty();
var seq = 0; //var seq = 0;
$.each(capResult.obj, function (i, d) { $.each(capResult.obj, function (i, d) {
var li = $("<li />"); var li = $("<li />");
@ -238,24 +242,34 @@
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label>"); li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label>");
} }
else { else {
if (seq == 0) { if (d.isselected == 1) {
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>"); li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>");
} } else {
else {
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>"); li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>");
} }
//if (seq == 0) {
// li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>");
//}
//else {
// li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>");
//}
} }
} }
else { else {
if (seq == 0) { if (d.isselected == 1) {
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "</label>"); li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "</label>");
} } else {
else {
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "</label>"); li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "</label>");
} }
//if (seq == 0) {
// li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "</label>");
//}
//else {
// li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "</label>");
//}
} }
} }
seq++; //seq++;
ulScd.append(li); ulScd.append(li);
}); });
} }

183
FO/Views/My/MyAssInfo.cshtml
View File

@ -4,23 +4,40 @@
} }
<form id="mform" method="post" enctype="multipart/form-data"> <form id="mform" method="post" enctype="multipart/form-data">
<div class="mpgCont pt0"> <div class="mpgCont pt0">
<h2 class="mpgName">회사정보수정</h2>
<input type="hidden" name="asno" id="asno" value="@a.asno" /> <input type="hidden" name="asno" id="asno" value="@a.asno" />
<table class="clsTable"> <table class="clsTable">
<tbody> <tbody>
<tr> <tr>
<th>소속</th>
<td>
<ul class="sctyRadio">
<li><input type="radio" name="isCompany" value="0" id="isCompany0" @(a.asno < 1 ? "checked" : "")><label for="isCompany0">개인</label></li>
<li><input type="radio" name="isCompany" value="1" id="isCompany1" @(a.asno < 1 ? "" : "checked")><label for="isCompany1">업체</label></li>
</ul>
</td>
</tr>
<tr class="ass">
<th>직장</th>
<td>
<div class="mdfyBirth">
<p id="asnamet">@(a.asname ?? "-")</p>
<a href="#" id="btnassign" onclick="chkassign();" style="background-color:@(a.asno < 1 ? "#ddd;" : "#fff;")">수정</a>
</div>
</td>
</tr>
<tr class="ass">
<th>회사명</th> <th>회사명</th>
<td><input type="text" name="asname" id="asname" class="min230" value="@a.asname"></td> <td><input type="text" name="asname" id="asname" class="min230" value="@a.asname"></td>
</tr> </tr>
<tr> <tr class="ass">
<th>사업자등록번호</th> <th>사업자등록번호</th>
<td><input type="text" name="brno" id="brno" class="min230 int nocomma" maxlength="10" value="@a.brno"></td> <td><input type="text" name="brno" id="brno" class="min230 int nocomma" maxlength="10" value="@a.brno"></td>
</tr> </tr>
<tr> <tr class="ass">
<th>대표자 성명</th> <th>대표자 성명</th>
<td><input type="text" name="ceoname" id="ceoname" class="min230" value="@a.ceoname"></td> <td><input type="text" name="ceoname" id="ceoname" class="min230" value="@a.ceoname"></td>
</tr> </tr>
<tr> <tr class="ass">
<th>주소</th> <th>주소</th>
<td> <td>
<ul class="mdfyAddr postbox"> <ul class="mdfyAddr postbox">
@ -31,23 +48,23 @@
</ul> </ul>
</td> </td>
</tr> </tr>
<tr> <tr class="ass">
<th>업태</th> <th>업태</th>
<td><input type="text" name="btype" id="btype" class="min230" value="@a.btype"></td> <td><input type="text" name="btype" id="btype" class="min230" value="@a.btype"></td>
</tr> </tr>
<tr> <tr class="ass">
<th>종목</th> <th>종목</th>
<td><input type="text" name="bkind" id="bkind" class="min230" value="@a.bkind"></td> <td><input type="text" name="bkind" id="bkind" class="min230" value="@a.bkind"></td>
</tr> </tr>
<tr> <tr class="ass">
<th>고용보험관리번호</th> <th>고용보험관리번호</th>
<td><input type="text" name="eino" id="eino" class="min230 int nocomma" value="@a.eino"></td> <td><input type="text" name="eino" id="eino" class="min230 int nocomma" value="@a.eino"></td>
</tr> </tr>
<tr> <tr class="ass">
<th>담당자 성명</th> <th>담당자 성명</th>
<td><input type="text" name="mname" id="mname" class="min230" value="@a.mname"></td> <td><input type="text" name="mname" id="mname" class="min230" value="@a.mname"></td>
</tr> </tr>
<tr> <tr class="ass">
<th>담당자연락처</th> <th>담당자연락처</th>
<td> <td>
<input type="hidden" name="mphone" id="mphone" value="@(a.mphone)" /> <input type="hidden" name="mphone" id="mphone" value="@(a.mphone)" />
@ -55,21 +72,21 @@
<li> <li>
<select name="mphone1" id="mphone1"> <select name="mphone1" id="mphone1">
<option value=""></option> <option value=""></option>
<option value="010" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "010" ? "selected" : "")>010</option> <option value="010" @(string.IsNullOrEmpty((a.mphone ?? "").Replace("-", "")) ? "" : (a.mphone ?? "").Substring(0, 3) == "010" ? "selected" : "")>010</option>
<option value="011" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "011" ? "selected" : "")>011</option> <option value="011" @(string.IsNullOrEmpty((a.mphone ?? "").Replace("-", "")) ? "" : (a.mphone ?? "").Substring(0, 3) == "011" ? "selected" : "")>011</option>
<option value="016" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "016" ? "selected" : "")>016</option> <option value="016" @(string.IsNullOrEmpty((a.mphone ?? "").Replace("-", "")) ? "" : (a.mphone ?? "").Substring(0, 3) == "016" ? "selected" : "")>016</option>
<option value="017" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "017" ? "selected" : "")>017</option> <option value="017" @(string.IsNullOrEmpty((a.mphone ?? "").Replace("-", "")) ? "" : (a.mphone ?? "").Substring(0, 3) == "017" ? "selected" : "")>017</option>
<option value="019" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "019" ? "selected" : "")>019</option> <option value="019" @(string.IsNullOrEmpty((a.mphone ?? "").Replace("-", "")) ? "" : (a.mphone ?? "").Substring(0, 3) == "019" ? "selected" : "")>019</option>
</select> </select>
</li> </li>
<li>-</li> <li>-</li>
<li><input type="tel" name="mphone2" id="mphone2" value="@(string.IsNullOrEmpty(a.mphone) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Split('-')[1])"></li> <li><input type="tel" name="mphone2" id="mphone2" value="@(string.IsNullOrEmpty((a.mphone ?? "")) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Split('-')[1])"></li>
<li>-</li> <li>-</li>
<li><input type="tel" name="mphone3" id="mphone3" value="@(string.IsNullOrEmpty(a.mphone) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Split('-')[2])"></li> <li><input type="tel" name="mphone3" id="mphone3" value="@(string.IsNullOrEmpty((a.mphone ?? "")) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Split('-')[2])"></li>
</ul> </ul>
</td> </td>
</tr> </tr>
<tr> <tr class="ass">
<th>계산서받을 이메일</th> <th>계산서받을 이메일</th>
<td> <td>
<input type="hidden" name="taxemail" id="taxemail" value="@a.taxemail" /> <input type="hidden" name="taxemail" id="taxemail" value="@a.taxemail" />
@ -90,41 +107,93 @@
</ul> </ul>
</td> </td>
</tr> </tr>
<tr> <tr class="ass">
<th>사업자등록증</th> <th>사업자등록증</th>
<td> <td id="flist">
@Html.Partial("./Partial/file", Model.FileList, new ViewDataDictionary { { "fgn", "fgnobno" }, { "fgv", a.fgnobno ?? 0 }, { "filename", "file1" }, { "filecount", 1},{"fileext", "png,jpg,gif,pdf" },{"datakey","assign.fgnobno" } }) @Html.Partial("./Partial/file", Model.FileList, new ViewDataDictionary { { "fgn", "fgnobno" }, { "fgv", a.fgnobno ?? 0 }, { "filename", "file1" }, { "filecount", 1 }, { "fileext", "png,jpg,gif,pdf" }, { "datakey", "assign.fgnobno" } })
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div><!-- mpgCont --> </div><!-- mpgCont -->
</form> </form>
<ul class="lctBtn"> <ul class="lctBtn">
<li><a href="#" class="sm bk" onclick="save()">저장</a></li> <li><a href="#" class="sm bk" onclick="save()">수정</a></li>
</ul> </ul>
<div id="postlayer" class="daumpost"><a href="#" class="btn btn-xxs btn-select closedaumpost" onclick="closeDaumPostcode();">close</a></div> <div id="postlayer" class="daumpost"><a href="#" class="btn btn-xxs btn-select closedaumpost" onclick="closeDaumPostcode();">close</a></div>
@Html.Partial("./Partial/BoxAssign", null, new ViewDataDictionary { { "bindmethod", "bindassign" } })
@section scriptsHeader{ @section scriptsHeader{
@Html.Partial("./Partial/ScriptPost") @Html.Partial("./Partial/ScriptPost")
@Html.Partial("./Partial/filescript") @Html.Partial("./Partial/filescript")
} }
@section scripts{ @section scripts{
<script> <script>
$(document).ready(function () {
if ($("input:radio[name='isCompany']:checked").val() == "1") {
$(".ass").show();
} else {
$(".ass").hide();
}
$("input:radio[name='isCompany']").on("click", function () {
var isCompany = $(this).val();
if (isCompany == "0") {
setv("asno", "");
$("#asnamet").text("-");
$("#btnassign").off("click");
$("#btnassign").css("background-color", "#ddd");
$("#btnassign").css("cursor", "default");
setv("asname", "");
setv("brno", "");
setv("ceoname", "");
setv("post", "");
setv("address1", "");
setv("address2", "");
setv("btype", "");
setv("bkind", "");
setv("eino", "");
setv("mname", "");
setv("mphone1", "");
setv("mphone2", "");
setv("mphone3", "");
setv("taxemail1", "");
setv("taxemail2", "");
$("#flist input[name='fgnobno']").remove();
$(".filebox li").remove();
$("#flist div").prepend("<input type=\"hidden\" name=\"fgnobno\" value />");
$(".filebox").append("<li>"
+ "<input type=\"file\" class=\"file\" name=\"file1\" accept=\"media_type\" onchange=\"filechange(this)\"></input>"
+ "<a href=\"#\" class=\"filedel\" onclick=\"filedel(0,this,'assign.fgnobno')\">삭제</a>"
+ "</li > ");
$(".ass").hide();
} else {
$("#btnassign").css("cursor", "pointer");
$("#btnassign").css("background-color", "#fff");
$(".ass").show();
}
});
});
function save() { function save() {
var isCompany = $("input:radio[name='isCompany']:checked").val() == "1";
setv("brno", val("brno").replace(/-/gi, '')); setv("brno", val("brno").replace(/-/gi, ''));
setv("mphone", val("mphone1").replace(/ /, '').replace(/ /, '') + val("mphone2").replace(/ /, '').replace(/ /, '') + val("mphone3").replace(/ /, '').replace(/ /, '')); setv("mphone", val("mphone1").replace(/ /, '').replace(/ /, '') + val("mphone2").replace(/ /, '').replace(/ /, '') + val("mphone3").replace(/ /, '').replace(/ /, ''));
setv("mphone", formatmobile(val("mphone"))); setv("mphone", formatmobile(val("mphone")));
if (val("taxemail2") != "") { if (isCompany) {
setv("taxemail", val("taxemail1") + "@Html.Raw("@")" + val("taxemail2")); if (val("taxemail2") != "") {
setv("taxemail", val("taxemail1") + "@Html.Raw("@")" + val("taxemail2"));
} else {
setv("taxemail", val("taxemail1"));
}
if (check("asno", null, "직장을 선택해주세요.")) { }
else if (check("brno", null, "사업자번호를 입력해주세요.")) { }
else if (getBytes(val("brno")) != 10) { focus("brno"); msg("10자리의 사업자번호를 입력해주세요."); }
else if (check("asname", null, "회사명을 입력해주세요.")) { }
else if (val("mphone") != "" && !ismobilenumber(val("mphone"))) { focus("mphone2"); msg("올바른 휴대전화번호를 입력해주세요."); }
else if (val("taxemail") != "" && !isemail(val("taxemail"))) { focus("taxemail1"); msg("올바른 이메일주소를 입력해주세요."); }
else {
capfileform("/fcommon/assignupdate", "mform", "cbsave");
}
} else { } else {
setv("taxemail", val("taxemail1"));
}
if (check("brno", null, "사업자번호를 입력해주세요.")) { }
else if (getBytes(val("brno")) != 10) { focus("brno"); msg("10자리의 사업자번호를 입력해주세요."); }
else if (check("asname", null, "회사명을 입력해주세요.")) { }
else if (val("mphone") != "" && !ismobilenumber(val("mphone"))) { focus("mphone2"); msg("올바른 휴대전화번호를 입력해주세요."); }
else if (val("taxemail") != "" && !isemail(val("taxemail"))) { focus("taxemail1"); msg("올바른 이메일주소를 입력해주세요.");}
else {
capfileform("/fcommon/assignupdate", "mform", "cbsave"); capfileform("/fcommon/assignupdate", "mform", "cbsave");
} }
} }
@ -137,5 +206,55 @@
msgadmin(); msgadmin();
} }
} }
function chkassign() {
var isCompany = $("input:radio[name='isCompany']:checked").val();
if (isCompany == "1") {
boxassignview();
}
}
function bindassign(v) {
$("#asno").val(v.split(':')[0]);
capp("/fcommon/getassign", { asno: $("#asno").val() }, "cbbindassign");
}
function cbbindassign() {
if (capResult.code == 1000) {
var mphone = String(capResult.obj.mphone).split("-");
var mphone1 = mphone.length > 0 ? mphone[0] : "";
var mphone2 = mphone.length > 1 ? mphone[1] : "";
var mphone3 = mphone.length > 2 ? mphone[2] : "";
var taxemail = String(capResult.obj.taxemail).split("@@");
var taxemail1 = taxemail.length > 0 ? taxemail[0] : "";
var taxemail2 = taxemail.length > 1 ? taxemail[1] : "";
sett("asnamet", capResult.obj.asname);
setv("asname", capResult.obj.asname);
setv("brno", capResult.obj.brno);
setv("ceoname", capResult.obj.ceoname);
setv("post", capResult.obj.post);
setv("address1", capResult.obj.address1);
setv("address2", capResult.obj.address2);
setv("btype", capResult.obj.btype);
setv("bkind", capResult.obj.bkind);
setv("eino", capResult.obj.eino);
setv("mname", capResult.obj.mname);
setv("mphone1", mphone1);
setv("mphone2", mphone2);
setv("mphone3", mphone3);
setv("taxemail1", taxemail1);
setv("taxemail2", taxemail2);
if (capResult.obj.fgnobno != null && capResult.obj.fgnobno != "" && capResult.obj.fgnobno > 0) {
$("#flist input[name='fgnobno']").remove();
$(".filebox li").remove();
$("#flist div").prepend("<input type=\"hidden\" name=\"fgnobno\" value=\"" + capResult.obj.fgnobno + "\"/>");
$(".filebox").append("<li>"
+ "<a class=\"file\" href=\"/focommon/downfile?fno=" + capResult.obj.fileno + "\">" + capResult.obj.orgname + "</a>&nbsp;"
//+ "<a href=\"#\" class=\"filedel\" onclick=\"filedel(" + capResult.obj.fileno + ",this,'assign.fgnobno')\">삭제</a>"
+ "</li > ");
}
} else {
msgadmin();
}
}
</script> </script>
} }

35
FO/Views/My/MyInfoCheck.cshtml
View File

@ -7,6 +7,10 @@
var naverClientId = ViewBag.naverClientID; var naverClientId = ViewBag.naverClientID;
var kakaoClientId = ViewBag.kakaoClientID; var kakaoClientId = ViewBag.kakaoClientID;
var googleClientId = ViewBag.googleClientID; var googleClientId = ViewBag.googleClientID;
var menus = (List<NP.Model.MenuPage>)ViewBag.Menus;
var em = new NP.Model.MenuPage();
var boardfaq = menus.Where(w => w.refcode == "board.faq").FirstOrDefault() ?? em;
} }
<head> <head>
<script type="text/javascript" src="/js/naveridlogin_js_sdk_2.0.0.js"></script> <script type="text/javascript" src="/js/naveridlogin_js_sdk_2.0.0.js"></script>
@ -65,7 +69,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th>주소</th> <th>자택주소</th>
<td> <td>
<ul class="mdfyAddr postbox"> <ul class="mdfyAddr postbox">
<li><input type="text" name="post" id="post" class="postno" readonly="readonly" style="background-color: #ddd;" value="@u.post" /></li> <li><input type="text" name="post" id="post" class="postno" readonly="readonly" style="background-color: #ddd;" value="@u.post" /></li>
@ -120,7 +124,8 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr> <input type="hidden" id="asno" name="asno" value="@u.asno" />
@*<tr>
<th>소속</th> <th>소속</th>
<td> <td>
<ul class="sctyRadio"> <ul class="sctyRadio">
@ -128,17 +133,17 @@
<li><input type="radio" name="isCompany" value="1" id="isCompany1" @(u.asno == null ? "" : "checked")><label for="isCompany1">업체</label></li> <li><input type="radio" name="isCompany" value="1" id="isCompany1" @(u.asno == null ? "" : "checked")><label for="isCompany1">업체</label></li>
</ul> </ul>
</td> </td>
</tr> </tr>*@
<tr> @*<tr>
<th>직장</th> <th>직장</th>
<td> <td>
<div class="mdfyBirth"> <div class="mdfyBirth">
<input type="hidden" id="asno" name="asno" value="@u.asno" /> <input type="hidden" id="asno" name="asno" value="@u.asno" />
<p id="asname">@(u.asname ?? "-")</p> <p id="asname">@(u.asname ?? "-")</p>
<a href="#" id="btnassign" style="background-color:@(u.asno == null ? "#ddd;" : "#fff;")">수정</a> <a href="#" id="btnassign" onclick="chkassign();" style="background-color:@(u.asno == null ? "#ddd;" : "#fff;")">수정</a>
</div> </div>
</td> </td>
</tr> </tr>*@
<tr> <tr>
<th>학력</th> <th>학력</th>
<td> <td>
@ -185,12 +190,15 @@
<a href="javascript:confirmSns(1)">구글 아이디로 연동하기</a> <a href="javascript:confirmSns(1)">구글 아이디로 연동하기</a>
} }
</li> </li>
<li>
<a href="/Board/List?opno=11&scc=&pagenum=1&menupageno=23">SNS연동 기능 알아보러 가기</a>
</li>
</ul> </ul>
</div> </div>
</form> </form>
@Html.Partial("./Partial/OkCert3", null, new ViewDataDictionary { }) @Html.Partial("./Partial/OkCert3", null, new ViewDataDictionary { })
<ul class="lctBtn"> <ul class="lctBtn">
<li><a href="#" class="sm bk" onclick="save(1)">저장</a></li> <li><a href="#" class="sm bk" onclick="save(1)">수정</a></li>
<li><a href="#" class="sm" onclick="save(0)">탈퇴</a></li> <li><a href="#" class="sm" onclick="save(0)">탈퇴</a></li>
</ul> </ul>
<div id="postlayer" class="daumpost"><a href="#" class="btn btn-xxs btn-select closedaumpost" onclick="closeDaumPostcode();">close</a></div> <div id="postlayer" class="daumpost"><a href="#" class="btn btn-xxs btn-select closedaumpost" onclick="closeDaumPostcode();">close</a></div>
@ -249,10 +257,9 @@
$("#asname").text("-"); $("#asname").text("-");
$("#btnassign").off("click"); $("#btnassign").off("click");
$("#btnassign").css("background-color", "#ddd"); $("#btnassign").css("background-color", "#ddd");
$("#btnassign").css("cursor", "default");
} else { } else {
$("#btnassign").on("click", function () { $("#btnassign").css("cursor", "pointer");
boxassignview();
});
$("#btnassign").css("background-color", "#fff"); $("#btnassign").css("background-color", "#fff");
} }
}); });
@ -261,6 +268,12 @@
setbirthday(val("userpno1") + val("userpno2")); setbirthday(val("userpno1") + val("userpno2"));
}); });
}); });
function chkassign() {
var isCompany = $("input:radio[name='isCompany']:checked").val();
if (isCompany == "1") {
boxassignview();
}
}
function setbirthday(userpno) { function setbirthday(userpno) {
var birthday = ""; var birthday = "";
if (userpno.length == 13 && moment(userpno.substr(0, 6), 'YYMMDD', true).isValid() && userpno.substr(6, 1) > 0) if (userpno.length == 13 && moment(userpno.substr(0, 6), 'YYMMDD', true).isValid() && userpno.substr(6, 1) > 0)
@ -334,7 +347,7 @@
else if (check("mobile", null, "휴대전화번호를 입력해주세요.")) { } else if (check("mobile", null, "휴대전화번호를 입력해주세요.")) { }
else if (!ismobilenumber(val("mobile"))) { focus("mobile"); msg("휴대전화번호를 확인해주세요."); } else if (!ismobilenumber(val("mobile"))) { focus("mobile"); msg("휴대전화번호를 확인해주세요."); }
else if (!isemail(val("email"))) { focus("email1"); msg("올바른 이메일주소를 입력해주세요."); } else if (!isemail(val("email"))) { focus("email1"); msg("올바른 이메일주소를 입력해주세요."); }
else if ($("input:radio[name='isCompany']:checked").val() == "1" && check("asno", "btnassign", "직장을 선택해주세요.")) { } //else if ($("input:radio[name='isCompany']:checked").val() == "1" && check("asno", "btnassign", "직장을 선택해주세요.")) { }
else { else {
cap("/fcommon/usersave", "mform", "cbsave"); cap("/fcommon/usersave", "mform", "cbsave");
} }

8
FO/Views/My/PayInfo.cshtml
View File

@ -22,13 +22,13 @@
@if (Model.PayItem.sdate != null && Model.PayItem.edate != null) @if (Model.PayItem.sdate != null && Model.PayItem.edate != null)
{ {
<dl> <dl>
<dd>학습기간 : <span class="red">@(Convert.ToDateTime(Model.PayItem.sdate).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.edate).ToShortDateString())</span></dd> <dd>교육기간 : <span class="red">@(Convert.ToDateTime(Model.PayItem.cshape == 1 ? Model.PayItem.sdate : Model.PayItem.cdt).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.cshape == 1 ? Model.PayItem.edate : Model.PayItem.estart).ToShortDateString())</span></dd>
</dl> </dl>
} }
else else
{ {
<dl> <dl>
<dd>학습기간 : <span class="red">@(Model.PayItem.studydays)일</span></dd> <dd>교육기간 : <span class="red">@(Model.PayItem.studydays)일</span></dd>
</dl> </dl>
} }
<dl> <dl>
@ -98,11 +98,11 @@
{ {
<label>접수완료</label><label id="rfdDate">(@Model.PayRfd.udt) 서류심사중</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회/취소]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a> <label>접수완료</label><label id="rfdDate">(@Model.PayRfd.udt) 서류심사중</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회/취소]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a>
} }
else if (Model.PayRfd.rstatus == 1 && (Model.PayRfd.fgnob != null && Model.PayRfd.fgnor != null)) else if (Model.PayRfd.rstatus == 1 && Model.PayRfd.fgnor != null && (Model.PayRfd.ptype != 3 || (Model.PayRfd.ptype==3 && Model.PayRfd.fgnob != null)))
{ {
<label>환불불가</label><label id="rfdDate">(@Model.PayRfd.udt)</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a> <label>환불불가</label><label id="rfdDate">(@Model.PayRfd.udt)</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a>
} }
else if (Model.PayRfd.rstatus == 2 && (Model.PayRfd.fgnob != null && Model.PayRfd.fgnor != null)) else if (Model.PayRfd.rstatus == 2 && Model.PayRfd.fgnor != null && (Model.PayRfd.ptype != 3 || (Model.PayRfd.ptype == 3 && Model.PayRfd.fgnob != null)))
{ {
<label>환불완료</label><label id="rfdDate">(@Model.PayRfd.udt)</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a> <label>환불완료</label><label id="rfdDate">(@Model.PayRfd.udt)</label> <a href="#" style="color:blue" onclick="refund();">[상세내용조회]</a> <a href="#" onclick="rfdrequest(@(Model.PayRfd.rfdno));" style="color:blue">[신청서출력]</a>
} }

4
FO/Views/My/Ready.cshtml
View File

@ -40,8 +40,8 @@
<dl class="ltaDl"> <dl class="ltaDl">
<dt class="@(d.pstatus == 1 && d.rfdstatus < 1 ? "ltaDlbk":"ltaDlred")">@(d.pstatus == 55 ? "승인대기" : d.pstatus == 51 ? "심사중" : d.pstatus == 21 ? "결제대기" : d.pstatus == 22 ? "입금대기" : d.pstatus == 1 && d.rfdstatus > 0 ? "환불요청" : d.pstatus == 1 ? "결제완료" : d.rstatus == 1 ? "부분환불" : d.rstatus == 2 ? "전액환불" : "-")</dt> <dt class="@(d.pstatus == 1 && d.rfdstatus < 1 ? "ltaDlbk":"ltaDlred")">@(d.pstatus == 55 ? "승인대기" : d.pstatus == 51 ? "심사중" : d.pstatus == 21 ? "결제대기" : d.pstatus == 22 ? "입금대기" : d.pstatus == 1 && d.rfdstatus > 0 ? "환불요청" : d.pstatus == 1 ? "결제완료" : d.rstatus == 1 ? "부분환불" : d.rstatus == 2 ? "전액환불" : "-")</dt>
<dd> <dd>
신청기간 : @(d.retime.Value.Year == 2099 ? "상시운영" : d.rstime.Value.ToString("yy/MM/dd") + " ~ " + d.retime.Value.ToString("yy/MM/dd")) @*신청기간 : @(d.retime.Value.Year == 2099 ? "상시운영" : d.rstime.Value.ToString("yy/MM/dd") + " ~ " + d.retime.Value.ToString("yy/MM/dd"))*@
@*수강기간 : @d.sdate.ToString("yy-MM-dd") ~ @d.edate.ToString("yy-MM-dd")*@ 교육기간 : @(d.retime.Value.Year == 2099 ? "결제완료일로부터 "+d.studydays+"일" : (d.cshape != 1 ? d.cdt.ToString("yy-MM-dd") : d.sdate.Value.ToString("yy-MM-dd")) +" ~ "+ (d.cshape != 1 ? d.cmiestart != null ? d.cmiestart.Value.ToString("yy-MM-dd") : "" : d.edate.Value.ToString("yy-MM-dd")))
@if (false && d.cshape == 2) @if (false && d.cshape == 2)
{ {
@:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "] " + string.Format("{0}", d.cmiestart.Value.ToString("yy-MM-dd")))) @:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "] " + string.Format("{0}", d.cmiestart.Value.ToString("yy-MM-dd"))))

3
FO/Views/Shared/Partial/JS.cshtml
View File

@ -4,4 +4,5 @@
<script type="text/javascript" src="/js/site.js?v=200320"></script> <script type="text/javascript" src="/js/site.js?v=200320"></script>
<script type="text/javascript" src="/js/master.js"></script> <script type="text/javascript" src="/js/master.js"></script>
<script src="https://vjs.zencdn.net/ie8/1.1.2/videojs-ie8.min.js"></script> <script src="https://vjs.zencdn.net/ie8/1.1.2/videojs-ie8.min.js"></script>
<script src="https://vjs.zencdn.net/7.7.6/video.js"></script> <script src="https://vjs.zencdn.net/7.7.6/video.js"></script>
<script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>

6
FO/Views/Shared/_LayoutMy.cshtml
View File

@ -39,16 +39,16 @@
@*<li><a href="?"><em style="background:url('../img/mypage/left_menu01.png')no-repeat center center;"></em><span>마이페이지</span></a></li>*@ @*<li><a href="?"><em style="background:url('../img/mypage/left_menu01.png')no-repeat center center;"></em><span>마이페이지</span></a></li>*@
@foreach (var m in mymenus.Where(w => w.refcode != "myassign")) @foreach (var m in mymenus.Where(w => w.refcode != "myassign"))
{ {
if (m.pageurl.Contains("/My/MyAssInfo")) @*if (m.pageurl.Contains("/My/MyAssInfo"))
{ {
if (ViewBag.SSASNo != null && ViewBag.SSASNo > 0) { if (ViewBag.SSASNo != null && ViewBag.SSASNo > 0) {
<li class="@(m.pno == ViewBag.MenuPage.m1 ? "current" : "")"><a href="@m.pageurl"><em style="background:url(@m.imagecode)no-repeat center center;"></em><span>@m.pagename</span></a></li> <li class="@(m.pno == ViewBag.MenuPage.m1 ? "current" : "")"><a href="@m.pageurl"><em style="background:url(@m.imagecode)no-repeat center center;"></em><span>@m.pagename</span></a></li>
} }
} }
else else
{ {*@
<li class="@(m.pno == ViewBag.MenuPage.m1 ? "current" : "")"><a href="@m.pageurl"><em style="background:url(@m.imagecode)no-repeat center center;"></em><span>@m.pagename</span></a></li> <li class="@(m.pno == ViewBag.MenuPage.m1 ? "current" : "")"><a href="@m.pageurl"><em style="background:url(@m.imagecode)no-repeat center center;"></em><span>@m.pagename</span></a></li>
} @*}*@
} }
</ul> </ul>
<dl class="lctmUdn"> <dl class="lctmUdn">

3
FO/css/common.css
View File

@ -18,7 +18,8 @@ caption {display: none;}
a {background: transparent; cursor:pointer;} a {background: transparent; cursor:pointer;}
a:active, a:hover {outline: 0;} a:active, a:hover {outline: 0;}
abbr[title] {border-bottom: 1px dotted;} abbr[title] {border-bottom: 1px dotted;}
b, strong, th, td {font-weight: 400;} th, td {font-weight: 400;}
b, strong{font-weight:700;}
dfn {font-style: italic;} dfn {font-style: italic;}
mark {background: #ff0; color: #000;} mark {background: #ff0; color: #000;}
small {font-size: 80%;} small {font-size: 80%;}

2
FO/css/mypage.css
View File

@ -66,7 +66,7 @@
.mpgcCont {margin-bottom:60px;} .mpgcCont {margin-bottom:60px;}
.mpgClass .mpgcCont:last-child {margin-bottom:0;} .mpgClass .mpgcCont:last-child {margin-bottom:0;}
.mpgTitle {position:relative; margin-bottom:20px;} .mpgTitle {position:relative; margin-bottom:20px;}
.mpgTitle h5 {line-height:1.0em; font-size:14pt;} .mpgTitle h5 {width:80%; line-height:1.0em; font-size:14pt;}
.mpgTitle a {display:block; font-size:10pt; font-weight:300; padding-left:18px; position:absolute; right:0; top:0;} .mpgTitle a {display:block; font-size:10pt; font-weight:300; padding-left:18px; position:absolute; right:0; top:0;}
.mpgTitle a:before, .mpgTitle a:before,
.mpgTitle a:after {content:""; display:block; position:absolute; left:0; top:50%; background:#8b8b8b;} .mpgTitle a:after {content:""; display:block; position:absolute; left:0; top:50%; background:#8b8b8b;}

8
FO/css/style.css
View File

@ -597,14 +597,14 @@ a.msBtn {display: block; height: 130px; line-height: 130px; text-align: center;
.clsPopTitle {background:#0047a7; position:relative; padding:0 20px;} .clsPopTitle {background:#0047a7; position:relative; padding:0 20px;}
.clsPopTitle h5 {height:50px; line-height:50px; color:#fff; font-size:16pt;} .clsPopTitle h5 {height:50px; line-height:50px; color:#fff; font-size:16pt;}
.clsPopTitle a {display:block; height:50px; width:50px; position:absolute; right:0; top:0; text-indent:-9999px; z-index:1; cursor:pointer; background:url("../../img/common/gnb_close.png")no-repeat center center; background-size:24px auto;} .clsPopTitle a {display:block; height:50px; width:50px; position:absolute; right:0; top:0; text-indent:-9999px; z-index:1; cursor:pointer; background:url("../../img/common/gnb_close.png")no-repeat center center; background-size:24px auto;}
.clsPopCont {padding:30px; overflow-y:auto; background: #fff;} .clsPopCont {max-height:90vh;padding:30px; overflow-y:auto; background: #fff;}
.clsPop.clsPopFull > div {display:block; width:100%;} .clsPop.clsPopFull > div {display:block; width:100%;}
.clsPop.clsPopFull > div > div {display:block; height:100%; vertical-align:middle; overflow:hidden;} .clsPop.clsPopFull > div > div {display:block; height:100%; vertical-align:middle; overflow:hidden;}
.clsPop.clsPopFull > div {display:block; height:100%; padding-top:30px; padding-bottom:30px;} .clsPop.clsPopFull > div {display:block; height:100%; padding-top:30px; padding-bottom:30px;}
.clsPop.clsPopFull .clsPopWrap {position:relative; padding-top:50px; height:100%; -webkit-overflow-scrolling: touch;} .clsPop.clsPopFull .clsPopWrap {position:relative; padding-top:50px; height:100%; -webkit-overflow-scrolling: touch;}
.clsPop.clsPopFull .clsPopTitle {position:absolute; left:0; right:0; top:0;} .clsPop.clsPopFull .clsPopTitle {position:absolute; left:0; right:0; top:0;}
.clsPop.clsPopFull .clsPopCont {height:100%; overflow-y:auto; -webkit-overflow-scrolling: touch;} .clsPop.clsPopFull .clsPopCont {height:100%; max-height:90vh; overflow-y:auto; -webkit-overflow-scrolling: touch;}
.clsPopScroll {position:absolute; left:0; right:0; top:50px; bottom:0;} .clsPopScroll {position:absolute; left:0; right:0; top:50px; bottom:0;}
@ -840,7 +840,7 @@ body.lock {width:100%; height:100%; overflow:hidden;}
.clsPopTitle {padding:0 15px; position: absolute; left: 0; right: 0; top: 0;} .clsPopTitle {padding:0 15px; position: absolute; left: 0; right: 0; top: 0;}
.clsPopTitle h5 {height:50px; line-height:50px; font-size:14pt;} .clsPopTitle h5 {height:50px; line-height:50px; font-size:14pt;}
.clsPopTitle a {height:50px; width:50px; background-size:20px auto;} .clsPopTitle a {height:50px; width:50px; background-size:20px auto;}
.clsPopCont {padding:20px; height: 100%; overflow-y: auto;} .clsPopCont {padding:20px;height: 100%; max-height:90vh; overflow-y: auto;}
.clspSch {padding:10px; padding-right:80px; position:relative;} .clspSch {padding:10px; padding-right:80px; position:relative;}
.clspSch input[type="submit"] {right:10px; top:10px; width:60px; font-size:11pt;} .clspSch input[type="submit"] {right:10px; top:10px; width:60px; font-size:11pt;}
.clspSch.slct {padding-left:130px;} .clspSch.slct {padding-left:130px;}
@ -1990,7 +1990,7 @@ span.org {color: #ff5a00;}
.smtlCont {position: relative; padding: 30px 20px; padding-right: 240px;} .smtlCont {position: relative; padding: 30px 20px; padding-right: 240px;}
.smtList.pop .smtlCont {padding-right: 20px;} .smtList.pop .smtlCont {padding-right: 20px;}
.smtlCont h5 {font-size: 13pt; font-weight: 400;} .smtlCont h5 {font-size: 13pt; font-weight: 400;}
.smtlCont h5 em {display: inline-block; vertical-align: middle; padding: 0 5px; width: 50px; height: 20px; line-height: 20px; color: #fff; font-size: 9pt; text-align: center; margin-right: 5px; font-style: normal;} .smtlCont h5 em {display: inline-block; vertical-align: middle; padding: 0 5px; height: 20px; line-height: 20px; color: #fff; font-size: 9pt; text-align: center; margin-right: 5px; font-style: normal;}
.smtlCont h5 em.org {background: #f60;} .smtlCont h5 em.org {background: #f60;}
.smtlCont h5 em.grn {background: #259e41;} .smtlCont h5 em.grn {background: #259e41;}
.smtlCont h5 em.blu {background: #0000ff;} .smtlCont h5 em.blu {background: #0000ff;}

5
FO/js/site.js
View File

@ -182,7 +182,7 @@ $(document).ready(function () {
$('.popWrap').css('display', 'none'); $('.popWrap').css('display', 'none');
$('html, body').removeClass('lock'); $('html, body').removeClass('lock');
}); });
//document.oncontextmenu = disableit; document.oncontextmenu = disableit;
}); });
var _uploadeditorimageitem; var _uploadeditorimageitem;
var _uploadeditorimagecallback; var _uploadeditorimagecallback;
@ -301,6 +301,7 @@ function cbviewcontents() {
location.href = "/Account/Index?ru="+location.href.replace(/#/gi,''); location.href = "/Account/Index?ru="+location.href.replace(/#/gi,'');
} }
} }
function poppaging(id, ptc, pno) { function poppaging(id, ptc, pno) {
$("#" + id).attr("data-lastpage", 1); $("#" + id).attr("data-lastpage", 1);
if (ptc > 10) { if (ptc > 10) {
@ -998,7 +999,7 @@ function msgadmin(t) {
} }
function isid(v) { function isid(v) {
//영문숫자-_ , 나머지입력시 오류반환 //영문숫자-_ , 나머지입력시 오류반환
var regExp = /[a-zA-Z0-9\-_]/i; var regExp = /^[A-Za-z0-9-_]*$/i;
var regExp2 = /[\,.=~!@#$%^&*()\[\]+|<>?:{}]/; var regExp2 = /[\,.=~!@#$%^&*()\[\]+|<>?:{}]/;
if (regExp.test(v) && !regExp2.test(v)) { if (regExp.test(v) && !regExp2.test(v)) {
return true; return true;

8
LMS_YNICTE.sln
View File

@ -22,6 +22,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Base", "Base\Base.csproj",
EndProjectSection EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SubversionScc) = preSolution
Svn-Managed = True
Manager = AnkhSVN - Subversion Support for Visual Studio
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
@ -59,8 +63,4 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E270664C-5FC8-4B5D-A0E2-C8836D9CC490} SolutionGuid = {E270664C-5FC8-4B5D-A0E2-C8836D9CC490}
EndGlobalSection EndGlobalSection
GlobalSection(SubversionScc) = preSolution
Svn-Managed = True
Manager = AnkhSVN2019 - Subversion Support for Visual Studio
EndGlobalSection
EndGlobal EndGlobal

1
Model/BaseModel.cs
View File

@ -544,6 +544,7 @@ namespace NP.Model
public DateTime time3 { get; set; } public DateTime time3 { get; set; }
public DateTime time4 { get; set; } public DateTime time4 { get; set; }
public DateTime time5 { get; set; } public DateTime time5 { get; set; }
public DateTime time6 { get; set; }
} }
//public class Data //public class Data

12
Model/CM.cs
View File

@ -482,6 +482,10 @@ namespace NP.Model
/// 시험수료기준 /// 시험수료기준
/// </summary> /// </summary>
public int finalcut { get; set; } public int finalcut { get; set; }
/// <summary>
/// 과제수료기준
/// </summary>
public int subjectcut { get; set; }
public String username { get; set; } public String username { get; set; }
public Int64 lectnocheck { get; set; } public Int64 lectnocheck { get; set; }
public int ischkatt { get; set; } public int ischkatt { get; set; }
@ -1221,6 +1225,7 @@ namespace NP.Model
/// 세금계산서 상태코드 /// 세금계산서 상태코드
/// </summary> /// </summary>
public int statecode { get; set; } public int statecode { get; set; }
public DateTime paycdt { get; set; }
} }
/// <summary> /// <summary>
/// 자격검정시험 /// 자격검정시험
@ -1836,6 +1841,7 @@ namespace NP.Model
public int isreexamable { get; set; } public int isreexamable { get; set; }
public IList<CMEXLayer> cmexlayers { get; set; } public IList<CMEXLayer> cmexlayers { get; set; }
public IList<CMEXQ> cmexqs { get; set; } public IList<CMEXQ> cmexqs { get; set; }
public DateTime? estart { get; set; }
} }
@ -3516,6 +3522,7 @@ namespace NP.Model
public bool isEnd { get; set; } public bool isEnd { get; set; }
public int? termend { get; set; } public int? termend { get; set; }
public int? peopleend { get; set; } public int? peopleend { get; set; }
public int? isselected { get; set; }
} }
/// <summary> /// <summary>
@ -3791,7 +3798,7 @@ namespace NP.Model
{ {
get get
{ {
return sdate != null ? sdate.Value.ToString("yyyyMMdd") : null; return cshape == 1 ? sdate != null ? sdate.Value.ToString("yyyyMMdd") : null : paycdt.ToString("yyyyMMdd");
} }
} }
/// <summary> /// <summary>
@ -3813,7 +3820,7 @@ namespace NP.Model
{ {
get get
{ {
return edate != null ? edate.Value.ToString("yyyyMMdd") : null; return cshape == 1 ? edate != null ? edate.Value.ToString("yyyyMMdd") : null : estart != null ? estart.Value.ToString("yyyyMMdd") : null;
} }
} }
/// <summary> /// <summary>
@ -3883,5 +3890,6 @@ namespace NP.Model
/// 강좌/과정키, 패키지강좌의 강좌키 /// 강좌/과정키, 패키지강좌의 강좌키
/// </summary> /// </summary>
public int cmno { get; set; } public int cmno { get; set; }
public DateTime paycdt { get; set; }
} }
} }

2
Model/PPLog.cs
View File

@ -68,7 +68,7 @@ namespace NP.Model
/// </summary> /// </summary>
public int? isreceipt { get; set; } public int? isreceipt { get; set; }
/// <summary> /// <summary>
/// 발행요청일 /// 계산서날짜
/// </summary> /// </summary>
public DateTime? taxdatereq { get; set; } public DateTime? taxdatereq { get; set; }
} }

3
Model/Pay.cs
View File

@ -573,6 +573,7 @@ namespace NP.Model
/// 학습기간(상시:일) /// 학습기간(상시:일)
/// </summary> /// </summary>
public int studydays { get; set; } public int studydays { get; set; }
public DateTime? estart { get; set; }
} }
/// <summary> /// <summary>
@ -1006,7 +1007,7 @@ namespace NP.Model
/// </summary> /// </summary>
public String address2 { get; set; } public String address2 { get; set; }
/// <summary> /// <summary>
/// 발행요청일 /// 계산서날짜
/// </summary> /// </summary>
public DateTime? taxdatereq { get; set; } public DateTime? taxdatereq { get; set; }
/// <summary> /// <summary>

1
Model/VMCRoom.cs
View File

@ -59,5 +59,6 @@ namespace NP.Model
public IList<PayItem> PayTaxItem { get; set; } public IList<PayItem> PayTaxItem { get; set; }
public IList<Lect> Lects { get; set; } public IList<Lect> Lects { get; set; }
public IList<Completion> Completions { get; set; } public IList<Completion> Completions { get; set; }
public Data ErrLi { get; set; }
} }
} }

2
Model/VMPay.cs
View File

@ -67,7 +67,7 @@ namespace NP.Model
/// </summary> /// </summary>
public int isreceipt { get; set; } public int isreceipt { get; set; }
/// <summary> /// <summary>
/// 발행요청일 /// 계산서날짜
/// </summary> /// </summary>
public DateTime? taxdatereq { get; set; } public DateTime? taxdatereq { get; set; }
} }