From bb4473fd88001fe567a66157790b5ca93da1f118 Mon Sep 17 00:00:00 2001
From: jity7777 <jity7777  @example.com>
Date: Thu, 23 Feb 2023 06:14:49 +0000
Subject: [PATCH] =?UTF-8?q?<=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95>=201.=20P?=
 =?UTF-8?q?MS=20NO=20:=207474=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20D:/Project/NEW=5FLMS/2020LM?=
 =?UTF-8?q?SYNICTE/Dao/MyBatis/Maps/CRoom.xml=20=20-=20=EA=B2=B0=EC=A0=9C?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20=ED=95=AD=EB=AA=A9=EC=97=90=20'=EC=A0=84?=
 =?UTF-8?q?=EC=B2=B4=ED=99=98=EB=B6=88'=20=EB=B0=8F=20'=ED=99=98=EB=B6=88?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD'=20=EA=B1=B4=20=EB=85=B8=EC=B6=9C=20?=
 =?UTF-8?q?=EB=A7=89=EA=B8=B0=20=EC=BF=BC=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dao/MyBatis/Maps/CRoom.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 4f067f4..7ffef15 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -1404,13 +1404,14 @@
             left outer join assign ua on ua.asno=u.asno
             <dynamic prepend="where">
               <isNotEmpty property="pstatus" prepend="and">
-                <isEqual property="pstatus" compareValue="p21">(p.pstatus in (21) and p.rstatus = 0)</isEqual>
-                <isEqual property="pstatus" compareValue="p22">(p.pstatus in (22) and p.rstatus = 0)</isEqual>
-                <isEqual property="pstatus" compareValue="p1">(p.pstatus in (1) and (p.rstatus = 0 or pri.pino is null))</isEqual>
-                <isEqual property="pstatus" compareValue="rf1">(pr.rfdno is not null and pr.rstatus = 0)</isEqual>
-                <isEqual property="pstatus" compareValue="r1">(pi.rstatus=1 and p.payamt>p.refundamt)</isEqual>
-                <isEqual property="pstatus" compareValue="r2">(p.rstatus > 0 and p.payamt=p.refundamt)</isEqual>
-                <isEqual property="pstatus" compareValue="p41,42,43">(p.pstatus in (41,42,43)  and p.rstatus = 0)</isEqual>
+                <isEqual property="pstatus" compareValue="p21">(p.pstatus in (21) and p.rstatus = 0)</isEqual><!--결제대기-->
+                <isEqual property="pstatus" compareValue="p22">(p.pstatus in (22) and p.rstatus = 0)</isEqual><!--입금대기-->
+                <isEqual property="pstatus" compareValue="p1">(p.pstatus in (1) and (p.rstatus = 0 or pri.pino is null)) and p.rstatus = 0 
+                  and (case when p.rstatus=0 and pr.rstatus = 0 and pri.rfdno is not null then 1 else 0 end) = 0 </isEqual><!--결제완료-->
+                <isEqual property="pstatus" compareValue="rf1">(pr.rfdno is not null and pr.rstatus = 0)</isEqual><!--환불요청-->
+                <isEqual property="pstatus" compareValue="r1">(pi.rstatus=1 and p.payamt>p.refundamt)</isEqual><!--부분환불-->
+                <isEqual property="pstatus" compareValue="r2">(p.rstatus > 0 and p.payamt=p.refundamt)</isEqual><!--전액환불-->
+                <isEqual property="pstatus" compareValue="p41,42,43">(p.pstatus in (41,42,43)  and p.rstatus = 0)</isEqual><!--결제취소-->
               </isNotEmpty>
             </dynamic>
             ) a