diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java index 401a4cef..b76695ec 100644 --- a/src/main/java/cokr/xit/fims/crdn/Crdn.java +++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java @@ -485,5 +485,5 @@ public class Crdn extends AbstractEntity { /** * 연계 테이블 명 */ - private String linkTblNm; + private String linkNm; } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java index 0b7addc4..c9321ca5 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java @@ -214,13 +214,13 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService HWPFile resultFile = HWPReader.fromFile(resultPath); - String linkTblNm = dataObject.string("LINK_TBL_NM"); - if(!linkTblNm.equals("")) { + String linkNm = dataObject.string("LINK_NM"); + if(!linkNm.equals("")) { FileQuery fileQuery = new FileQuery(); - if(linkTblNm.equals("TB_ESB_INTERFACE")) { + if(linkNm.equals("TB_ESB_INTERFACE")) { fileQuery.setInfoType("010"); - } else if(linkTblNm.equals("TB_SAEOL")) { + } else if(linkNm.equals("TB_SAEOL")) { fileQuery.setInfoType("020"); } else { throw new RuntimeException("한글 파일 출력 중 오류가 발생하였습니다."); @@ -291,12 +291,12 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService //동영상 존재 여부 확인 dataObject.set("videoExist", "N"); - String linkTblNm = dataObject.string("LINK_TBL_NM"); - if(!linkTblNm.equals("")) { + String linkNm = dataObject.string("LINK_NM"); + if(!linkNm.equals("")) { - if(linkTblNm.equals("TB_ESB_INTERFACE")) { + if(linkNm.equals("TB_ESB_INTERFACE")) { fileQuery.setInfoType("010"); - } else if(linkTblNm.equals("TB_SAEOL")) { + } else if(linkNm.equals("TB_SAEOL")) { fileQuery.setInfoType("020"); } else { throw new RuntimeException("파일 조회 중 오류가 발생하였습니다."); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java index 2a9f9a3c..71f47d65 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -137,6 +137,39 @@ public class Crdn01Controller extends ApplicationController { mav.addObject("crdnInfo", json ? info : toJson(info)); mav.addObject("openerPageName", request.getParameter("openerPageName")); + + + String vltnByTask = ""; + switch(urlTaskSeCd) { + case "PVS" -> { vltnByTask = "WEB002"; } + case "BPV" -> { vltnByTask = "FIM005"; } + case "DPV","ECA" -> { vltnByTask = "FIM006"; } + } + Map> commonCodes = getCodesOf("FIM011","FIM053","LVS005",vltnByTask); + mav.addObject("FIM011List", commonCodes.get("FIM011")); + mav.addObject("FIM053List", commonCodes.get("FIM053")); + mav.addObject("LVS005List", commonCodes.get("LVS005")); + mav.addObject("VLTNList", commonCodes.get(vltnByTask)); + + switch(urlTaskSeCd) { + case "PVS" -> { + commonCodes = getCodesOf("FIM002","FIM007","FIM009"); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + mav.addObject("FIM007List", commonCodes.get("FIM007")); + mav.addObject("FIM009List", commonCodes.get("FIM009")); + } + case "BPV" -> { + commonCodes = getCodesOf("FIM002","FIM009"); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + mav.addObject("FIM009List", commonCodes.get("FIM009")); + } + case "DPV" -> { + commonCodes = getCodesOf("FIM034"); + mav.addObject("FIM034List", commonCodes.get("FIM034")); + } + case "ECA" -> { } + } + return mav; } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java index ecafbb2c..a0350b3c 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java @@ -58,7 +58,7 @@ public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Serv crdn.setTaskSeCd(infoCrdn.string("TASK_SE_CD")); // 업무 구분 코드 crdn.setCrdnRegSeCd("03"); // 단속 등록 구분 코드(FIM026) - 재 등록 crdn.setCrdnInptSeCd(infoCrdn.string("CRDN_INPT_SE_CD")); // 단속 입력 구분 코드 - crdn.setLinkTblNm(infoCrdn.string("LINK_TBL_NM")); // 연계 테이블 명 + crdn.setLinkNm(infoCrdn.string("LINK_NM")); // 연계 테이블 명 crdn.setLinkId(infoCrdn.string("LINK_ID")); // 연계 ID crdn.setRtpyrId(infoCrdn.string("RTPYR_ID")); // 납부자 ID crdn.setCrdnSeCd(infoCrdn.string("CRDN_SE_CD")); // 단속 구분 코드 diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java index 1fb08c41..8741dd79 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java @@ -35,13 +35,13 @@ public class Sprt03ServiceBean extends AbstractServiceBean implements Sprt03Serv CrdnQuery crdnQuery = new CrdnQuery(); crdnQuery.setCrdnId(crdnId); DataObject cvlcptInfo = crdn01Mapper.selectCivilComplaintReceiptInitialDataInfo(crdnQuery); - String linkTblNm = cvlcptInfo.string("LINK_TBL_NM"); - if(!linkTblNm.equals("")) { + String linkNm = cvlcptInfo.string("LINK_NM"); + if(!linkNm.equals("")) { FileQuery fileQuery = new FileQuery(); - if(linkTblNm.equals("TB_ESB_INTERFACE")) { + if(linkNm.equals("TB_ESB_INTERFACE")) { fileQuery.setInfoType("010"); - } else if(linkTblNm.equals("TB_SAEOL")) { + } else if(linkNm.equals("TB_SAEOL")) { fileQuery.setInfoType("020"); } else { throw new RuntimeException("파일 조회 중 오류가 발생하였습니다."); diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index c9f6feac..815efc42 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -14,7 +14,7 @@ SELECT C.CRDN_ID , C.TASK_SE_CD , C.CRDN_REG_SE_CD , C.CRDN_INPT_SE_CD - , C.LINK_TBL_NM + , C.LINK_NM , C.LINK_ID , C.CRDN_SE_CD , C.RTPYR_ID @@ -107,7 +107,7 @@ SELECT C.CRDN_ID , C.DEL_DT , C.DEL_RSN FROM TB_CRDN C -INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) +INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID) LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID) LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID) @@ -162,7 +162,7 @@ SELECT C.CRDN_ID , C.VHRNO , C.CRDN_PLC FROM TB_CRDN C - INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) + INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_STTS_CD = '01' @@ -219,7 +219,7 @@ SELECT C.CRDN_ID , LE.LEVY_EXCL_RSN_CD , C.ETC_CN FROM TB_CRDN C - INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) + INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} @@ -283,7 +283,7 @@ SELECT C.CRDN_ID , CC.CVLCPT_APLY_CN , CC.CVLCPT_APLY_SE_CD FROM TB_CRDN C - INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) + INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) WHERE C.DEL_YN = 'N' AND CC.DEL_YN = 'N' AND C.CRDN_ID = #{crdnId} @@ -296,10 +296,10 @@ SELECT C.CRDN_ID , CC.CVLCPT_RCPT_YMD , CC.CVLCPT_PRCS_PRNMNT_DT , CC.CVLCPT_APLY_CN - , C.LINK_TBL_NM + , C.LINK_NM , C.LINK_ID FROM TB_CRDN C - INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) + INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) WHERE C.DEL_YN = 'N' AND CC.DEL_YN = 'N' AND C.CRDN_ID = #{crdnId} @@ -310,7 +310,7 @@ SELECT C.CRDN_ID , CC.CVLCPT_APLY_CN , CC.CVLCPT_PRCS_RSLT_CN FROM TB_CRDN C - INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) + INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) WHERE C.DEL_YN = 'N' AND C.CRDN_ID = #{crdnId} @@ -346,10 +346,10 @@ SELECT C.CRDN_ID , C.VHCL_COLOR , C.USE_FUEL_CD , C.VIN - , C.LINK_TBL_NM - , C.LINK_ID + , C.LINK_NM + , C.LINK_ID FROM TB_CRDN C - INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) + INNER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) WHERE C.DEL_YN = 'N' AND C.CRDN_ID = #{crdnId} diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml index 09b16c7b..2b6dd636 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml @@ -107,7 +107,7 @@ INSERT INTO TB_CRDN ( , DLTR , DEL_RSN , TASK_SE_CD - , LINK_TBL_NM + , LINK_NM ) VALUES ( #{crdnId} , (SELECT SGG_CD FROM TB_SGG_INFO WHERE INST_CD = #{institute}) @@ -184,7 +184,7 @@ INSERT INTO TB_CRDN ( , #{removedBy} , #{delRsn} , #{taskSeCd} - , #{linkTblNm} + , #{linkNm} ) diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index 13ff0260..d74ec51f 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -104,7 +104,7 @@ SELECT C.CRDN_ID , C.TASK_SE_CD , C.CRDN_REG_SE_CD , C.CRDN_INPT_SE_CD - , C.LINK_TBL_NM + , C.LINK_NM , C.LINK_ID , C.CRDN_SE_CD , C.RTPYR_ID @@ -197,7 +197,7 @@ SELECT C.CRDN_ID , C.DEL_DT , C.DEL_RSN FROM TB_CRDN C -LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) +LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID) LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID) LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID) @@ -398,7 +398,7 @@ SELECT C.CRDN_ID , C.ATCH_FILE_CNT , C.CRDN_SN FROM TB_CRDN C - LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_TBL_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) + LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_NM IN ('TB_ESB_INTERFACE','TB_SAEOL') AND C.LINK_ID = CC.CVLCPT_LINK_ID) LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = 'DPV' diff --git a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml index 7125eda3..64ffebcc 100644 --- a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml @@ -184,7 +184,7 @@ , A.TASK_SE_CD , A.CRDN_REG_SE_CD , A.CRDN_INPT_SE_CD - , A.LINK_TBL_NM + , A.LINK_NM , A.LINK_ID , A.RTPYR_ID , A.CRDN_SE_CD