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

<프로그램수정> 

1.PMSNO : NULL
2.처리내역 : 상시추가에 의한 오류사항 수정
This commit is contained in:
kdh0120 2021-03-31 04:53:32 +00:00
parent efd23c0845
commit 832562d076
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@
<td>@d.isrebatename</td>
<td>@d.asname</td>
<td>@d.usernameid</td>
<td>@((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sstime).Value.ToShortDateString())</td>
<td>@((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
<td class="link text-center"><a onclick="viewatt(@d.lectno)" href="#">@d.attrate %</a></td>
<td>@( d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString())</td>
<td>@(d.ex1cnt < 1 ? "-" :d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString())</td>

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

@ -131,7 +131,7 @@
&nbsp;@d.itemname@(d.ccount > 1 ? string.Format(" 외 {0} 건", d.ccount - 1) : "")
</a>
</td>
<td>@d.sstime.ToString("yy-MM-dd")~<span style="display: inline-block">@d.setime.ToString("yy-MM-dd")</span></td>
<td>@d.sdate.ToString("yy-MM-dd")~<span style="display: inline-block">@d.edate.ToString("yy-MM-dd")</span></td>
<td>@d.payamt.ToString("#,0")<br />(@(d.pptype == 0 ? "미정" : d.pptypename))</td>
<td class="link" style="text-align: right !important;"><a href="#" onclick="gorefund(@d.payno, @d.pstatus)">@(d.pstatus == 1 ? d.payamt.ToString("#,0") : "0")<br /><span class="red">(@(d.refundamt.ToString("#,0")))</span></a></td>
<td>@d.cdtymd</td>

1
Dao/MyBatis/Maps/CRoom.xml
View File

@ -772,6 +772,7 @@
,u.userno,u.userid,u.username
,ua.asname,ua.isjoin
,cm.cshape,cm.sstime,cm.setime
,le.sdate,le.edate
,case when a.isexamready=1 then uee.exname else case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end end itemname
,row_number() over(order by case when pr.rstatus=0 and pri.rfdno is not null then 0 else 1 end, case when a.isexamready=1 then ue.cdt else p.cdt end desc) rno
,count(p.payno) over() pagetotalcount

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

@ -245,7 +245,7 @@
select a.lectno,b.userno
,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">c.cname,c.cmno,u.username</isNull> ) rno
,count(a.lectno) over() pagetotalcount
,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete,b.completetime
,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete,b.completetime,b.sdate
,p.payoktime
,c.sstime,c.cmno,c.cname,c.classno
,b.attrate

2
Model/CM.cs
View File

@ -194,7 +194,7 @@ namespace NP.Model
{
get
{
return sstime == null && setime == null ? "" : string.Format("{0} ~ {1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
return sstime == null && setime == null ? studydays+"일" : string.Format("{0} ~ {1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
}
}
public String ssretimeToDay