From e8a3349faf289e0778056fda03adab457f247059 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Wed, 13 Jul 2022 20:58:26 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A3=BC=EC=A0=95=EC=B0=A8=20=EC=8B=AC?= =?UTF-8?q?=EC=82=AC=20=EB=B0=98=EC=98=81=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xit/biz/ctgy/v2/repository/ParkingDao.java | 2 +- .../biz/ctgy/v2/repository/ResidentAndDisabledDao.java | 2 +- src/main/resources/sql/residentAndDisabled-mapper.xml | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java b/src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java index 4ca3c5e..4aa94ff 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java +++ b/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); } diff --git a/src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java b/src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java index 20e08ba..effe389 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java +++ b/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); } diff --git a/src/main/resources/sql/residentAndDisabled-mapper.xml b/src/main/resources/sql/residentAndDisabled-mapper.xml index f237ed5..50e7207 100644 --- a/src/main/resources/sql/residentAndDisabled-mapper.xml +++ b/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 AND MS.ms_datagb = #{msDatagb}