From 5e08267d781849c377d903b80fef9e5e2f9d5afc Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Mon, 12 Jul 2021 06:32:18 +0000
Subject: [PATCH] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80>?=
 =?UTF-8?q?=EC=A6=9D=EB=B9=99=EC=84=9C=EB=A5=98=EC=B6=9C=EB=A0=A5=20:=20"?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80=20=20?=
 =?UTF-8?q?-=20=EC=B6=94=EA=B0=80=EC=A1=B0=EA=B1=B4=20:=20=EB=AF=B8?=
 =?UTF-8?q?=EC=9E=85=EA=B8=88=EC=9E=90=20=20-=20=EC=88=98=EA=B0=95?=
 =?UTF-8?q?=EA=B8=B0=EA=B0=84=20:=20=EC=83=81=EC=8B=9C=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EC=83=81=EC=8B=9C=20=EB=A1=9C=EB=A7=8C=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20(=EA=B2=B0=EC=A0=9C=EC=99=84=EB=A3=8C?=
 =?UTF-8?q?=EA=B0=80=20=EB=90=98=EC=A7=80=20=EC=95=8A=EC=95=98=EA=B8=B0=20?=
 =?UTF-8?q?=EB=95=8C=EB=AC=B8=EC=97=90=20=EC=88=98=EA=B0=95=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=84=20=ED=91=9C=EA=B8=B0=EA=B0=80=20=EB=B6=88=EA=B0=80?=
 =?UTF-8?q?=EB=8A=A5)=20=20-=20=EA=B2=B0=EC=A0=9C=EA=B8=88=EC=95=A1=20:=20?=
 =?UTF-8?q?=EB=AF=B8=EA=B2=B0=EC=A0=9C=20(1,000=EC=9B=90)=20=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=B6=9C=EB=A0=A5=20=20-=20=EC=9C=84=ED=83=81?=
 =?UTF-8?q?=EA=B3=84=EC=95=BD=EC=84=9C,=20=EC=9E=85=EA=B5=90=ED=86=B5?=
 =?UTF-8?q?=EC=A7=80=EC=84=9C,=20=EC=88=98=EB=A3=8C=EC=A6=9D=20:=20-=20?=
 =?UTF-8?q?=EB=A1=9C=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 현재 스마트검색으로 수강신청 시 계산서 신청한 사람의 경우 입금 전에는 계산서 요청 정보를 직접 확인이 불가능 함"
---
 Dao/MyBatis/Maps/Lect.xml   |  4 +--
 FO/Views/My/Document.cshtml | 71 ++++++++++++++++++++++++++++++-------
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 66366bf..fb9461a 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1508,7 +1508,7 @@
       <select id="lect.lecture.document" parameterClass="hashtable" resultClass="lect">
         select a.*
         from (
-          select a.lectno,a.userno,a.iscomplete,a.sdate,a.edate
+          select a.lectno,a.userno,a.iscomplete,a.sdate,a.edate,a.status
             ,b.cmno,b.cname,b.cshape
             ,b.rstime,b.retime
             ,b.sstime,b.setime
@@ -1550,7 +1550,7 @@
           left outer join comcode cc on cc.ccode = b.studyplace 
           left outer join paytax pt on pt.payno = e.payno and ifnull(pt.iscancel,0) =0
           left outer join payvbankin pv on pv.payno = a.payno 
-          where a.status=1 and a.ischanged=0
+          where a.status in (1,2) and a.ischanged=0
             <isNotNull property="cdts">and a.cdt &gt;= #cdts#</isNotNull>
             <isNotNull property="cdte">and a.cdt &lt;= #cdte#</isNotNull>
             <isNotNull property="asname">and ass.asname like concat('%',#asname#,'%')</isNotNull>
diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml
index 9f07624..398ba9e 100644
--- a/FO/Views/My/Document.cshtml
+++ b/FO/Views/My/Document.cshtml
@@ -60,28 +60,47 @@
                                     <b>@item.cname</b>
                                 </h5>
                                 <dl class="ltaDl">
-                                    @if (item.cshape == 1)
+                                    @if (item.status == 1)
                                     {
-                                        <dd>교육기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))</dd>
+                                        if (item.cshape == 1)
+                                        {
+                                            <dd>교육기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))</dd>
+                                        }
+                                        else
+                                        {
+                                            <dd>
+                                                수강기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.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")))
+                                                }
+                                            </dd>
+
+                                        }
+                                        <dd>결제금액 : @(item.payamt)원</dd>
                                     }
                                     else
                                     {
-                                        <dd>
-                                            수강기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))
-                                            @if (item.cshape == 2 && item.estart > Convert.ToDateTime("1900-01-01") && item.eend > Convert.ToDateTime("1900-01-01"))
+                                        var isAllDays = (item.retime == null ? String.Empty : Convert.ToDateTime(item.retime).ToString("yyyy-MM-dd")) == "2099-12-31";
+                                        if (isAllDays)
+                                        {
+                                            if (item.cshape == 1)
                                             {
-                                                @:| 집체교육기간 : @("[" + item.studyplacename + "] " + string.Format("{0}", item.estart.ToString("yy-MM-dd")))
+                                            <dd>교육기간 : 상시</dd>
                                             }
-                                        </dd>
-
+                                            else
+                                            {
+                                            <dd>수강기간 : 상시</dd>
+                                            }
+                                        }
+                                        <dd>미결제 : @(item.payamt)원</dd>
                                     }
