Merge branch 'dev'

src/main/resources/config/conf.yml

@@ -17,7 +17,7 @@ api:
 file:
   cmm:
     upload:
-      root: /data/file/upload
+      root: c:/data/file/upload
 #      root: /Users/minuk/data/file/upload
       # 공지사항
       path: /kangnamSIM/simUpFile

src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml

@@ -129,12 +129,13 @@
              , MS.ms_seq
              , MS.ms_carnum
              , MU.name
+             , MS.ms_result
              , (SELECT code_nm
                   FROM tb_cmm_code_s
                  WHERE code_grp_id = 'TRAFFIC'
                    AND code_lcd = 'GANGNAM_SIMSA'
                    AND code_mcd = 'RESULT'
-                   AND code_cd = MS.ms_result) as ms_result
+                   AND code_cd = MS.ms_result) as ms_result_nm
              , (SELECT code_nm
                   FROM tb_cmm_code_s
                  WHERE code_grp_id = 'TRAFFIC'
@@ -162,21 +163,21 @@
            AND MSU.msu_team = #{msuTeam}
            </if>
            AND MSU.msu_userid = MU.userid
-         ORDER BY MSU.msu_userid, MU.name
+         ORDER BY MSU.msu_userid, MU.name, MS.ms_seq, MS.ms_carnum
     </select>
-
+<!--
     <select id="selectParkingJudgeResultList2" parameterType="map" resultType="camelCaseLinkedMap">
-        /* parking-mapper|selectParkingJudgeResultList|julim */
         SELECT MS.ms_maincode
              , MS.ms_seq
              , MS.ms_carnum
              , MU.name
+             , MS.ms_result
              , (SELECT code_nm
                  FROM tb_cmm_code_s
                 WHERE code_grp_id = 'TRAFFIC'
                   AND code_lcd = 'GANGNAM_SIMSA'
                   AND code_mcd = 'RESULT'
-                  AND code_cd = MS.ms_result) as ms_result
+                  AND code_cd = MS.ms_result) as ms_result_nm
              , (SELECT code_nm
                  FROM tb_cmm_code_s
                 WHERE code_grp_id = 'TRAFFIC'
@@ -198,4 +199,5 @@
           AND MSU.msu_userid = MU.userid
         ORDER BY MSU.msu_userid, MU.name
     </select>
+    -->
 </mapper>

src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml

@@ -137,12 +137,13 @@
              , MSS.ms_seq
              , MSS.ms_carnum
              , MU.name
+             , MSS.ms_result
              , (SELECT code_nm
                   FROM tb_cmm_code_s
                  WHERE code_grp_id = 'TRAFFIC'
                    AND code_lcd = 'GANGNAM_SIMSA'
                    AND code_mcd = 'RESULT'
-                   AND code_cd = MSS.ms_result) as ms_result
+                   AND code_cd = MSS.ms_result) as ms_result_nm
              , (SELECT code_nm
                   FROM tb_cmm_code_s
                  WHERE code_grp_id = 'TRAFFIC'