diff --git a/src/main/java/cokr/xit/fims/rent/LsctAprv.java b/src/main/java/cokr/xit/fims/rent/LsctAprv.java index 75067168..3afb051c 100644 --- a/src/main/java/cokr/xit/fims/rent/LsctAprv.java +++ b/src/main/java/cokr/xit/fims/rent/LsctAprv.java @@ -292,6 +292,11 @@ public class LsctAprv extends AbstractEntity { */ private String chgAprvIp; + /** + * 세외수입 단속 연계 여부 + */ + private String nxrpCrdnLinkYn; + /** * 삭제 여부 */ diff --git a/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java b/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java index 16e4e4d8..6063cc42 100644 --- a/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java +++ b/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java @@ -823,6 +823,7 @@ public class LsctMpngBean extends AbstractBean { lsctAprv.setCrdnYmd(crdnInfo.string("CRDN_YMD")); // 단속 일자 lsctAprv.setCrdnTm(crdnInfo.string("CRDN_TM")); // 단속 시각 lsctAprv.setVhrno(crdnInfo.string("VHRNO")); // 자동차등록번호 + lsctAprv.setNxrpCrdnLinkYn(crdnInfo.string("NXRP_CRDN_LINK_YN")); // 세외수입 단속 연계 여부 lsctAprv.setCtrtBgngYmd(lsctMpngInfo.string("CTRT_BGNG_YMD")); // 계약 시작 일자 lsctAprv.setCtrtBgngTm(lsctMpngInfo.string("CTRT_BGNG_TM")); // 계약 시작 시각 lsctAprv.setCtrtEndYmd(lsctMpngInfo.string("CTRT_END_YMD")); // 계약 종료 일자 diff --git a/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml index d737addf..c2da6fa3 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml @@ -7,7 +7,7 @@ 2024-08-27 JoJH 최초 작성 ============================ --> - + diff --git a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml index 3fb98cb2..1e9f0447 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml @@ -64,6 +64,7 @@ + @@ -131,6 +132,7 @@ , LA.CHG_AUTZR_NM , LA.CHG_APRV_RSN , LA.CHG_APRV_IP + , LA.NXRP_CRDN_LINK_YN , LA.DEL_YN , LA.REG_DT , LA.RGTR @@ -264,6 +266,7 @@ , CHG_AUTZR_NM , CHG_APRV_RSN , CHG_APRV_IP + , NXRP_CRDN_LINK_YN , DEL_YN , REG_DT , RGTR @@ -327,6 +330,7 @@ , #{chgAutzrNm} , #{chgAprvRsn} , #{chgAprvIp} + , #{nxrpCrdnLinkYn} , 'N' , , #{createdBy} @@ -337,59 +341,60 @@ /* 임대차계약 승인 대장 수정(lsctAprvMapper.updateLsctAprv) */ UPDATE ${lsctLinkTblNm} - SET CRDN_YMD = #{crdnYmd} - , CRDN_TM = #{crdnTm} - , VHRNO = #{vhrno} - , CTRT_BGNG_YMD = #{ctrtBgngYmd} - , CTRT_BGNG_TM = #{ctrtBgngTm} - , CTRT_END_YMD = #{ctrtEndYmd} - , CTRT_END_TM = #{ctrtEndTm} - , HIRER_SE_CD = #{hirerSeCd} - , HIRER_REG_NO = #{hirerRegNo} - , HIRER_NM = #{hirerNm} - , HIRER_TELNO = #{hirerTelno} - , HIRER_MBL_TELNO = #{hirerMblTelno} - , HIRER_EML_ADDR = #{hirerEmlAddr} - , HIRER_ZIP = #{hirerZip} - , HIRER_ADDR = #{hirerAddr} - , HIRER_DTL_ADDR = #{hirerDtlAddr} - , ROAD_NM_CD = #{roadNmCd} - , UDGD_SE_CD = #{udgdSeCd} - , BMNO = #{bmno} - , BSNO = #{bsno} - , BLDG_MNG_NO = #{bldgMngNo} - , STDG_CD = #{stdgCd} - , RENT_ENT_NM = #{rentEntNm} - , RENT_ENT_REG_NO = #{rentEntRegNo} - , RENT_ENT_TELNO = #{rentEntTelno} - , RENT_ENT_FXNO = #{rentEntFxno} - , RENT_ENT_EML_ADDR= #{rentEntEmlAddr} - , RENT_ENT_ZIP = #{rentEntZip} - , RENT_ENT_ADDR = #{rentEntAddr} - , RENT_ENT_DTL_ADDR= #{rentEntDtlAddr} - , ATCH_FILE_CNT = #{atchFileCnt} - , LSCT_SRVC_URL = #{lsctSrvcUrl} - , ATCH_FILE_NM1 = #{atchFileNm1} - , ATCH_FILE_PATH1 = #{atchFilePath1} - , ATCH_FILE_SZ1 = #{atchFileSz1} - , ATCH_FILE_NM2 = #{atchFileNm2} - , ATCH_FILE_PATH2 = #{atchFilePath2} - , ATCH_FILE_SZ2 = #{atchFileSz2} - , ATCH_FILE_NM3 = #{atchFileNm3} - , ATCH_FILE_PATH3 = #{atchFilePath3} - , ATCH_FILE_SZ3 = #{atchFileSz3} - , ATCH_FILE_NM4 = #atchFileNm4} - , ATCH_FILE_PATH4 = #{atchFilePath4} - , ATCH_FILE_SZ4 = #{atchFileSz4} - , CHG_APRV_STTS_CD = #{chgAprvSttsCd} - , CHG_APRV_DT = #{chgAprvDt} - , CHG_AUTZR_NM = #{chgAutzrNm} - , CHG_APRV_RSN = #{chgAprvRsn} - , CHG_APRV_IP = #{chgAprvIp} - , MDFCN_DT = - , MDFR = #{modifiedBy} - WHERE APRV_ID = #{aprvId} - AND DEL_YN = 'N' + SET CRDN_YMD = #{crdnYmd} + , CRDN_TM = #{crdnTm} + , VHRNO = #{vhrno} + , CTRT_BGNG_YMD = #{ctrtBgngYmd} + , CTRT_BGNG_TM = #{ctrtBgngTm} + , CTRT_END_YMD = #{ctrtEndYmd} + , CTRT_END_TM = #{ctrtEndTm} + , HIRER_SE_CD = #{hirerSeCd} + , HIRER_REG_NO = #{hirerRegNo} + , HIRER_NM = #{hirerNm} + , HIRER_TELNO = #{hirerTelno} + , HIRER_MBL_TELNO = #{hirerMblTelno} + , HIRER_EML_ADDR = #{hirerEmlAddr} + , HIRER_ZIP = #{hirerZip} + , HIRER_ADDR = #{hirerAddr} + , HIRER_DTL_ADDR = #{hirerDtlAddr} + , ROAD_NM_CD = #{roadNmCd} + , UDGD_SE_CD = #{udgdSeCd} + , BMNO = #{bmno} + , BSNO = #{bsno} + , BLDG_MNG_NO = #{bldgMngNo} + , STDG_CD = #{stdgCd} + , RENT_ENT_NM = #{rentEntNm} + , RENT_ENT_REG_NO = #{rentEntRegNo} + , RENT_ENT_TELNO = #{rentEntTelno} + , RENT_ENT_FXNO = #{rentEntFxno} + , RENT_ENT_EML_ADDR = #{rentEntEmlAddr} + , RENT_ENT_ZIP = #{rentEntZip} + , RENT_ENT_ADDR = #{rentEntAddr} + , RENT_ENT_DTL_ADDR = #{rentEntDtlAddr} + , ATCH_FILE_CNT = #{atchFileCnt} + , LSCT_SRVC_URL = #{lsctSrvcUrl} + , ATCH_FILE_NM1 = #{atchFileNm1} + , ATCH_FILE_PATH1 = #{atchFilePath1} + , ATCH_FILE_SZ1 = #{atchFileSz1} + , ATCH_FILE_NM2 = #{atchFileNm2} + , ATCH_FILE_PATH2 = #{atchFilePath2} + , ATCH_FILE_SZ2 = #{atchFileSz2} + , ATCH_FILE_NM3 = #{atchFileNm3} + , ATCH_FILE_PATH3 = #{atchFilePath3} + , ATCH_FILE_SZ3 = #{atchFileSz3} + , ATCH_FILE_NM4 = #atchFileNm4} + , ATCH_FILE_PATH4 = #{atchFilePath4} + , ATCH_FILE_SZ4 = #{atchFileSz4} + , CHG_APRV_STTS_CD = #{chgAprvSttsCd} + , CHG_APRV_DT = #{chgAprvDt} + , CHG_AUTZR_NM = #{chgAutzrNm} + , CHG_APRV_RSN = #{chgAprvRsn} + , CHG_APRV_IP = #{chgAprvIp} + , NXRP_CRDN_LINK_YN = #{nxrpCrdnLinkYn} + , MDFCN_DT = + , MDFR = #{modifiedBy} + WHERE APRV_ID = #{aprvId} + AND DEL_YN = 'N' /* 임대차계약 승인 대장 삭제(lsctAprvMapper.deleteLsctAprv) */ diff --git a/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml index 922750d1..cf126ceb 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml @@ -45,7 +45,7 @@ - /* 연계뷰 단속 목록 조회(lsctMpngMapper.selectFfnlgMainList) */ SELECT MM_CODE , MM_SGGCODE , MM_TASKGB @@ -182,13 +182,14 @@ - /* 단속 객체 가져오기(lsctMpngMapper.selectIsCrdnInfo) */ SELECT C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD , C.CRDN_YMD , C.CRDN_TM , C.VHRNO + , C.NXRP_CRDN_LINK_YN , C.MM_CODE , L.LEVY_ID FROM TB_CRDN C @@ -228,6 +229,7 @@ , C.VHCL_NM , C.VHCL_COLR , C.FFNLG_CRDN_AMT + , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD , C.ADVNTCE_AMT @@ -255,7 +257,6 @@ , LV.LEVY_YMD , LV.FRST_DUDT_YMD , LV.DUDT_YMD - , LV.FFNLG_AMT , LV.LEVY_PCPTAX , LV.LEVY_ADAMT , LV.RCVMT_PCPTAX @@ -334,7 +335,7 @@ LEFT OUTER JOIN TB_RENT_ENT RE ON (LM.ENT_ID = RE.ENT_ID AND RE.DEL_YN = 'N') - /* 단속 대장 목록 조회(lsctMpngMapper.selectCrdnList) */ @@ -385,7 +386,7 @@ - /* 단속 객체 가져오기(lsctMpngMapper.selectCrdnInfo) */ @@ -403,7 +404,7 @@ - /* 단속 대장 등록(lsctMapper.insertMainToCrdn) */ + /* 단속 대장 등록(lsctMpngMapper.insertMainToCrdn) */ @@ -511,7 +512,7 @@ ) - /* 단속 부가 대장 등록(lsctMapper.insertMainToCrdnAdi) */ + /* 단속 부가 대장 등록(lsctMpngMapper.insertMainToCrdnAdi) */ INSERT INTO TB_CRDN_ADI ( CRDN_ID @@ -562,7 +563,7 @@ ) - /* 단속 정보 수정(lsctMapper.updateMainToCrdn) */ + /* 단속 정보 수정(lsctMpngMapper.updateMainToCrdn) */ UPDATE TB_CRDN SET CRDN_REG_SE_CD = #{crdnRegSeCd} , CRDN_INPT_SE_CD = #{crdnInptSeCd} @@ -602,7 +603,7 @@ AND DEL_YN = 'N' - /* 단속 부가정보 수정(lsctMapper.updateMainToCrdnAdi) */ + /* 단속 부가정보 수정(lsctMpngMapper.updateMainToCrdnAdi) */ UPDATE TB_CRDN_ADI SET MDFCN_DT = , MDFR = #{modifiedBy} @@ -669,8 +670,7 @@ WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'RT' THEN '기타(요청취소)' WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'AP' THEN '기타(승인)' WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'UA' THEN '기타(미승인)' - WHEN LM.DMND_YN = 'N' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '계약서등록' - WHEN LM.DMND_YN = 'N' AND C.NXRP_CRDN_LINK_YN = 'Y' THEN '기타(세외수입)' + WHEN LM.DMND_YN = 'N' AND LM.LSCT_MPNG_ID IS NOT NULL THEN '계약서등록' ELSE '대상' END) AS TRGT_STTS_NM , LM.LSCT_ID @@ -699,7 +699,7 @@ , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LM.MDFR) AS MDFR_NM , (CONCAT(L.CTRT_BGNG_YMD, L.CTRT_BGNG_TM)) AS CTRT_BGNG_DT , (CONCAT(L.CTRT_END_YMD, L.CTRT_END_TM)) AS CTRT_END_DT - , (GET_CODE_NM('FIM089', L.HIRER_SE_CD)) AS HIRER_SE_NM + , (GET_CODE_NM('FIM089', L.HIRER_SE_CD)) AS HIRER_SE_NM , L.HIRER_REG_NO , L.HIRER_NM , L.HIRER_TELNO @@ -715,7 +715,7 @@ LEFT OUTER JOIN TB_LSCT L ON (LM.LSCT_ID = L.LSCT_ID AND L.DEL_YN = 'N') - /* 단속, 임대차계약 매핑 대장 목록 조회(lsctMpngMapper.selectCrdnLsctMpngList) */ @@ -733,14 +733,13 @@ AND LM.LSCT_MPNG_ID IS NOT NULL AND LM.DMND_YN = 'N' - AND C.NXRP_CRDN_LINK_YN = 'N' AND LM.LSCT_MPNG_ID IS NULL AND LM.LSCT_MPNG_ID IS NOT NULL - AND (LM.DMND_YN = 'Y' OR LM.CHG_APRV_STTS_CD IS NOT NULL OR C.NXRP_CRDN_LINK_YN = 'Y') + AND LM.DMND_YN = 'Y' @@ -766,7 +765,7 @@ - /* 단속, 임대차계약 매핑 대장 객체 가져오기(lsctMpngMapper.selectCrdnLsctMpngs) */ @@ -882,7 +881,7 @@ LEFT OUTER JOIN TB_CRDN C ON (LM.CRDN_ID = C.CRDN_ID) - /* 임대차계약 매핑 대장 목록 조회(lsctMpngMapper.selectLsctMpngList) */ @@ -955,7 +954,7 @@ - /* 임대차계약 매핑 대장 객체 가져오기(lsctMpngMapper.selectLsctMpngs) */ @@ -978,7 +977,7 @@ - /* 임대차계약 매핑 대장 등록(lsctMapper.insertLsctMpng) */ + /* 임대차계약 매핑 대장 등록(lsctMpngMapper.insertLsctMpng) */ @@ -1057,7 +1056,7 @@ ) - /* 임대차계약 매핑 대장 수정(lsctMapper.updateLsctMpng) */ + /* 임대차계약 매핑 대장 수정(lsctMpngMapper.updateLsctMpng) */ UPDATE TB_LSCT_MPNG SET CRDN_YMD = #{crdnYmd} , CRDN_TM = #{crdnTm} @@ -1086,7 +1085,7 @@ AND DEL_YN = 'N' - /* 임대차계약 매핑 대장 변경 요청 수정(lsctMapper.updateLsctMpngChgDmnd) */ + /* 임대차계약 매핑 대장 변경 요청 수정(lsctMpngMapper.updateLsctMpngChgDmnd) */ UPDATE TB_LSCT_MPNG SET DMND_YN = #{dmndYn} @@ -1121,7 +1120,7 @@ AND DEL_YN = 'N' - /* 임대차계약 매핑 대장 변경 승인 수정(lsctMapper.updateLsctMpngChgAprv) */ + /* 임대차계약 매핑 대장 변경 승인 수정(lsctMpngMapper.updateLsctMpngChgAprv) */ UPDATE TB_LSCT_MPNG SET CHG_APRV_STTS_CD = #{chgAprvSttsCd} , CHG_APRV_DT = #{chgAprvDt} @@ -1134,7 +1133,7 @@ AND DEL_YN = 'N' - /* 임대차계약 매핑 대장 삭제(lsctMapper.deleteLsctMpng) */ + /* 임대차계약 매핑 대장 삭제(lsctMpngMapper.deleteLsctMpng) */ UPDATE TB_LSCT_MPNG SET DEL_YN = 'Y' , DEL_DT =