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} 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 @@ -267,7 +267,7 @@ AND MSU.msu_team = #{msuTeam} 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 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' ) @@ -482,7 +486,7 @@ AND MSU.msu_team = #{msuTeam} 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 @@ -518,7 +522,7 @@ AND MSU.msu_team = #{msuTeam} 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