KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

<기능개선> 

통합테스트목록 - {539}
FO/Views/My/LectureOn.cshtml
Dao/MyBatis/Maps/Lect.xml
사용자 교육일정변경 버튼, 목록
This commit is contained in:
kdh0120 2021-11-10 01:11:48 +00:00
parent 5f5ad0d2cb
commit c39d39354f
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dao/MyBatis/Maps/Lect.xml
View File

@ -1505,7 +1505,7 @@
<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull> <isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
<isNotNull property="issubtable"> <isNotNull property="issubtable">
and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01' and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01'
and scd.estart &gt; now() <!--and scd.estart &gt; now()-->
<!--and (date_add(scd.eend,interval +5 day) &gt; date_format(now(),'%Y-%m-%d 23:59:59'))--> <!--and (date_add(scd.eend,interval +5 day) &gt; date_format(now(),'%Y-%m-%d 23:59:59'))-->
and date_add(a.cdt, interval +1 year) &gt;= date_format(now(),'%Y-%m-%d 23:59:59')) and date_add(a.cdt, interval +1 year) &gt;= date_format(now(),'%Y-%m-%d 23:59:59'))
</isNotNull> </isNotNull>

9
FO/Views/My/LectureOn.cshtml
View File

@ -44,14 +44,7 @@
</div> </div>
</th> </th>
<td class="ltaBtn" data-th="교육일정변경 : "> <td class="ltaBtn" data-th="교육일정변경 : ">
@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) <dl><dd class="blu"><a href="#" onclick="javscript:openScd(@d.cmno,@d.lectno);">변경</a></dd></dl>
{
<dl><dd class="blu"><a href="#" onclick="javscript:openScd(@d.cmno,@d.lectno);">변경</a></dd></dl>
}
else
{
<span>-</span>
}
</td> </td>
</tr> </tr>
} }