diff --git a/BO/Views/user/ur.cshtml b/BO/Views/user/ur.cshtml index 61943ee..e89808d 100644 --- a/BO/Views/user/ur.cshtml +++ b/BO/Views/user/ur.cshtml @@ -371,13 +371,14 @@ }); function save() { - setv("User_userpno", val("userpno1") + val("userpno2")); + setv("User_userpno", val("userpno1")+"-"+ val("userpno2")); setv("User_mobile", formatmobile(val("User_mobile"))); setv("User_telno", formatphone(val("User_telno"))); if (val("User_usertype") == "0" || val("User_usertype") == "") { focus("User_usertype");msg("권한을 선택해주세요."); } else if (check("User_userid", null, "ID를 입력해주세요.")) { } else if (val("User_userid").length < 6) {focus("User_userid"); msg("ID를 6글자 이상으로 입력해주세요.");} else if (val("User_userno") == '0' && !ispassword(val("User_userpass"))) { focus("User_userpass"); msg("6글자이상의 비밀번호를 입력해주세요."); } + else if (val("userpno1") != null && val("userpno2") == null) {focus("userpno2");msg("주민등록번호를 제대로 입력해주세요.");} else if (check("User_username", null, "이름을 입력해주세요.")) { } else if (('@Model.viewname' == 'professor' || '@Model.viewname' == 'user') && check("User_email",null,"이메일을 입력해주세요")) { } else if (('@Model.viewname' == 'professor' || '@Model.viewname' == 'user') && check("User_mobile", null, "핸드폰 번호를 입력해주세요")) { } diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache index e852794..31cd896 100644 Binary files a/BO/obj/Debug/BO.csprojAssemblyReference.cache and b/BO/obj/Debug/BO.csprojAssemblyReference.cache differ diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache index ed983f3..c1b36df 100644 Binary files a/Base/obj/Debug/Base.csprojAssemblyReference.cache and b/Base/obj/Debug/Base.csprojAssemblyReference.cache differ diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 5fc122a..102b6eb 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1428,6 +1428,13 @@ ) a + update pay a inner join lect b on b.payno = a.payno and b.cmno = #cmno# and b.ischanged=0 and ifnull(b.isready,0) = 1 and b.status = 4 and DATE_ADD(b.oktime, INTERVAL 2 DAY) < diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache index 8afe29e..2fa0451 100644 Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs index 1bce72d..a3a818a 100644 --- a/FO/Controllers/MyController.cs +++ b/FO/Controllers/MyController.cs @@ -442,6 +442,11 @@ namespace NP.FO.Controllers else { //여기는 2021년 이전과정 근데 아직 뭔가 안나옴.. + vm.pagerowcount = vm.pagerowcount < 1 ? 10 : vm.pagerowcount; + var ht = SetHash(vm); + ht.Add("userno", SUserInfo.UserNo); + vm.Lects = Dao.Get("lect.lecture.document.past", ht); + } return View(vm); } diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml index c9b35b6..4d649d5 100644 --- a/FO/Views/My/Document.cshtml +++ b/FO/Views/My/Document.cshtml @@ -19,128 +19,174 @@
  • 환급금 지급내역서는 환급을 신청한 강좌만 출력하실 수 있습니다.
  • +
    +@Html.HiddenFor(w=>w.tabidx) +
    - 신규과정 |  - 2021년 이전과정  + 신규과정 |  + 2021년 이전과정 
    - - - - - - - - - - - - - - - - - - - @foreach (var item in Model.Lects) - { +@if (Model.tabidx == 0) +{ +
    강좌명위탁계약서입교통지서수료증계산서/영수증
    + + + + + + + + - + + + + + + + + @foreach (var item in Model.Lects) + { + + - - - - + + + + else + { + @Html.Raw("-") + } + + + } + +
    - 강좌명위탁계약서입교통지서수료증계산서/영수증
    + - - @if (item.pstatus == 1) - { -
    인쇄
    - } - else - { - @Html.Raw("-") - } -
    -
    [인쇄]
    -
    - @if (item.iscomplete == 1) - { -
    [인쇄]
    - } - else - { - @Html.Raw("-") - } -
    - @if (item.pstatus == 1 && item.rstatus == 0) - { - if (item.ptype == 6) + else + { +
    + 수강기간 : @item.sstime.Value.ToString("yy-MM-dd") ~ @(item.setime.Value.ToString("yy-MM-dd")) + @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.payamt)원
    + + + + +
    + @if (item.pstatus == 1) + { +
    인쇄
    + } + else { @Html.Raw("-") } - else if (item.ptype == 1 && item.ispg == 1) +
    +
    [인쇄]
    +
    + @if (item.iscomplete == 1) { - [영수증] +
    [인쇄]
    } - //현금영수증안붙었음 - @*else if (item.ptype == 3 && item.ispg == 1) - { - //일단대체? - [영수증] - }*@ else { - if (item.taxno > 0) + @Html.Raw("-") + } +
    + @if (item.pstatus == 1 && item.rstatus == 0) + { + if (item.ptype == 6) { - [@(item.taxdate2 == null ? "신청중" : "발행")] + @Html.Raw("-") } + else if (item.ptype == 1 && item.ispg == 1) + { + [영수증] + } + //현금영수증안붙었음 + @*else if (item.ptype == 3 && item.ispg == 1) + { + //일단대체? + [영수증] + }*@ else { - if (Convert.ToDateTime(Convert.ToDateTime(item.payoktime).ToString("yyyy-MM-dd")) <= Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-dd"))) + if (item.taxno > 0) { - [요청] + [@(item.taxdate2 == null ? "신청중" : "발행")] } else { - [요청] + if (Convert.ToDateTime(Convert.ToDateTime(item.payoktime).ToString("yyyy-MM-dd")) <= Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-dd"))) + { + [요청] + } + else + { + [요청] + } } } } - } - else - { - @Html.Raw("-") - } -
    +} +else +{ + + + + + + + + + - } - -
    강좌명수료증
    + + + @foreach (var item in Model.Lects) + { + + + + + +
    [인쇄]
    + + + } + + +}