-                                    <dd>결제금액 : @(item.payamt)원</dd>
                                 </dl>
                             </a>
                         </div>
                     </th>
                     <td class="ltaBtn" data-th="위탁계약서 : ">
-                        @if (item.pstatus == 1 && item.isrebate == 1)
+                        @if (item.pstatus == 1 && item.isrebate == 1 && item.status == 1)
                         {
                             <a href="#" onclick="javascript: educontract(@(item.lectno));"><img src="~/img/mypage/print.png"><br />인쇄</a>
                         }
@@ -91,10 +110,17 @@
                         }
                     </td>
                     <td class="ltaBtn" data-th="입교통지서 : ">
-                        <a href="#" onclick="javascript: eduannotation(@(item.lectno));"><img src="~/img/mypage/print.png"><br />[인쇄]</a>
+                        @if (item.status == 1)
+                        {                            
+                            <a href="#" onclick="javascript: eduannotation(@(item.lectno));"><img src="~/img/mypage/print.png"><br />[인쇄]</a>
+                        }
+                        else
+                        {
+                            @Html.Raw("-")
+                        }                        
                     </td>
                     <td class="ltaBtn" data-th="수료증 : ">
-                        @if (item.iscomplete == 1)
+                        @if (item.iscomplete == 1 && item.status == 1)
                         {
                             <a href="#" onclick="javascript: certification(@(item.lectno));"><img src="~/img/mypage/print.png"><br />[인쇄]</a>
                         }
@@ -161,7 +187,26 @@
                         }
                         else
                         {
-                            @Html.Raw("-")
+                            if (item.ptype == 3 && item.ispg == 1 && item.iscashrct != 1 && item.taxno > 0) /*가상계좌*/
+                            {
+                                if (item.iscancel != 1 && item.taxdate2 != null && !string.IsNullOrEmpty(item.mgtkey) && item.statecode >= 300) /*취소 and 발행일 and 세금계산서문서번호 */
+                                {
+                                    @Html.Raw("-")
+                                }
+                                else if (item.iscancel == 1) /*취소시 일반영수증*/
+                                {
+                                    @Html.Raw("-")
+                                }
+                                else
+                                {
+                                    <a href="#" onclick="showtax('@(item.payno)')">[신청중]</a>
+                                }                                
+                            }
+                            else
+                            {
+                                @Html.Raw("-")
+                            }
+                            
                         }
                     </td>
                 </tr>