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 064fc2b5..eb0bcda7 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 @@ -19,6 +19,7 @@ import cokr.xit.base.file.FileInfo.Relation; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.base.file.web.FileInfoFactory; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.ftp.RemoteSystemInfo; import cokr.xit.fims.cmmn.ftp.SFTPUtil; import cokr.xit.fims.crdn.Crdn; @@ -596,10 +597,14 @@ public class LsctMpngBean extends AbstractBean { throw new RuntimeException("[F] 등록 작업에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } + // 사용자 정보 + FimsUser fimsUser = (FimsUser)currentUser().getUser(); + // 임대차계약(TB_LSCT) 대장의 변경요청 정보를 수정한다. LsctMpng lsctMpng = new LsctMpng(); lsctMpng.setLsctMpngId(lsctAprv.getLsctMpngId()); // 임대차계약 매핑 ID lsctMpng.setChgDmndYn("Y"); // 변경 요청 여부 + lsctMpng.setChgDmndRgtr(fimsUser.getId()); // 변경 요청 등록자 lsctMpng.setChgDmndIp(lsctAprv.getChgDmndIp()); // 변경 요청 IP rtnNocs = lsctMpngMapper.updateLsctMpngChgDmnd(lsctMpng); @@ -663,10 +668,14 @@ public class LsctMpngBean extends AbstractBean { // 임대차계약 승인(TB_LSCT_APRV) 대장을 삭제한다. lsctAprvMapper.deleteLsctAprv(lsctAprv); + // 사용자 정보 + FimsUser fimsUser = (FimsUser)currentUser().getUser(); + // 임대차계약(TB_LSCT) 대장의 변경요청 정보를 수정한다. LsctMpng lsctMpng = new LsctMpng(); lsctMpng.setLsctMpngId(lsctAprv.getLsctMpngId()); // 임대차계약 매핑 ID lsctMpng.setChgDmndYn("N"); // 변경 요청 여부 + lsctMpng.setChgDmndMdfr(fimsUser.getId()); // 변경 요청 수정자 lsctMpng.setChgDmndIp(lsctAprv.getChgDmndIp()); // 변경 요청 IP rtnNocs = lsctMpngMapper.updateLsctMpngChgDmnd(lsctMpng); diff --git a/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java b/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java index 62199777..097a4359 100644 --- a/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java +++ b/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java @@ -548,9 +548,10 @@ public class Rent02Controller extends ApplicationController { valueMap.put("업무구분", format.of("TASK_SE_NM").style(center)); valueMap.put("대상여부", format.of("TRGT_STTS_NM").style(center)); valueMap.put("요청일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "CHG_DMND_DT").style(dateDT)); + valueMap.put("요청자", format.of("CHG_DMND_RGTR_NM").style(center)); valueMap.put("승인여부", format.of("CHG_APRV_NM").style(center)); valueMap.put("승인일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "CHG_APRV_DT").style(dateDT)); - valueMap.put("승인자", format.of("CHG_AUTZR").style(center)); + valueMap.put("승인자", format.of("CHG_AUTZR_NM").style(center)); valueMap.put("승인사유", format.of("CHG_APRV_RSN")); valueMap.put("기업명", format.of("ENT_NM")); valueMap.put("법인(사업자)번호", format.of("ENT_REG_NO").style(center)); 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 82e6603a..9b224dcc 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml @@ -41,12 +41,12 @@ , L.VHRNO , L.CTRT_BGNG_YMD , L.CTRT_BGNG_TM - , (CONCAT(L.CTRT_BGNG_YMD, L.CTRT_BGNG_TM)) AS CTRT_BGNG_DT + , (CONCAT(L.CTRT_BGNG_YMD, L.CTRT_BGNG_TM)) AS CTRT_BGNG_DT , L.CTRT_END_YMD , L.CTRT_END_TM - , (CONCAT(L.CTRT_END_YMD, L.CTRT_END_TM)) AS CTRT_END_DT + , (CONCAT(L.CTRT_END_YMD, L.CTRT_END_TM)) AS CTRT_END_DT , L.HIRER_SE_CD - , (SELECT GET_CODE_NM('FIM089', L.HIRER_SE_CD) FROM DUAL) 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 @@ -57,7 +57,7 @@ , L.HIRER_DTL_ADDR , L.ATCH_FILE_CNT , L.DEL_YN - , (SELECT GET_CODE_NM('CMN007', L.DEL_YN) FROM DUAL) AS DEL_YN_NM + , (GET_CODE_NM('CMN007', L.DEL_YN)) AS DEL_YN_NM , L.REG_DT , L.RGTR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = L.RGTR) AS RGTR_NM @@ -79,24 +79,24 @@ AND L.CTRT_END_YMD =]]> #{schCtrtYmd} - AND L.CTRT_BGNG_YMD = #{schCtrtBgngYmd} + AND L.CTRT_BGNG_YMD = #{schCtrtBgngYmd} - AND L.CTRT_END_YMD = #{schCtrtEndYmd} + AND L.CTRT_END_YMD = #{schCtrtEndYmd} - AND L.VHRNO = #{schVhrno} + AND L.VHRNO = #{schVhrno} - AND L.HIRER_REG_NO = #{schHirerRegNo} + AND L.HIRER_REG_NO = #{schHirerRegNo} - AND RE.ENT_REG_NO IN ( + AND RE.ENT_REG_NO IN ( #{schEntRegNo} ) - AND RE.ENT_REG_NO = #{schEntRegNo} + AND RE.ENT_REG_NO = #{schEntRegNo} AND L.ENT_ID IN ( @@ -104,9 +104,9 @@ ) - AND L.ENT_ID = #{entId} + AND L.ENT_ID = #{entId} - AND L.DEL_YN = 'N' + AND L.DEL_YN = 'N' @@ -116,27 +116,27 @@ - AND L.LSCT_ID IN ( + AND L.LSCT_ID IN ( #{lsctId} ) - AND L.LSCT_ID = #{lsctId} + AND L.LSCT_ID = #{lsctId} - AND L.ENT_ID IN ( + AND L.ENT_ID IN ( #{entId} ) - AND L.ENT_ID = #{entId} + AND L.ENT_ID = #{entId} - AND L.DEL_YN = #{delYn} + AND L.DEL_YN = #{delYn} - AND L.DEL_YN = 'N' + AND L.DEL_YN = 'N' 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 e2638bf4..bfa39390 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml @@ -109,15 +109,15 @@ AND LA.CRDN_YMD #{schCrdnYmdTo} - AND LA.VHRNO = #{schVhrno} + AND LA.VHRNO = #{schVhrno} - AND LA.SGG_CD = #{sggCd} + AND LA.SGG_CD = #{sggCd} - AND LA.TASK_SE_CD = #{taskSeCd} + AND LA.TASK_SE_CD = #{taskSeCd} - AND LA.DEL_YN = 'N' + AND LA.DEL_YN = 'N' @@ -127,12 +127,12 @@ - AND LA.APRV_ID IN ( + AND LA.APRV_ID IN ( #{aprvId} ) - AND LA.APRV_ID = #{aprvId} + AND LA.APRV_ID = #{aprvId} AND LA.LSCT_MPNG_ID IN ( @@ -140,14 +140,14 @@ ) - AND LA.LSCT_MPNG_ID = #{lsctMpngId} + AND LA.LSCT_MPNG_ID = #{lsctMpngId} - AND LA.DEL_YN = #{delYn} + AND LA.DEL_YN = #{delYn} - AND LA.DEL_YN = 'N' + AND LA.DEL_YN = 'N' @@ -317,12 +317,12 @@ , DEL_RSN = #{delRsn} - WHERE APRV_ID IN ( + WHERE APRV_ID IN ( #{aprvId} ) - WHERE APRV_ID = #{aprvId} + WHERE APRV_ID = #{aprvId} AND DEL_YN = 'N' 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 8fcc757e..6235393b 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml @@ -52,16 +52,17 @@ , (CASE WHEN LENGTH(MM_TIME) = 4 THEN CONCAT(MM_TIME, '00') ELSE MM_TIME END) AS MM_TIME , MM_LAWGB , (SELECT VLTN_ID FROM TB_VLTN X - WHERE X.VLTN_CD = LPAD(MM_LAWGB, 2, '0') - AND X.SGG_CD = MM_SGGCODE - AND X.TASK_SE_CD = MM_TASKGB) AS VLTN_ID + WHERE X.VLTN_CD = LPAD(MM_LAWGB, 2, '0') + AND X.SGG_CD = MM_SGGCODE + AND X.TASK_SE_CD = MM_TASKGB) AS VLTN_ID , MM_SGNM , MM_SGTEL , MM_SGCONT , MM_SGPOS , MM_BDCODE - , (SELECT TRIM(CONCAT(X.EMD_NM, ' ', X.LI_NM)) FROM TB_STDG X - WHERE X.STDG_CD = MM_BDCODE) AS CRDN_STDG_NM + , (SELECT TRIM(CONCAT(X.EMD_NM, ' ', X.LI_NM)) + FROM TB_STDG X + WHERE X.STDG_CD = MM_BDCODE) AS CRDN_STDG_NM , MM_GPS_X , MM_GPS_Y , MM_TRAC @@ -128,21 +129,21 @@ AND MM_CARNO = #{schVhrno} - AND OM_JNO IN ( + AND OM_JNO IN ( #{omJno} ) - AND OM_JNO = #{omJno} + AND OM_JNO = #{omJno} - AND OM_NAME = #{schEntNm} + AND OM_NAME = #{schEntNm} - AND MM_SGGCODE = #{sggCd} + AND MM_SGGCODE = #{sggCd} - AND MM_TASKGB = #{taskSeCd} + AND MM_TASKGB = #{taskSeCd} @@ -159,11 +160,13 @@ , C.CRDN_STDG_NM , C.CRDN_PLC , C.CRDN_STTS_CD - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , (GET_CODE_NM('FIM010', C.CRDN_STTS_CD)) AS CRDN_STTS_NM , C.RTPYR_ID , C.ADDR_SN , C.MM_CODE - , (SELECT V.VLTN_ARTCL FROM TB_VLTN V WHERE V.VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL + , (SELECT V.VLTN_ARTCL + FROM TB_VLTN V + WHERE V.VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL , P.RTPYR_SE_CD , P.RTPYR_NO , P.RTPYR_NM @@ -176,14 +179,14 @@ - AND CRDN_ID = #{crdnId} + AND CRDN_ID = #{crdnId} - AND MM_CODE = #{mmCode} - AND TASK_SE_CD = #{taskSeCd} + AND MM_CODE = #{mmCode} + AND TASK_SE_CD = #{taskSeCd} - AND CRDN_ID = #{crdnId} + AND CRDN_ID = #{crdnId} @@ -352,7 +355,7 @@ SELECT C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD - , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM + , (GET_CODE_NM('FIM054', C.TASK_SE_CD)) AS TASK_SE_NM , C.CRDN_YMD , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_DT , C.VHRNO @@ -361,7 +364,7 @@ , C.CRDN_PLC , C.FFNLG_CRDN_AMT , C.CRDN_STTS_CD - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , (GET_CODE_NM('FIM010', C.CRDN_STTS_CD)) AS CRDN_STTS_NM , C.NXRP_CRDN_LINK_YN , C.NXRP_ACB_KEY , C.MM_CODE @@ -370,7 +373,7 @@ , V.VLTN_ARTCL , P.RTPYR_ID , P.RTPYR_SE_CD - , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (GET_CODE_NM('FIM011', P.RTPYR_SE_CD)) AS RTPYR_SE_NM , P.RTPYR_NO , P.RTPYR_NM , LM.LSCT_MPNG_ID @@ -431,7 +434,7 @@ AND C.CRDN_YMD #{schCrdnYmdTo} - AND C.VHRNO = #{schVhrno} + AND C.VHRNO = #{schVhrno} @@ -446,27 +449,27 @@ AND LM.LSCT_MPNG_ID IS NOT NULL - AND (LM.CHG_DMND_YN = 'Y' OR LM.CHG_APRV_YN = 'Y' OR C.NXRP_CRDN_LINK_YN = 'Y') + AND (LM.CHG_DMND_YN = 'Y' OR LM.CHG_APRV_YN = 'Y' OR C.NXRP_CRDN_LINK_YN = 'Y') - AND P.RTPYR_NO IN ( + AND P.RTPYR_NO IN ( #{rtpyrNo} ) - AND P.RTPYR_NO = #{rtpyrNo} + AND P.RTPYR_NO = #{rtpyrNo} - AND C.SGG_CD = #{sggCd} + AND C.SGG_CD = #{sggCd} - AND C.TASK_SE_CD = #{taskSeCd} + AND C.TASK_SE_CD = #{taskSeCd} - AND C.DEL_YN = 'N' + AND C.DEL_YN = 'N' @@ -476,14 +479,14 @@ - AND C.CRDN_ID = #{crdnId} + AND C.CRDN_ID = #{crdnId} - AND C.DEL_YN = #{delYn} + AND C.DEL_YN = #{delYn} - AND C.DEL_YN = 'N' + AND C.DEL_YN = 'N' @@ -498,7 +501,7 @@ , LM.LEVY_ID , LM.SGG_CD , LM.TASK_SE_CD - , (SELECT GET_CODE_NM('FIM054', LM.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM + , (GET_CODE_NM('FIM054', LM.TASK_SE_CD)) AS TASK_SE_NM , LM.CRDN_YMD , LM.CRDN_TM , (CONCAT(LM.CRDN_YMD, LM.CRDN_TM)) AS CRDN_DT @@ -506,17 +509,20 @@ , LM.RTPYR_NO , LM.RTPYR_NM , LM.CHG_DMND_YN - , (SELECT GET_CODE_NM('CMN006', LM.CHG_DMND_YN) FROM DUAL) AS CHG_DMND_NM + , (GET_CODE_NM('CMN006', LM.CHG_DMND_YN)) AS CHG_DMND_NM , LM.CHG_DMND_DT , LM.CHG_DMND_RGTR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LM.CHG_DMND_RGTR) AS CHG_DMND_RGTR_NM , LM.CHG_DMND_IP , LM.CHG_DMND_RTRCN_DT , LM.CHG_DMND_MDFR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LM.CHG_DMND_MDFR) AS CHG_DMND_MDFR_NM , LM.CHG_DMND_RTRCN_IP , LM.CHG_APRV_YN - , (SELECT GET_CODE_NM('CMN006', LM.CHG_APRV_YN) FROM DUAL) AS CHG_APRV_NM + , (GET_CODE_NM('CMN006', LM.CHG_APRV_YN)) AS CHG_APRV_NM , LM.CHG_APRV_DT , LM.CHG_AUTZR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LM.CHG_AUTZR) AS CHG_AUTZR_NM , LM.CHG_APRV_RSN , LM.CHG_APRV_IP , LM.DEL_YN @@ -532,7 +538,7 @@ ELSE '미대상' END) AS TRGT_STTS_NM , RE.ENT_SE_CD - , (SELECT GET_CODE_NM('FIM088', RE.ENT_SE_CD) FROM DUAL) AS ENT_SE_NM + , (GET_CODE_NM('FIM088', RE.ENT_SE_CD)) AS ENT_SE_NM , RE.ENT_NM , RE.ENT_REG_NO , RE.RPRSV_NM @@ -544,12 +550,12 @@ , RE.ENT_DTL_ADDR , L.CTRT_BGNG_YMD , L.CTRT_BGNG_TM - , (CONCAT(L.CTRT_BGNG_YMD, L.CTRT_BGNG_TM)) AS CTRT_BGNG_DT + , (CONCAT(L.CTRT_BGNG_YMD, L.CTRT_BGNG_TM)) AS CTRT_BGNG_DT , L.CTRT_END_YMD , L.CTRT_END_TM - , (CONCAT(L.CTRT_END_YMD, L.CTRT_END_TM)) AS CTRT_END_DT + , (CONCAT(L.CTRT_END_YMD, L.CTRT_END_TM)) AS CTRT_END_DT , L.HIRER_SE_CD - , (SELECT GET_CODE_NM('FIM089', L.HIRER_SE_CD) FROM DUAL) 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 @@ -563,7 +569,7 @@ , C.CRDN_PLC , C.FFNLG_CRDN_AMT , C.CRDN_STTS_CD - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , (GET_CODE_NM('FIM010', C.CRDN_STTS_CD)) AS CRDN_STTS_NM , C.MM_CODE , (SELECT V.VLTN_ARTCL FROM TB_VLTN V WHERE V.VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL FROM TB_LSCT_MPNG LM @@ -583,18 +589,18 @@ AND LM.CRDN_YMD #{schCrdnYmdTo} - AND LM.VHRNO = #{schVhrno} + AND LM.VHRNO = #{schVhrno} - AND LM.RTPYR_NO IN ( + AND LM.RTPYR_NO IN ( #{rtpyrNo} ) - AND LM.RTPYR_NO = #{rtpyrNo} + AND LM.RTPYR_NO = #{rtpyrNo} - AND RE.ENT_REG_NO IN ( + AND RE.ENT_REG_NO IN ( #{schEntRegNo} ) @@ -624,12 +630,12 @@ - AND LM.SGG_CD = #{sggCd} + AND LM.SGG_CD = #{sggCd} - AND LM.TASK_SE_CD = #{taskSeCd} + AND LM.TASK_SE_CD = #{taskSeCd} - AND LM.DEL_YN = 'N' + AND LM.DEL_YN = 'N' @@ -639,7 +645,7 @@ - AND LM.LSCT_MPNG_ID IN ( + AND LM.LSCT_MPNG_ID IN ( #{lsctMpngId} ) @@ -648,10 +654,10 @@ - AND LM.DEL_YN = #{delYn} + AND LM.DEL_YN = #{delYn} - AND LM.DEL_YN = 'N' + AND LM.DEL_YN = 'N' @@ -759,7 +765,7 @@ SET CHG_DMND_YN = #{chgDmndYn} , CHG_DMND_DT = - , CHG_DMND_RGTR = #{createdBy} + , CHG_DMND_RGTR = #{chgDmndRgtr} , CHG_DMND_IP = #{chgDmndIp} , CHG_DMND_RTRCN_DT = NULL , CHG_DMND_MDFR = NULL @@ -770,7 +776,7 @@ , CHG_DMND_RGTR = NULL , CHG_DMND_IP = NULL , CHG_DMND_RTRCN_DT = - , CHG_DMND_MDFR = #{modifiedBy} + , CHG_DMND_MDFR = #{chgDmndMdfr} , CHG_DMND_RTRCN_IP = #{chgDmndRtrcnIp} , MDFCN_DT = @@ -792,7 +798,7 @@ ) - WHERE LSCT_MPNG_ID = #{lsctMpngId} + WHERE LSCT_MPNG_ID = #{lsctMpngId} AND DEL_YN = 'N' diff --git a/src/main/resources/sql/mapper/fims/rent/rentEnt-mapper.xml b/src/main/resources/sql/mapper/fims/rent/rentEnt-mapper.xml index 8c619e36..e578e5c5 100644 --- a/src/main/resources/sql/mapper/fims/rent/rentEnt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/rentEnt-mapper.xml @@ -32,7 +32,7 @@ SELECT RE.ENT_ID , RE.ENT_SE_CD - , (SELECT GET_CODE_NM('FIM088', RE.ENT_SE_CD) FROM DUAL) AS ENT_SE_NM + , (GET_CODE_NM('FIM088', RE.ENT_SE_CD)) AS ENT_SE_NM , RE.ENT_NM , RE.ENT_REG_NO , RE.RPRSV_NM diff --git a/src/main/resources/sql/mapper/fims/rent/userRentEntMpng-mapper.xml b/src/main/resources/sql/mapper/fims/rent/userRentEntMpng-mapper.xml index fb330fc5..f583c39b 100644 --- a/src/main/resources/sql/mapper/fims/rent/userRentEntMpng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/userRentEntMpng-mapper.xml @@ -25,14 +25,14 @@ , UREM.USER_ID , UREM.ENT_ID , UREM.DEL_YN - , (SELECT GET_CODE_NM('CMN007', UREM.DEL_YN) FROM DUAL) AS DEL_YN_NM + , (GET_CODE_NM('CMN007', UREM.DEL_YN)) AS DEL_YN_NM , UREM.REG_DT , UREM.RGTR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = UREM.RGTR) AS RGTR_NM , U.USER_ACNT , U.USER_NM , RE.ENT_SE_CD - , (SELECT GET_CODE_NM('FIM088', RE.ENT_SE_CD) FROM DUAL) AS ENT_SE_NM + , (GET_CODE_NM('FIM088', RE.ENT_SE_CD)) AS ENT_SE_NM , RE.ENT_NM , RE.ENT_REG_NO , RE.RPRSV_NM