fix: 주정차 심사 반영중

src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java

@@ -207,7 +207,7 @@ public class ParkingDao extends BaseMpowerDaoSupport {
                 .setParameter("msuUserid", HeaderUtil.getUserId())
                 .getQueryString();
         final String fieldStrs = "msMaincode, msSeq, msCarnum, msResult, msYear, msChasu, msSdate, msStartsi, msEdate, msCdate, " +
-                "msClosesi, msDatgb, msuCode, msuResult, msuReason, msWdate, msPos, rcMaincode, msuUserid";
+                "msClosesi, msDatagb, msuCode, msuResult, msuReason, msWdate, msPos, rcMaincode, msuUserid";
         return selectList(JudgeListDto.class, sql, fieldStrs);
     }
 

src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java

@@ -308,7 +308,7 @@ public class ResidentAndDisabledDao extends BaseMpowerDaoSupport {
                 .setParameter("msuUserid", HeaderUtil.getUserId())
                 .getQueryString();
         final String fieldStrs = "msMaincode, msSeq, msCarnum, msResult, msYear, msChasu, msSdate, msStartsi, msEdate, msCdate, " +
-                "msClosesi, msDatgb, msuCode, msuResult, msuReason, scWdate, scPos, msuUserid";
+                "msClosesi, msDatagb, msuCode, msuResult, msuReason, msWdate, msPos, msuUserid";
         return selectList(JudgeListDto.class, sql, fieldStrs);
     }
 

src/main/resources/sql/residentAndDisabled-mapper.xml

@@ -610,14 +610,16 @@
              , MSU.msu_code
              , DECODE(MSU.msu_result, '1', '1', '2', '2', '0') as msuResult
              , MSU.msu_reason
-             , MS.ms_wdate
-             , MS.ms_pos
+             , GR.sc_wdate as msWdate
+             , GR.sc_pos as msPos
              , MSU.msu_userid
         FROM min_simsa680_sc MS
            , min_simsa_user680_sc MSU
+           , gn_recall_sc GR
        WHERE MS.ms_maincode = MSU.msu_maincode
-         AND MSU.msu_userid = #{msuUserid}
          AND DECODE(MS.ms_result, '1', '1', '2', '2', '0') = '0'
+         AND MSU.msu_userid = #{msuUserid}
+         AND MS.ms_maincode = GR.sc_code
          <if test="msDatagb != null and msDatagb != ''">
          AND MS.ms_datagb = #{msDatagb}
          </if>