diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 288683d..5fc122a 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1182,6 +1182,8 @@ ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), ) AS char) email,ua.asname ,1 rno ,scd.estart,scd.eend + ,cc.ccode studyplace + ,cc.cname studyplacename from lect a inner join cm b on b.cmno=a.cmno and b.sstime < @@ -1191,6 +1193,7 @@ 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 + left outer join comcode cc on cc.ccode = b.studyplace where a.userno=#userno# and a.status=1 and a.ischanged=0 and b.cshape=#cshape# union all @@ -1201,6 +1204,8 @@ ,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 + ,null studyplace + ,null studyplacename 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 < @@ -1218,6 +1223,8 @@ ,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 + ,null studyplace + ,null studyplacename 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 @@ -1381,6 +1388,7 @@ ,e2.pino,e2.payamt pipayamt,e2.itemname ,f.estart,f.eend ,cc.cname studyplacename + ,cc.ccode studyplace ,pt.taxno,pt.taxdate taxdate2 ,a.cdt ,row_number() over(order by a.cdt desc) rno diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml index 5f6b2fa..3c741e4 100644 --- a/FO/Views/My/Document.cshtml +++ b/FO/Views/My/Document.cshtml @@ -54,7 +54,20 @@ @item.cname
-
신청기간 : @item.rstime.Value.ToString("yy/MM/dd") ~ @(item.retime.Value.ToString("yy/MM/dd")) | @(item.cshape == 2 ? "집체":"")교육기간 : @(item.cshape == 2 ? "["+item.studyplacename+"]" : "") @item.sstime.Value.ToString("yy/MM/dd") ~ @(item.setime.Value.ToString("yy/MM/dd"))
+ @if (item.cshape == 1) + { +
교육기간 : @item.sstime.Value.ToString("yy/MM/dd") ~ @(item.setime.Value.ToString("yy/MM/dd"))
+ } + else + { +
+ 수강기간 : @item.sstime.Value.ToString("yy/MM/dd") ~ @(item.setime.Value.ToString("yy/MM/dd")) + @if (item.cshape == 2 && item.estart > Convert.ToDateTime("1900-01-01") && item.eend > Convert.ToDateTime("1900-01-01")) + { + @:| 집체교육기간 : @("[" + item.studyplacename + "]" + string.Format("{0}", item.estart.ToString("yy'/'MM'/'dd"))) + } +
+ }
결제금액 : @(item.payamt)원
diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml index 97df445..d50f1c1 100644 --- a/FO/Views/My/Index.cshtml +++ b/FO/Views/My/Index.cshtml @@ -53,7 +53,7 @@
@d.intval-@(d.intval2)기 - @(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합") + @(d.intval3 == 0 ? "온라인" : d.intval3 == 1 ? "교육장" : "온라인") @Html.Raw(d.intval6 == 1 ? "환급" : "") @d.strval
@@ -91,7 +91,7 @@
@(d.tyear)-@(d.tseq)기 - @(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "혼합") + @(d.cshape == 0 ? "온라인" : d.cshape == 1 ? "교육장" : "온라인") @Html.Raw(d.isrefund == 1 ? "환급" : "") @d.cname
@@ -117,7 +117,7 @@
@d.intval-@(d.intval2)기 - @(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합") + @(d.intval3 == 0 ? "온라인" : d.intval3 == 1 ? "교육장" : "온라인") @Html.Raw(d.intval6 == 1 ? "환급" : "") @d.strval
diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml index f377f09..f270908 100644 --- a/FO/Views/My/Lecture.cshtml +++ b/FO/Views/My/Lecture.cshtml @@ -19,7 +19,7 @@
  • 수료증은 수료를 완료한 인원만 출력하실 수 있습니다. 출력이 안되실 경우 나의 상담을 이용하여 문의주시기 바랍니다.
  • ·2020년 이전 과정은 수강과정에서 조회되지 않으며, ‘증빙서류출력’으로 이동하여 이용해주시기 바랍니다.
    • - +
    @*

    *@ 전체 |  @@ -53,12 +53,13 @@
    @(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")
    - } +
    + 수강기간 : @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.studyplacename + "]" + string.Format("{0}", d.estart.ToString("yy'/'MM'/'dd"))) + } +
    @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01") && d.iscomplete != 1 && Convert.ToDateTime(d.estart) > DateTime.Now) diff --git a/FO/Views/My/Ready.cshtml b/FO/Views/My/Ready.cshtml index 76a2782..639a962 100644 --- a/FO/Views/My/Ready.cshtml +++ b/FO/Views/My/Ready.cshtml @@ -40,10 +40,10 @@
    @(d.pstatus == 55 ? "승인대기" : d.pstatus == 51 ? "심사중" : d.pstatus == 21 ? "결제대기" : d.pstatus == 22 ? "입금대기" : d.pstatus == 1 && d.rfdstatus > 0 ? "환불요청" : d.pstatus == 1 ? "결제완료" : d.rstatus == 1 ? "부분환불" : d.rstatus == 2 ? "전액환불" : "-")
    - 신청(교육)기간 : @d.rstime.Value.ToString("yy'/'MM'/'dd") ~ @d.retime.Value.ToString("yy'/'MM'/'dd") (@d.sstime.ToString("yy'/'MM'/'dd") ~ @d.setime.ToString("yy'/'MM'/'dd")) + @d.sstime.ToString("yy'/'MM'/'dd") ~ @d.setime.ToString("yy'/'MM'/'dd") @if (d.cshape == 2) { - @:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "]" + string.Format("{0}~{1}", d.cmiestart.ToString("yy'/'MM'/'dd"), d.cmieend.ToString("yy'/'MM'/'dd")))) + @:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "]" + string.Format("{0}", d.cmiestart.ToString("yy'/'MM'/'dd")))) }
    diff --git a/Model/CM.cs b/Model/CM.cs index 7e4b786..549704c 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -980,6 +980,14 @@ namespace NP.Model public int estidx { get; set; } public DateTime? sstime { get; set; } public DateTime? setime { get; set; } + public String ssretimeToDay + { + get + { + TimeSpan ts = Convert.ToDateTime(setime) - Convert.ToDateTime(sstime); + return sstime == null && setime == null ? "" : string.Format("{0}", ts.Days); + } + } public int aportion { get; set; } public int mportion { get; set; } @@ -1065,7 +1073,7 @@ namespace NP.Model { get { - return cshape == 0 ? "ON" : cshape == 1 ? "OFF" : cshape == 2 ? "혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인" : "-"; } } public String certgradeccname { get; set; } @@ -1104,6 +1112,7 @@ namespace NP.Model public String cmnos { get; set; } public int ispassat { get; set; } public DateTime? completetime { get; set; } + public String studyplace { get; set; } public String studyplacename { get; set; } public int taxno { get; set; } public DateTime taxdate { get; set; } diff --git a/Model/Pay.cs b/Model/Pay.cs index 9719978..59a761b 100644 --- a/Model/Pay.cs +++ b/Model/Pay.cs @@ -396,7 +396,7 @@ namespace NP.Model { get { - return cshape == 0 ? "ON" : cshape == 1 ? "OFF" : cshape == 2 ? "혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인" : "-"; } } public String cname { get; set; }