diff --git a/BO/Views/croom/attscds.cshtml b/BO/Views/croom/attscds.cshtml
index 38842e7..e53066c 100644
--- a/BO/Views/croom/attscds.cshtml
+++ b/BO/Views/croom/attscds.cshtml
@@ -93,9 +93,9 @@
@d.cname |
@d.usernameid |
@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString()) |
- @if (d.cshape == 2)
+ @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)
+ if (d.iscomplete != 1)
{
@d.eend.ToShortDateString() |
}
diff --git a/BO/Views/croom/cmlects.cshtml b/BO/Views/croom/cmlects.cshtml
index 0f1de11..322f4cd 100644
--- a/BO/Views/croom/cmlects.cshtml
+++ b/BO/Views/croom/cmlects.cshtml
@@ -101,7 +101,7 @@
@d.cdtymd |
@d.statusname |
@d.pstatusname |
- @if (d.cshape == 2 && d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) //혼합모드라면
+ @if (d.iscomplete != 1) //혼합모드라면
{
@d.estart.ToShortDateString() |
}
diff --git a/BO/Views/croom/grade0.cshtml b/BO/Views/croom/grade0.cshtml
index adf1bb4..0d79c9f 100644
--- a/BO/Views/croom/grade0.cshtml
+++ b/BO/Views/croom/grade0.cshtml
@@ -139,7 +139,7 @@
@((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString()) |
@if(Model.CMEV.cshape == 2)
{
- if(d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now)
+ if(d.iscomplete != 1)
{
@d.eend.ToShortDateString() |
}
diff --git a/BO/Views/croom/gradeall0.cshtml b/BO/Views/croom/gradeall0.cshtml
index 6e1dca6..1338333 100644
--- a/BO/Views/croom/gradeall0.cshtml
+++ b/BO/Views/croom/gradeall0.cshtml
@@ -66,7 +66,7 @@
@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString()) |
@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)
+ if(d.iscomplete != 1)
{
@d.eend.ToShortDateString() |
}
diff --git a/BO/Views/croom/gradeall2.cshtml b/BO/Views/croom/gradeall2.cshtml
index 4e6d40c..619ef94 100644
--- a/BO/Views/croom/gradeall2.cshtml
+++ b/BO/Views/croom/gradeall2.cshtml
@@ -57,7 +57,7 @@
@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString()) |
@if (d.cshape == 2)
{
- if (d.lestart != null && d.lestart > Convert.ToDateTime("1900-01-01") && d.lestart.ToShortDateString() != "0001-01-01" && d.lestart >= DateTime.Now)
+ if (d.iscomplete != 1)
{
@d.leend.ToShortDateString() |
}
diff --git a/BO/Views/croom/gradeall4.cshtml b/BO/Views/croom/gradeall4.cshtml
index 4885334..6d4038a 100644
--- a/BO/Views/croom/gradeall4.cshtml
+++ b/BO/Views/croom/gradeall4.cshtml
@@ -50,7 +50,7 @@
@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString()) |
@if (d.cshape == 2)
{
- if (d.lestart != null && d.lestart > Convert.ToDateTime("1900-01-01") && d.lestart.ToShortDateString() != "0001-01-01" && d.lestart >= DateTime.Now)
+ if (d.iscomplete != 1)
{
@d.leend.ToShortDateString() |
}
diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml
index 46b9b9e..f58fcf5 100644
--- a/BO/Views/croom/payview.cshtml
+++ b/BO/Views/croom/payview.cshtml
@@ -313,9 +313,12 @@ else if (p.isunpay == 3)
@Model.Lect.estart.ToString("yyyy-MM-dd HH:mm") |
-
+ @if(Model.Lect.iscomplete != 1)
+ {
+
+ }
}
}
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 4c47433..2dfefd6 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -170,7 +170,7 @@
,c.pstatus,c.payno,c.userno payuserno
,b.rstatus
,a2.rstime,a2.retime,a.sdate sstime,a.edate setime,a2.cshape,a2.studydays
- ,a.sdate,a.edate,a.isrebate
+ ,a.sdate,a.edate,a.isrebate,a.iscomplete
,scd.estart,scd.eend,scd.studyplace
,pp.typeman, pp.typeedu, pp.typegrade, pp.typejob, pp.pplno
,row_number() over(order by $orderby$a.payno,a.pino) rno
@@ -1504,7 +1504,8 @@
where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate <
and b.cshape=#cshape#
- and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart > '1900-01-01' and scd.eend > '1900-01-01' and ifnull(a.iscomplete,0) = 0 and scd.estart > now()
+ and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart > '1900-01-01' and scd.eend > '1900-01-01'
+ and scd.estart > now()
and date_add(a.cdt, interval +1 year) >= date_format(now(),'%Y-%m-%d 23:59:59'))
diff --git a/Model/CM.cs b/Model/CM.cs
index 3d189b6..0a13f29 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -3378,7 +3378,7 @@ namespace NP.Model
{
if (cshape == 2)
{
- if (lestart != null && lestart > Convert.ToDateTime("1900-01-01") && lestart.ToShortDateString() != "0001-01-01" && lestart >= DateTime.Now)
+ if (iscomplete != 1)
{
return "" + leend.ToShortDateString() + " | ";
}
@@ -3669,7 +3669,7 @@ namespace NP.Model
{
if(cshape == 2)
{
- if(lestart != null && lestart > Convert.ToDateTime("1900-01-01") && lestart.ToShortDateString() != "0001-01-01" && lestart >= DateTime.Now)
+ if(iscomplete != 1)
{
return "" + leend.ToShortDateString() + " | ";
}