<기능개선>
통합테스트목록 - {539}
FO/Views/My/LectureOn.cshtml
Dao/MyBatis/Maps/Lect.xml
사용자 교육일정변경 버튼, 목록
This commit is contained in:
parent
5f5ad0d2cb
commit
c39d39354f
|
|
@ -1505,7 +1505,7 @@
|
|||
<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
|
||||
<isNotNull property="issubtable">
|
||||
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 scd.estart > now()-->
|
||||
<!--and (date_add(scd.eend,interval +5 day) > date_format(now(),'%Y-%m-%d 23:59:59'))-->
|
||||
and date_add(a.cdt, interval +1 year) >= date_format(now(),'%Y-%m-%d 23:59:59'))
|
||||
</isNotNull>
|
||||
|
|
|
|||
|
|
@ -44,14 +44,7 @@
|
|||
</div>
|
||||
</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>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span>-</span>
|
||||
}
|
||||
<dl><dd class="blu"><a href="#" onclick="javscript:openScd(@d.cmno,@d.lectno);">변경</a></dd></dl>
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue