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

This commit is contained in:
hyunho 2021-03-05 07:02:14 +00:00
parent 523f60e705
commit 43e5d35e7e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@
<td>@d.cdtymd</td>
<td>@d.statusname</td>
<td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, @d.pstatus, @d.payuserno)">@d.pstatusname</a></td>
@if (d.cshape == 2 && d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart >= DateTime.Now) //혼합모드라면
@if (d.cshape == 2 && d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) //혼합모드라면
{
<td class="link text-center"><a href="#" onclick="jabscript: openScd(@d.lectno, @d.cmisno);">@d.estart.ToShortDateString()</a></td>
}

5
Dao/MyBatis/Maps/Pay.xml
View File

@ -265,11 +265,12 @@
,#post#,#address1#,#address2#,#dmemo#,<include refid="sql.inv"></include>)
</update>
<update id="pay.freeok" parameterClass="long">
insert into lect (cmno,payno,pino,userno,status,attrate,isrebate,ispc,isjoin,ischanged,fgno2,<include refid="sql.inc"></include>)
select b.itemno,a.payno,b.pino,case when a.isgroup=1 then b.userno else a.userno end,1,0,b.isrebate,0,case when ua.isjoin=1 then 1 else 0 end,0,b.fgno,<include refid="sql.inv"></include>
insert into lect (cmno,payno,pino,userno,status,attrate,isrebate,ispc,isjoin,ischanged,fgno2,cmisno,<include refid="sql.inc"></include>)
select b.itemno,a.payno,b.pino,case when a.isgroup=1 then b.userno else a.userno end,1,0,b.isrebate,0,case when ua.isjoin=1 then 1 else 0 end,0,b.fgno,l.cmisno,<include refid="sql.inv"></include>
from pay a
inner join payitem b on b.payno=a.payno and b.ptype=0
inner join users u on u.userno=a.userno
inner join pplog l on a.pplno = l.pplno
left outer join assign ua on ua.asno=u.asno
where a.payno=#payno#;
</update>