diff --git a/BO/Views/croom/grade0.cshtml b/BO/Views/croom/grade0.cshtml
index 430551d..6cb6a8b 100644
--- a/BO/Views/croom/grade0.cshtml
+++ b/BO/Views/croom/grade0.cshtml
@@ -108,7 +108,7 @@
@d.isrebatename |
@d.asname |
@d.usernameid |
- @((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sstime).Value.ToShortDateString()) |
+ @((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString()) |
@d.attrate % |
@( d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString()) |
@(d.ex1cnt < 1 ? "-" :d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString()) |
diff --git a/BO/Views/croom/pay.cshtml b/BO/Views/croom/pay.cshtml
index a7ba797..8d088b4 100644
--- a/BO/Views/croom/pay.cshtml
+++ b/BO/Views/croom/pay.cshtml
@@ -131,7 +131,7 @@
@d.itemname@(d.ccount > 1 ? string.Format(" 외 {0} 건", d.ccount - 1) : "")
- @d.sstime.ToString("yy-MM-dd")~@d.setime.ToString("yy-MM-dd") |
+ @d.sdate.ToString("yy-MM-dd")~@d.edate.ToString("yy-MM-dd") |
@d.payamt.ToString("#,0") (@(d.pptype == 0 ? "미정" : d.pptypename)) |
@(d.pstatus == 1 ? d.payamt.ToString("#,0") : "0") (@(d.refundamt.ToString("#,0"))) |
@d.cdtymd |
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index b525818..16f0a66 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -772,6 +772,7 @@
,u.userno,u.userid,u.username
,ua.asname,ua.isjoin
,cm.cshape,cm.sstime,cm.setime
+ ,le.sdate,le.edate
,case when a.isexamready=1 then uee.exname else case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end end itemname
,row_number() over(order by case when pr.rstatus=0 and pri.rfdno is not null then 0 else 1 end, case when a.isexamready=1 then ue.cdt else p.cdt end desc) rno
,count(p.payno) over() pagetotalcount
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index 49b4588..15cb434 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -245,7 +245,7 @@
select a.lectno,b.userno
,row_number() over(order by $orderby$c.cname,c.cmno,u.username ) rno
,count(a.lectno) over() pagetotalcount
- ,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete,b.completetime
+ ,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete,b.completetime,b.sdate
,p.payoktime
,c.sstime,c.cmno,c.cname,c.classno
,b.attrate
diff --git a/Model/CM.cs b/Model/CM.cs
index 8e55d4a..1d4deb1 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -194,7 +194,7 @@ namespace NP.Model
{
get
{
- return sstime == null && setime == null ? "" : string.Format("{0} ~ {1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
+ return sstime == null && setime == null ? studydays+"일" : string.Format("{0} ~ {1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
}
}
public String ssretimeToDay