From ecfa8391c51420aed0046aa51759930999137298 Mon Sep 17 00:00:00 2001
From: jiho83 <kimjio83@nate.com>
Date: Wed, 4 Jan 2023 09:34:01 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A0=95=EB=A0=AC=EC=88=9C=EC=84=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EA=B1=B0=EC=A3=BC=EC=9E=90,?=
 =?UTF-8?q?=EC=9E=A5=EC=95=A0=EC=9D=B8=20=EC=9D=98=EA=B2=AC=EC=A7=84?=
 =?UTF-8?q?=EC=88=A0=20=EC=9D=B8=EC=84=9C=ED=8A=B8=20=ED=95=AD=EB=AA=A9=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20-=20ms=5Fmaincode->ms=5Fseq=20=EC=88=9C?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20-=20gn=5Frecall=5Fsc?=
 =?UTF-8?q?=20=ED=85=8C=EC=9D=B4=EB=B8=94=20sc=5Ftransfer,=20sc=5Fstate=20?=
 =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/parking-mapper.xml            |  4 ++--
 .../resources/sql/residentAndDisabled-mapper.xml     | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/sql/parking-mapper.xml b/src/main/resources/sql/parking-mapper.xml
index 9435433..c023c0a 100644
--- a/src/main/resources/sql/parking-mapper.xml
+++ b/src/main/resources/sql/parking-mapper.xml
@@ -232,7 +232,7 @@
            AND MSU.msu_team = #{msuTeam}
            </if>
          GROUP BY MS.ms_maincode, MS.ms_seq, MS.ms_carnum
-         ORDER BY MS.ms_maincode, MS.ms_seq, MS.ms_carnum
+         ORDER BY MS.ms_seq, MS.ms_maincode, MS.ms_carnum
     </native-query>
 
     <native-query id="selectParkingJudgeResultList">
@@ -267,7 +267,7 @@
            AND MSU.msu_team = #{msuTeam}
            </if>
            AND MSU.msu_userid = MU.userid
-         ORDER BY MSU.msu_userid, MU.name, MS.ms_maincode, MS.ms_seq, MS.ms_carnum
+         ORDER BY MSU.msu_userid, MU.name, MS.ms_seq, MS.ms_maincode, MS.ms_carnum
     </native-query>
 
     <native-query id="selectJudegStdCount">
diff --git a/src/main/resources/sql/residentAndDisabled-mapper.xml b/src/main/resources/sql/residentAndDisabled-mapper.xml
index 9792ed0..b4e0d8e 100644
--- a/src/main/resources/sql/residentAndDisabled-mapper.xml
+++ b/src/main/resources/sql/residentAndDisabled-mapper.xml
@@ -165,7 +165,9 @@
             sc_contad5,
             sc_contad6,
             sc_contad7,
-            sc_contad8
+            sc_contad8,
+            sc_transfer,
+            sc_state
         ) VALUES (
             gn_recall_sc_seq.NEXTVAL,
             (SELECT RPAD(NVL(MAX(e.sc_seq), '2022'), 10, '0') + 1
@@ -201,7 +203,9 @@
             #{scContad5},
             #{scContad6},
             #{scContad7},
-            #{scContad8}
+            #{scContad8},
+            '1',
+            '1'
         )
     </native-query>
 
@@ -482,7 +486,7 @@
            AND MSU.msu_team = #{msuTeam}
            </if>
          GROUP BY MS.ms_maincode, MS.ms_seq, MS.ms_carnum
-         ORDER BY MS.ms_maincode, MS.ms_seq, MS.ms_carnum
+         ORDER BY MS.ms_seq, MS.ms_maincode, MS.ms_carnum
     </native-query>
 
     <native-query id="selectJudgeResultList">
@@ -518,7 +522,7 @@
            AND MSU.msu_team = #{msuTeam}
            </if>
            AND MSU.msu_userid = MU.userid
-         ORDER BY MSU.msu_userid, MU.name, MS.ms_maincode, MS.ms_seq, MS.ms_carnum
+         ORDER BY MSU.msu_userid, MU.name, MS.ms_seq, MS.ms_maincode, MS.ms_carnum
     </native-query>
 
     <native-query id="selectJudegStdCount">