From 5f5ad0d2cbb73a4988cf8578de888e526144dbd5 Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Wed, 10 Nov 2021 01:11:16 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=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{540}=20BO/Views/croom/attscds.cshtml=20BO/Views/croom/c?= =?UTF-8?q?mlects.cshtml=20BO/Views/croom/grade0.cshtml=20BO/Views/croom/g?= =?UTF-8?q?radeall0.cshtml=20BO/Views/croom/gradeall2.cshtml=20BO/Views/cr?= =?UTF-8?q?oom/gradeall4.cshtml=20BO/Views/croom/payview.cshtml=20Dao/MyBa?= =?UTF-8?q?tis/Maps/Lect.xml=20Model/CM.cs=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=20=EA=B5=90=EC=9C=A1=EC=9D=BC=EC=A0=95=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC,=20=EB=AA=A9=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Views/croom/attscds.cshtml | 4 ++-- BO/Views/croom/cmlects.cshtml | 2 +- BO/Views/croom/grade0.cshtml | 2 +- BO/Views/croom/gradeall0.cshtml | 2 +- BO/Views/croom/gradeall2.cshtml | 2 +- BO/Views/croom/gradeall4.cshtml | 2 +- BO/Views/croom/payview.cshtml | 9 ++++++--- Dao/MyBatis/Maps/Lect.xml | 5 +++-- Model/CM.cs | 4 ++-- 9 files changed, 18 insertions(+), 14 deletions(-) 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() + ""; }