From c73ad70a1041ed5d33af5c57ced55bfd27a43365 Mon Sep 17 00:00:00 2001 From: hyunho Date: Tue, 10 Nov 2020 07:33:06 +0000 Subject: [PATCH] --- Dao/MyBatis/Maps/Lect.xml | 7 ++++ FO/Controllers/MyController.cs | 2 +- FO/Views/My/Index.cshtml | 2 +- FO/Views/My/Lecture.cshtml | 71 ++++++++++++++++++++++++++-------- Model/CM.cs | 2 + 5 files changed, 66 insertions(+), 18 deletions(-) diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 8fc4775..0767676 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1124,6 +1124,7 @@ ,e.isgroup,e.payno ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), ) AS char) email,ua.asname ,1 rno + ,scd.estart,scd.eend from lect a inner join cm b on b.cmno=a.cmno and b.sstime < @@ -1132,7 +1133,9 @@ inner join pay e on e.payno=a.payno and e.isgroup=0 inner join users u on u.userno=a.userno left outer join assign ua on ua.asno=u.asno + left outer join cminningscd scd on scd.cmisno = a.cmisno where a.userno=#userno# and a.status=1 and a.ischanged=0 + and b.cshape=#cshape# union all select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete ,b.cmno,b.cname,b.cshape,b.sstime,b.setime,b.classno,b.isrefund @@ -1140,6 +1143,7 @@ ,e.isgroup,e.payno ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), ) AS char) email,ua.asname ,row_number() over(partition by e.payno) rno + ,null estart, null eend from pay e inner join lect a on a.payno=e.payno and a.status=1 and a.ischanged=0 inner join cm b on b.cmno=a.cmno and b.sstime < @@ -1148,6 +1152,7 @@ inner join users u on u.userno=a.userno left outer join assign ua on ua.asno=u.asno where e.isgroup=1 and e.userno=#userno# and e.pstatus=1 + and b.cshape=#cshape# union all select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete ,b.cmno,b.cname,b.cshape,b.sstime,b.setime,b.classno,b.isrefund @@ -1155,6 +1160,7 @@ ,e.isgroup,e.payno ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), ) AS char) email,ua.asname ,row_number() over(partition by e.payno) rno + ,null estart, null eend from lect a0 inner join pay e on e.payno=a0.payno and e.isgroup=1 and e.userno<>#userno# and e.pstatus=1 inner join lect a on a.payno=e.payno and a.status=1 and a.ischanged=0 @@ -1164,6 +1170,7 @@ inner join users u on u.userno=a.userno left outer join assign ua on ua.asno=u.asno where a0.userno=#userno# and a0.status=1 and a0.ischanged=0 + and b.cshape=#cshape# order by case when setime < now() then 0 else 1 end desc,setime desc,payno

- + @*

*@ + 전체 |  + 교육장교육 |  + 온라인(혼합)교육 |  + 온라인교육 + @@ -29,20 +43,34 @@ {
-
- w.payno == d.payno && w.userno==ViewBag.SSUserNo).First().lectno, d.cmno) : "#")"> +
+ w.payno == d.payno && w.userno==ViewBag.SSUserNo).First().lectno, d.cmno) : "#")">
@d.tyear-@(d.tseq)기 @d.cshapename - @Html.Raw(d.isrebate == 1 ? "환급":"") + @Html.Raw(d.isrebate == 1 ? "환급" : "") @d.cname (@(d.classno))
-
-
@(d.setime > DateTime.Now ? "수강기간 학습중" : "종료")
-
교육기간 : @d.sstime.Value.ToString("yy/MM/dd") ~ @d.setime.Value.ToString("yy/MM/dd")
-
- -
+
+
@(d.setime > DateTime.Now ? "수강기간 학습중" : "종료")
+
교육기간 : @d.sstime.Value.ToString("yy/MM/dd") ~ @d.setime.Value.ToString("yy/MM/dd")
+ @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01")) + { +
+
집체교육일 : @d.estart.ToString("yy/MM/dd") ~ @d.eend.ToString("yy/MM/dd")
+ } +
+ + @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01")) + { +
+
+     + +
+
+ } +
@if (d.isgroup == 0) @@ -115,7 +143,8 @@
- 수강중인 강좌가 없습니다.
}
- @Html.HiddenFor(m=>m.intval) +@Html.HiddenFor(m => m.intval) +@Html.HiddenFor(m => m.stringval)