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

This commit is contained in:
hyunho 2021-03-26 05:07:12 +00:00
parent 8ec6db8ee4
commit 3db612f699
7 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BO/Controllers/croomController.cs
View File

@ -22,8 +22,8 @@ namespace NP.BO.Controllers
{
if (!IsPost())
{
vm.stringval5 = DateTime.Now.AddMonths(-2).ToString("yyyy-MM-01");
vm.stringval6 = Convert.ToDateTime(vm.stringval5).AddMonths(3).AddSeconds(-1).ToString("yyyy-MM-dd");
vm.stringval5 = null;
vm.stringval6 = null;
}
var ht = SetHash(vm, false);
@ -252,6 +252,10 @@ namespace NP.BO.Controllers
{
ht.Add("statusin", "5,8,9");
}
else if (vm.addstringval == "3")
{
ht.Add("statusin", "6");
}
else
{
ht.Add("status", vm.addstringval);

5
BO/Views/croom/cmlects.cshtml
View File

@ -398,7 +398,7 @@
}
function setScd2() {
capp("/acommon/GetScdForMixEdu", { cmno: @Model.CM.cmno }, "renderScd2");
capp("/acommon/GetScdForMixEdu", { cmno: @Model.CM.cmno, iscmlects : 1 }, "renderScd2");
}
function renderScd2() {
var divedudate = $("#divedudate");
@ -406,8 +406,6 @@
divedudate.empty();
select.append("<option value=''>교육일정</option>");
$.each(capResult.obj, function (i, d) {
if (d.estartday >= @DateTime.Now.DayOfYear)
{
if (@Model.addstringval4.ToString() != "2099-12-31") {
if (d.estartShortDateString == "@Model.addstringval4") {
select.append("<option value='" + d.estartShortDateString + "' selected> " + d.estartShortDateString + "</option > ");
@ -419,7 +417,6 @@
else {
select.append("<option value='" + d.estartShortDateString + "'> " + d.estartShortDateString + "</option > ");
}
}
});
divedudate.append(select);
}

2
BO/Views/croom/lectcms.cshtml
View File

@ -66,7 +66,7 @@
<td>@d.ssrename</td>
<td>@(d.cshape != 0 ? d.studyplacename : "-")</td>
<td>@d.quotastr</td>
<td>@d.countsuccess</td>
<td>@d.countsuccessstr</td>
@*<td>@d.countstanbyaccept / @d.countstanbypay / @d.countstanbydraw</td>*@
<td>@d.countstanbyacceptstr</td>
@*<td>@string.Format("( {0} / {1} / {2} / {3} )", d.countlect.ToString("#,0"),d.countsuccess.ToString("#,0"),d.countstanbydraw.ToString("#,0"),d.countstanbypay.ToString("#,0"))</td>*@

5
Base/Controller/ACommonCRoom.cs
View File

@ -1008,7 +1008,7 @@ namespace NP.Base.Controllers
}
[HttpPost]
public JsonResult GetScdForMixEdu(int cmno)
public JsonResult GetScdForMixEdu(int cmno, int iscmlects = 0)
{
var result = Dao.Get<CMinningscd>("cm.cminningscds.applyedu", new System.Collections.Hashtable() { { "cmno", cmno }});
foreach (var item in result)
@ -1018,6 +1018,9 @@ namespace NP.Base.Controllers
item.isEnd = true;
}
if (iscmlects == 1)
return JsonBack(result.OrderByDescending(o => o.estart));
return JsonBack(result);
}

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

@ -126,14 +126,20 @@
<isNotNull property="tyear" prepend="and">a.tyear=#tyear#</isNotNull>
<isNotNull property="tmno" prepend="and">a.tmno=#tmno#</isNotNull>
<isNotNull property="islect" prepend="and" >b.isdel=0 and (u.status in (1,99) or u.status is null)</isNotNull>
<isNotNull property="isallday" prepend="and">
<!--<isNotNull property="isallday" prepend="and">
date_format(b.retime,'%Y%m%d') = '20991231'
or
(
date_format(b.sstime,'%Y%m%d') &gt;= date_format(#sstime#,'%Y%m%d')
and date_format(b.setime,'%Y%m%d') &lt;= date_format(#setime#,'%Y%m%d')
)
</isNotNull>
</isNotNull>-->
<isNotNull property="sstime" prepend="and">
date_format(b.sstime,'%Y%m%d') &gt;= date_format(#sstime#,'%Y%m%d') or date_format(b.retime,'%Y%m%d') = '20991231'
</isNotNull>
<isNotNull property="setime" prepend="and">
date_format(b.setime,'%Y%m%d') &lt;= date_format(#setime#,'%Y%m%d') or date_format(b.retime,'%Y%m%d') = '20991231'
</isNotNull>
</dynamic>
group by b.cmno
<isNotNull property="nocomplete">having sum(d.iscomplete) &lt; 1</isNotNull>
@ -1495,7 +1501,7 @@
<select id="lect.lecture.document" parameterClass="hashtable" resultClass="lect">
select a.*
from (
select a.lectno,a.userno,a.isrebate,a.iscomplete
select a.lectno,a.userno,a.isrebate,a.iscomplete,a.sdate,a.edate
,b.cmno,b.cname,b.cshape
,b.rstime,b.retime
,b.sstime,b.setime

4
FO/Views/My/Document.cshtml
View File

@ -61,12 +61,12 @@
<dl class="ltaDl">
@if (item.cshape == 1)
{
<dd>교육기간 : @item.sstime.Value.ToString("yy-MM-dd") ~ @(item.setime.Value.ToString("yy-MM-dd"))</dd>
<dd>교육기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))</dd>
}
else
{
<dd>
수강기간 : @item.sstime.Value.ToString("yy-MM-dd") ~ @(item.setime.Value.ToString("yy-MM-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")))

2
Model/CM.cs
View File

@ -156,7 +156,7 @@ namespace NP.Model
{
get
{
return retimeymd == "2099-12-31" ? "상시" : rstime == null && retime == null ? "" : string.Format("{0} ~ {1}", rstime == null ? "" : rstime.Value.ToString("yyyy-MM-dd"), retime == null ? "" : retime.Value.ToString("yyyy-MM-dd"));
return retimeymd == "2099-12-31" ? string.Format("상시 ({0}일)", rsretimeToDay ) : rstime == null && retime == null ? "" : string.Format("{0} ~ {1}", rstime == null ? "" : rstime.Value.ToString("yyyy-MM-dd"), retime == null ? "" : retime.Value.ToString("yyyy-MM-dd"));
}
}