diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java index 49878ce1..4b3b330b 100644 --- a/src/main/java/cokr/xit/fims/crdn/Crdn.java +++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java @@ -37,10 +37,20 @@ public class Crdn extends AbstractEntity { */ private String crdnInptSeCd; + /** + * 민원 연계 여부 + */ + private String cvlcptLinkYn; + + /** + * 민원 연계 테이블 명 + */ + private String cvlcptLinkTblNm; + /** - * 연계 ID + * 민원 연계 ID */ - private String linkId; + private String cvlcptLinkId; /** * 단속 구분 코드 @@ -317,16 +327,6 @@ public class Crdn extends AbstractEntity { */ private String delRsn; - /** - * 연계 테이블 명 - */ - private String linkTblNm; - - /** - * 민원 연계 여부 - */ - private String cvlcptLinkYn; - /** * 위반코드 */ diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml index 76c9eb84..75d64676 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml @@ -8,7 +8,9 @@ - + + + @@ -57,7 +59,6 @@ - @@ -94,6 +95,7 @@ , C.SGG_CD , C.TASK_SE_CD , C.CRDN_REG_SE_CD + , C.CVLCPT_LINK_TBL_NM , C.CRDN_YMD , C.CRDN_TM , C.VHRNO @@ -112,8 +114,6 @@ , C.NXRP_CRDN_LINK_YN , C.NXRP_CRDN_LINK_USER_ID , C.NXRP_CRDN_LINK_DT - , C.LINK_TBL_NM - , C.LINK_ID , C.GPS_X , C.GPS_Y , V.VLTN_CD @@ -148,7 +148,7 @@ FROM TB_CRDN C INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) - LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID) + LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.CVLCPT_LINK_ID = CC.CVLCPT_LINK_ID) LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN) LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml index 4dcd3b1b..ddba2239 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml @@ -17,9 +17,9 @@ INSERT INTO TB_CRDN ( , CRDN_REG_SE_CD , CRDN_INPT_SE_CD , TASK_SE_CD - , CVLCPT_LINK_YN - , LINK_TBL_NM - , LINK_ID + , CVLCPT_LINK_YN + , CVLCPT_LINK_TBL_NM + , CVLCPT_LINK_ID , RTPYR_ID , ADDR_SN , CRDN_YMD @@ -64,8 +64,8 @@ INSERT INTO TB_CRDN ( , #{crdnInptSeCd} , #{taskSeCd} , #{cvlcptLinkYn} - , #{linkTblNm} - , #{linkId} + , #{cvlcptLinkTblNm} + , #{cvlcptLinkId} , #{rtpyrId} , #{addrSn} , #{crdnYmd} diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index b91b5e2c..23555325 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -15,8 +15,7 @@ SELECT C.CRDN_ID , GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) AS CRDN_REG_SE_NM , C.CRDN_INPT_SE_CD , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM - , C.LINK_TBL_NM - , C.LINK_ID + , C.CVLCPT_LINK_TBL_NM , C.RTPYR_ID , C.CRDN_YMD , C.CRDN_TM @@ -112,7 +111,7 @@ SELECT C.CRDN_ID FROM TB_CRDN C INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) LEFT OUTER JOIN TB_TEAM T ON (CA.TEAM_ID = T.TEAM_ID) -LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID) +LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.CVLCPT_LINK_ID = CC.CVLCPT_LINK_ID) LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID) LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) @@ -452,7 +451,7 @@ SELECT C.CRDN_ID FROM TB_CRDN C INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) LEFT OUTER JOIN TB_TEAM T ON (CA.TEAM_ID = T.TEAM_ID) - LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID) + LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.CVLCPT_LINK_ID = CC.CVLCPT_LINK_ID) WHERE C.DEL_YN = 'N' AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = 'DPV'