From 4ba8d0a8cb66dc0c2e1ff7c60c6170927c4943e6 Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Tue, 9 Nov 2021 23:49:31 +0000 Subject: [PATCH] =?UTF-8?q?<=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95>=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=20-=20{515,516,517,525}=20Base/Controller/ACommonCroom.cs=20BO?= =?UTF-8?q?/Views/croom/attscds.cshtml=20BO/Views/croom/cmlects.cshtml=20B?= =?UTF-8?q?O/Views/croom/grade.cshtml=20BO/Views/croom/grade0.cshtml=20BO/?= =?UTF-8?q?Views/croom/gradeall.cshtml=20BO/Views/croom/gradeall0.cshtml?= =?UTF-8?q?=20BO/Views/croom/gradeall2.cshtml=20BO/Views/croom/gradeall4.c?= =?UTF-8?q?shtml=20BO/Views/croom/payview.cshtml=20BO/Views/Shared/Partial?= =?UTF-8?q?/ScdScript.cshtml=20Dao/Mybatis/Maps/CM.xml=20-=20"cm.cminnings?= =?UTF-8?q?cds.applyedu.admin"=20Dao/Mybatis/Maps/CM.xml=20-=20"cm.cminnin?= =?UTF-8?q?gscds.applyedu"=20Dao/Mybatis/Maps/CM.xml=20-=20"cm.cminningscd?= =?UTF-8?q?s.applyedu.lectno"=20Dao/MyBatix/maps/Lect.xml=20-=20"lect.lect?= =?UTF-8?q?sds.all"=20=EA=B5=90=EC=9C=A1=EC=9D=BC=EC=A0=95=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=82=A0=EC=A7=9C=20=EC=B6=9C=EB=A0=A5=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EB=B3=80=EA=B2=BD=20=EC=84=B1=EC=A0=81=EC=B2=98?= =?UTF-8?q?=EB=A6=AC(=EC=A0=84=EC=B2=B4)=20=EA=B3=BC=EC=A0=9C=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=98=A4=EB=A5=98=EC=82=AC=ED=95=AD=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Views/Shared/Partial/ScdScript.cshtml | 103 ++++++ BO/Views/croom/attscds.cshtml | 330 +++++++----------- BO/Views/croom/cmlects.cshtml | 102 +----- BO/Views/croom/grade.cshtml | 3 +- BO/Views/croom/grade0.cshtml | 77 +---- BO/Views/croom/gradeall.cshtml | 1 + BO/Views/croom/gradeall0.cshtml | 77 ----- BO/Views/croom/gradeall2.cshtml | 75 ----- BO/Views/croom/gradeall4.cshtml | 102 +----- BO/Views/croom/payview.cshtml | 405 ++++++++++------------- Base/Controller/ACommonCRoom.cs | 2 +- Dao/MyBatis/Maps/CM.xml | 33 +- Dao/MyBatis/Maps/Lect.xml | 18 +- 13 files changed, 464 insertions(+), 864 deletions(-) create mode 100644 BO/Views/Shared/Partial/ScdScript.cshtml diff --git a/BO/Views/Shared/Partial/ScdScript.cshtml b/BO/Views/Shared/Partial/ScdScript.cshtml new file mode 100644 index 0000000..b7b396c --- /dev/null +++ b/BO/Views/Shared/Partial/ScdScript.cshtml @@ -0,0 +1,103 @@ + + \ No newline at end of file diff --git a/BO/Views/croom/attscds.cshtml b/BO/Views/croom/attscds.cshtml index 09a2b2a..38842e7 100644 --- a/BO/Views/croom/attscds.cshtml +++ b/BO/Views/croom/attscds.cshtml @@ -1,130 +1,130 @@ @model NP.Model.VMLect -
- -
- @*@Html.Partial("./Partial/SearchCaption")*@ -
- - - - - - - - - - - - - - - - - - - - - -
교육종료일 -
- @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval) ? (DateTime?)null : Convert.ToDateTime(Model.stringval), new ViewDataDictionary { { "name", "stringval" } }) -
- 		교육생 -
- @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "name", "searchtype" }, { "selected", Model.searchtype }, { "valuetext", "usernamestr:이름;useridstr:ID" } }) - @Html.Partial("./Partial/Text", Model.searchtext, Helpers.DicText(new NP.Model.TextDic() { Name = "searchtext", Style = "width:70%; display:inline-block;", Value = Model.searchtext, CssClass = "ff" })) -
-
과정명 -
- @Html.Partial("./Partial/Text", Model.stringval2, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval2", Value = Model.stringval2 })) -
- 		교육장 -
- @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":교육장선택" } }) -
-
-
-
-
- * 온라인 교육만 해당되며, 교육장교육은 검색되지 않습니다. 교육장교육은 성적처리 기능을 이용해주세요. -
- -
+ + +
+ @*@Html.Partial("./Partial/SearchCaption")*@ +
+ + + + + + + + + + + + + + + + + + + + + +
교육종료일 +
+ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval) ? (DateTime?)null : Convert.ToDateTime(Model.stringval), new ViewDataDictionary { { "name", "stringval" } }) +
+ 		교육생 +
+ @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "name", "searchtype" }, { "selected", Model.searchtype }, { "valuetext", "usernamestr:이름;useridstr:ID" } }) + @Html.Partial("./Partial/Text", Model.searchtext, Helpers.DicText(new NP.Model.TextDic() { Name = "searchtext", Style = "width:70%; display:inline-block;", Value = Model.searchtext, CssClass = "ff" })) +
+
과정명 +
+ @Html.Partial("./Partial/Text", Model.stringval2, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval2", Value = Model.stringval2 })) +
+ 		교육장 +
+ @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":교육장선택" } }) +
+
-
-
-
- @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) - 출석처리 - 결석처리 - 미입력처리 -
-
- - + +
+ * 온라인 교육만 해당되며, 교육장교육은 검색되지 않습니다. 교육장교육은 성적처리 기능을 이용해주세요. +
+ +
+
+
+
+
+ @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) + 출석처리 + 결석처리 + 미입력처리 +
+
+
+ + + + + + + + + + + + + + + + @foreach (var d in Model.Lects) + { - - - - - - - - - - + + + @if (d.cshape == 2) + { + + } + else + { + + } + + + + + @if (d.cshape == 2) + { + if (d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) + { + + } + else + { + + } + } + else + { + + } + + @if (!ViewBag.IsSubAdmin96) + { + + } + else + { + + } - - - @foreach (var d in Model.Lects) - { - - - - @if (d.cshape == 2) - { - - } - else - { - - } - - - - - @if (d.cshape == 2) - { - if (d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) - { - - } - else - { - - } - } - else - { - - } - - @if (!ViewBag.IsSubAdmin96) - { - - } - else - { - - } - - } - -
No운영기수교육장과정명교육생(ID)교육시작일교육종료일집합교육출석여부수료여부
No운영기수교육장과정명교육생(ID)교육시작일교육종료일집합교육출석여부수료여부@d.rnorvt@d.sseq-@d.studyplacename@d.cname@d.usernameid@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())@d.eend.ToShortDateString()@d.eend.ToShortDateString()@d.edate.Value.ToShortDateString()@d.istatusname@Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)@Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)
@d.rnorvt@d.sseq-@d.studyplacename@d.cname@d.usernameid@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())@d.eend.ToShortDateString()@d.eend.ToShortDateString()@d.edate.Value.ToShortDateString()@d.istatusname@Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)@Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)
-
- @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount) -
- + } + + +
+ @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount) + +

교육일정변경닫기

@@ -139,6 +139,7 @@ @section scriptsHeader{ @Html.Partial("./Partial/FileScript") @Html.Partial("./Partial/ScriptDate") + @Html.Partial("./Partial/ScdScript") } @section scripts{ diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml index c539f0e..46b9b9e 100644 --- a/BO/Views/croom/payview.cshtml +++ b/BO/Views/croom/payview.cshtml @@ -9,180 +9,184 @@
  • 기본정보
  • 환불관리
    • -
    -
    신청자정보
    - - - - - - - - - - - - - - - - - - - - - - - - -
    결제번호@p.payno주문날짜@p.cdtymdhms주문자명@p.username
    생년월일@(p.userpno == null || p.userpno.Length < 6 ? "" : p.userpno.Substring(0, 6))일반전화@p.telno휴대폰@p.mobile
    주소@p.post @p.address1 @p.address2이메일@p.email
    -
    -
    -
    결제정보
    - - - - - - - - - - - - - - - - - - - - - - - +
    저장
    } - -
    결제금액@(p.pstatus == 1 ? p.payamt.ToString("#,0") : "0")원결제방식 - @if (isexamready) - { - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-결제방식선택;4:현금;5:현금+카드;6:무료;9:위탁계약" }, { "name", "ptype" }, { "style", "width:100%;" } }) - } - else if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0) - { - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:신용카드2:계좌이체;3:가상계좌;4:무통장입금;6:무료" }, { "name", "ptype2" }, { "style", "width:100%;" }, { "selected", Model.Pay.ptype } }) - } - else - { - @:@p.ptypename - } - 결제상태 - @if (isexamready) - { - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:결제완료;21:결제대기;41:결제취소" }, { "name", "pstatus" }, { "selected", p.pstatus }, { "style", "width:100%;" } }) - } - else - { - @:@p.pstatusname2 @*@(p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0 && p.paylimit.Value > DateTime.Now?string.Format("(만료일: {0})", p.paylimit.Value.ToString("yyyy-MM-dd")):"")*@ - } - @if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0@*&& p.paylimit.Value < DateTime.Now*@) - { - 미수처리 - 결제완료처리 - 취소 - } - else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1) - { - @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } }) - 미수입금처리 - } - else if (p.isunpay == 2) - { - @:(미수입금) - } - else if (p.isunpay == 3) - { - @:(결제변경) - } -
    신청/승인일@(p.oktime == null ? "" : p.oktime.Value.ToString("yyyy-MM-dd HH:mm:ss"))입금일 - @if (isexamready) - { - @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } }) - } - else - { - @:@(p.payoktime == null ? "" : p.payoktime.Value.ToString("yyyy-MM-dd HH:mm:ss")) - } - LG유플러스 코드@(p.ispg == 0 ? "수동결제" : p.pgkey)
    - 계산서신청 - - @if (p.taxno != null) - { - 신청 - } - else - { - - - } - - 계산서발행 - - @if (p.iscancel == null || p.taxdate == null) - { - - - } - else - { - if (p.iscancel == 1) +
    + + +
    +
    신청자정보
    + + + + + + + + + + + + + + + + + + + + + + + + +
    결제번호@p.payno주문날짜@p.cdtymdhms주문자명@p.username
    생년월일@(p.userpno == null || p.userpno.Length < 6 ? "" : p.userpno.Substring(0, 6))일반전화@p.telno휴대폰@p.mobile
    주소@p.post @p.address1 @p.address2이메일@p.email
    +
    +
    +
    결제정보
    + + + + + + + + + + + + + + + + + + + + + + + - - - -
    결제금액@(p.pstatus == 1 ? p.payamt.ToString("#,0") : "0")원결제방식 + @if (isexamready) { - 발행취소 + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-결제방식선택;4:현금;5:현금+카드;6:무료;9:위탁계약" }, { "name", "ptype" }, { "style", "width:100%;" } }) + } + else if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0) + { + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:신용카드2:계좌이체;3:가상계좌;4:무통장입금;6:무료" }, { "name", "ptype2" }, { "style", "width:100%;" }, { "selected", Model.Pay.ptype } }) } else { - if (p.taxdate == null) + @:@p.ptypename + } + 결제상태 + @if (isexamready) + { + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:결제완료;21:결제대기;41:결제취소" }, { "name", "pstatus" }, { "selected", p.pstatus }, { "style", "width:100%;" } }) + } + else + { + @:@p.pstatusname2 @*@(p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0 && p.paylimit.Value > DateTime.Now?string.Format("(만료일: {0})", p.paylimit.Value.ToString("yyyy-MM-dd")):"")*@ + } + @if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0@*&& p.paylimit.Value < DateTime.Now*@) +{ +미수처리 +결제완료처리 +취소 +} +else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1) +{ +@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } }) +미수입금처리 +} +else if (p.isunpay == 2) +{ +@:(미수입금) +} +else if (p.isunpay == 3) +{ +@:(결제변경) +} +
    신청/승인일@(p.oktime == null ? "" : p.oktime.Value.ToString("yyyy-MM-dd HH:mm:ss"))입금일 + @if (isexamready) + { + @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } }) + } + else + { + @:@(p.payoktime == null ? "" : p.payoktime.Value.ToString("yyyy-MM-dd HH:mm:ss")) + } + LG유플러스 코드@(p.ispg == 0 ? "수동결제" : p.pgkey)
    + 계산서신청 + + @if (p.taxno != null) + { + 신청 + } + else + { + - + } + + 계산서발행 + + @if (p.iscancel == null && p.taxdate == null) + { + - + } + else + { + if (p.iscancel == 1) { - 미발행 + 발행취소 } else { - 발행완료 + if (p.taxdate == null) + { + 미발행 + } + else + { + 발행완료 + } } } - } - - 입금계좌 - - @p.vactbankname | @p.vactnum | @p.vactname -
    -
    -
    -
    상품내역
    - - - @foreach (var d in pi) - { - - - - - - - - + + + - } - @if (p.isdvr == 1) +
    상품코드상품유형과정분류상품명판매가수량합계금액
    @d.itemno@(d.ptype == 2 ? "교재" : d.ptype == 3 ? "시험" : d.pcgname)@d.cgname@d.itemname@((d.payamt / d.pcnt).ToString("#,0"))@d.pcnt@d.payamt.ToString("#,0") + 입금계좌 + + @p.vactbankname | @p.vactnum | @p.vactname +
    +
    +
    +
    상품내역
    + + + @foreach (var d in pi) + { + + + + + + + + + + } + @if (p.isdvr == 1) + { + + } + +
    상품코드상품유형과정분류상품명판매가수량합계금액
    @d.itemno@(d.ptype == 2 ? "교재" : d.ptype == 3 ? "시험" : d.pcgname)@d.cgname@d.itemname@((d.payamt / d.pcnt).ToString("#,0"))@d.pcnt@d.payamt.ToString("#,0")
    - 택배비 : @(p.deliamt > 0 ? (p.deliamt.ToString("#,0") + " 원") : "직접수령")
    - 최종합계: @p.payamt.ToString("#,0") 원
    + @if (isexamready) { -
    - 택배비 : @(p.deliamt > 0 ? (p.deliamt.ToString("#,0") + " 원") : "직접수령")
    - 최종합계: @p.payamt.ToString("#,0") 원
    - @if (isexamready) - { -
    저장
    - } +
    @if (pi.FirstOrDefault().isrebate == 1) @@ -231,7 +235,7 @@ {
    배송지정보
    -
    + @@ -266,8 +270,6 @@
    @(p.codetime == null ? "" : p.codetime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
    - -
    저장
    @@ -312,7 +314,7 @@
    - 수정
    + 수정
    } @@ -407,6 +409,7 @@ @section scriptsHeader{ @Html.Partial("./Partial/ScriptPost") @Html.Partial("./Partial/ScriptDate") + @Html.Partial("./Partial/ScdScript") } @section scripts{ } diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 90d7212..8cd5da7 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -1385,7 +1385,7 @@ namespace NP.Base.Controllers [HttpPost] public JsonResult GetScdForMixEdu(int cmno, int iscmlects = 0) { - var result = Dao.Get("cm.cminningscds.applyedu", new System.Collections.Hashtable() { { "cmno", cmno }}); + var result = Dao.Get("cm.cminningscds.applyedu.admin", new System.Collections.Hashtable() { { "cmno", cmno }}); foreach (var item in result) { item.scdInfoSummary = string.Format("[{0}] {1}", item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm")); diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index 9b04864..efd9427 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -1865,6 +1865,35 @@ and a.cmno=#cmno# and a.studyplace=#studyplace# +