From f840a5e8be00d366397ae21dd510441e90138d6f Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 26 Dec 2023 14:44:37 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EA=B3=BC=20=EC=A0=9C=EC=99=B8=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=20=EC=82=AD=EC=A0=9C.=20=20=20-=20=EC=8B=9C?= =?UTF-8?q?=EA=B5=B0=EA=B5=AC=20=EC=BD=94=EB=93=9C=20=20=20=20private=20St?= =?UTF-8?q?ring=20sggCd;=20=20=20-=20=EC=97=85=EB=AC=B4=20=EA=B5=AC?= =?UTF-8?q?=EB=B6=84=20=EC=BD=94=EB=93=9C=20=20=20=20private=20String=20ta?= =?UTF-8?q?skSeCd;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/crdn/service/bean/CrdnBean.java | 2 -- .../cvlc/service/bean/CrdnCvlcptSubBean.java | 4 ---- .../java/cokr/xit/fims/excl/LevyExcl.java | 10 --------- .../fims/excl/service/bean/LevyExclBean.java | 2 ++ .../service/bean/LevyExclServiceBean.java | 2 +- .../sql/mapper/fims/excl/levyExcl-mapper.xml | 21 +++++++------------ 6 files changed, 11 insertions(+), 30 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java index 6afacd9f..ed0e3192 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java @@ -129,8 +129,6 @@ public class CrdnBean extends AbstractComponent { if(crdn.getCrdnSttsCd().equals("83")) { // 부과제외(TB_LEVY_EXCL) 대장 등록 LevyExcl excl01 = new LevyExcl(); - excl01.setSggCd(crdn.getSggCd()); - excl01.setTaskSeCd(crdn.getTaskSeCd()); excl01.setCrdnId(crdn.getCrdnId()); excl01.setLevyExclYmd(strCurrentDate); excl01.setLevyExclSeCd("2"); diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java index 2201ddf4..c474cdaa 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java @@ -226,8 +226,6 @@ public class CrdnCvlcptSubBean extends AbstractComponent { boolean retSuccess = false; LevyExcl excl01 = new LevyExcl(); excl01.setCrdnId(crdn.getCrdnId()); - excl01.setSggCd(crdn.getSggCd()); - excl01.setTaskSeCd(crdn.getTaskSeCd()); excl01.setLevyExclYmd(crdn.getLevyExclYmd()); excl01.setLevyExclSeCd(crdn.getLevyExclSeCd()); excl01.setLevyExclRsnCd(crdn.getLevyExclRsnCd()); @@ -363,8 +361,6 @@ public class CrdnCvlcptSubBean extends AbstractComponent { //부과제외 대장을 등록 한다. LevyExcl excl01 = new LevyExcl(); - excl01.setSggCd(crdnInfo.string("SGG_CD")); - excl01.setTaskSeCd(crdnInfo.string("TASK_SE_CD")); excl01.setCrdnId(crdnInfo.string("CRDN_ID")); excl01.setLevyExclYmd((new SimpleDateFormat("yyyyMMdd")).format(new Date())); excl01.setLevyExclSeCd("1"); diff --git a/src/main/java/cokr/xit/fims/excl/LevyExcl.java b/src/main/java/cokr/xit/fims/excl/LevyExcl.java index fe25941c..b09133f8 100644 --- a/src/main/java/cokr/xit/fims/excl/LevyExcl.java +++ b/src/main/java/cokr/xit/fims/excl/LevyExcl.java @@ -17,16 +17,6 @@ public class LevyExcl extends AbstractEntity { */ private String levyExclId; - /** - * 시군구 코드 - */ - private String sggCd; - - /** - * 업무 구분 코드 - */ - private String taskSeCd; - /** * 단속 ID */ diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java index c9f60ef6..6553ec34 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java @@ -87,6 +87,8 @@ public class LevyExclBean extends AbstractComponent { if (req.getCallPurpose().equals("create")) { levyExclInfo = levyExclMapper.selectCrdnInfo(req); + + levyExclInfo.set("LEVY_EXCL_SE_CD", req.getLevyExclSeCd()); // 부과 제외 구분 코드 } else { levyExclInfo = levyExclMapper.selectLevyExclInfo(req); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java index 03f0dd9f..913abb9e 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java @@ -69,7 +69,7 @@ public class LevyExclServiceBean extends AbstractServiceBean implements LevyExcl if (levyExcl.getLevyExclId() != null) { rtnMsg = levyExclBean.removeLevyExcl(levyExcl); } else { - // 부과제외 IDs 확인하여 1건 미만이면 종료 + // 부과제외 IDs 를 확인하여 건수가 1보다 작다면 종료.. if (levyExcl.getLevyExclIDs().length < 1) { rtnMsg = "[F] 작업 중 선택 자료가 존재하지 않습니다."; return rtnMsg; diff --git a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml index 61dafcc1..456118c8 100644 --- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml @@ -9,8 +9,6 @@ - - @@ -195,9 +193,6 @@ SELECT LE.LEVY_EXCL_ID /* 부과제외 ID */ - , LE.SGG_CD /* 시군구 코드 */ - , LE.TASK_SE_CD /* 업무 구분 코드 */ - , LE.CRDN_ID /* 단속 ID */ , LE.LEVY_EXCL_YMD /* 부과제외 일자 */ , LE.LEVY_EXCL_SE_CD /* 부과제외 구분 코드 */ , LE.LEVY_EXCL_RSN_CD /* 부과제외 사유 코드 */ @@ -215,13 +210,18 @@ , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.RGTR) AS RGTR_NM /* 등록자 명 */ , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.MDFR) AS MDFR_NM /* 수정자 명 */ , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.DLTR) AS DLTR_NM /* 삭제자 명 */ + , C.CRDN_ID /* 단속 ID */ + , C.SGG_CD /* 시군구 코드 */ + , C.TASK_SE_CD /* 업무 구분 코드 */ , C.VHRNO /* 차량번호 */ , C.CRDN_STTS_CD /* 단속 상태 코드 */ , C.CRDN_STTS_CHG_DT /* 단속 상태 변경 일시 */ , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM /* 단속 일시 */ , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM /* 단속 상태 명 */ + , CA.PARKNG_PSBLTY_RSLT_CD /* 주차 가능 결과 코드 */ FROM TB_LEVY_EXCL LE LEFT OUTER JOIN TB_CRDN C ON (LE.CRDN_ID = C.CRDN_ID) + LEFT OUTER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID)