From fc2c561756b49cbde1fda1b4c629c5fc1ea44ce6 Mon Sep 17 00:00:00 2001 From: lch Date: Wed, 7 Jul 2021 01:27:37 +0000 Subject: [PATCH] =?UTF-8?q?"=EC=B6=9C=EB=A0=A5=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B2=B0=EC=A0=9C=EC=99=84=EB=A3=8C?= =?UTF-8?q?=EA=B1=B4=EC=9D=80=20=EB=AF=B8=EC=B6=9C=EB=A0=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dao/MyBatis/Maps/Lect.xml | 4 ++-- Dao/MyBatis/Maps/Pay.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index d049034..7f0c618 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1108,12 +1108,12 @@ ,case when b.pstatus = 1 then 99 else b.pstatus end as sortpstatus ,row_number() over(order by sortpstatus, c.retime, b.payno,a.pino) rno from payitem a - inner join pay b on b.payno=a.payno and b.pstatus in (1,21,22,51,55) and b.rstatus < 2 + inner join pay b on b.payno=a.payno and b.pstatus in (21,22,51,55) and b.rstatus < 2 inner join cm c on c.cmno=a.itemno and c.rstime < and c.retime > inner join lect l on l.cmno=c.cmno and (l.status < 5 or l.status = 6) and l.ischanged=0 and l.userno=b.userno inner join term d on d.tmno=c.tmno left outer join payrfd e on e.payno=a.payno and e.payno=a.payno and e.rstatus=0 - where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (1,21,22,51,55) and a.rstatus=0 + where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (21,22,51,55) and a.rstatus=0 and 1 = case when c.retime = '2099-12-31 23:59:59' and l.stime is not null then 0 else 1 end order by sortpstatus, c.retime, b.payno,a.pino ) a diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index 808a5ae..4f0f467 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -544,7 +544,7 @@ ,case when lect.edate is null then c.setime else lect.edate end as edate ,case when b.pstatus = 1 then 99 else b.pstatus end as sortpstatus from pay a - inner join payitem b on b.payno=a.payno and b.ptype in (0,1,4) and b.pstatus in (1,21,22,51,55) + inner join payitem b on b.payno=a.payno and b.ptype in (0,1,4) and b.pstatus in (21,22,51,55) inner join cm c on c.cmno=b.itemno and c.rstime < now() and c.retime > now() inner join term d on d.tmno=c.tmno inner join users u on u.userno=b.userno