diff --git a/WebContent/ui/cfs/fine/FN016M01.xml b/WebContent/ui/cfs/fine/FN016M01.xml index 1d41717..b19ca33 100644 --- a/WebContent/ui/cfs/fine/FN016M01.xml +++ b/WebContent/ui/cfs/fine/FN016M01.xml @@ -654,17 +654,15 @@ scwin.btn_button04_onclick = function() { if (documentNo == '' || penaltyManageYear == '' || penaltySeqNo == '') { com.alert("관리번호가 없습니다. 다시 선택해 주세요."); return false; - }else if (motionId == "91") { + } + if (motionId == "91") { com.alert("수납완료된 정보입니다. 수정작업 할 수 없습니다."); return false; } var jsonData = { - "documentNo" : documentNo - , "penaltyManageYear" : penaltyManageYear + "penaltyManageYear" : penaltyManageYear , "penaltySeqNo" : penaltySeqNo - , "carNo2" : carNo - , "seqNo" : seqNo }; var data = { data : jsonData, callbackFn : "scwin.btn_search_onclick" diff --git a/WebContent/ui/cfs/fine/FN016P05.xml b/WebContent/ui/cfs/fine/FN016P05.xml index 8adec74..29f6b83 100644 --- a/WebContent/ui/cfs/fine/FN016P05.xml +++ b/WebContent/ui/cfs/fine/FN016P05.xml @@ -10,85 +10,88 @@ - + - - - - - - - + - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - + + + + + + + + - - - - - - - + - - + + + - - - - + + + + + + + + - - - + + + + + + + - - - + @@ -363,7 +372,10 @@ - + @@ -372,8 +384,10 @@ - + @@ -382,8 +396,10 @@ - + @@ -394,7 +410,9 @@ 3 1 - + @@ -406,7 +424,9 @@ 3 1 - + @@ -421,7 +441,9 @@ 3 1 - + @@ -433,7 +455,9 @@ 3 1 - + @@ -463,7 +487,10 @@ 3 1 - + 경차구분 @@ -495,7 +522,10 @@ 3 1 - + *주민등록(법인번호) row @@ -505,9 +535,15 @@ 2 1 - + - + @@ -534,7 +570,10 @@ 3 1 - + @@ -551,11 +590,17 @@ 3 1 - + - + - + @@ -591,7 +636,8 @@ 1 @@ -624,7 +670,9 @@ 3 1 - + @@ -639,7 +687,9 @@ 3 1 - + @@ -673,7 +723,8 @@ 3 1 - + 문서종류 @@ -708,12 +759,15 @@ 3 1 - + @@ -728,7 +782,9 @@ 3 1 - + @@ -743,7 +799,9 @@ 3 1 - + * 소유주 변경고지할 차량이라면 꼭 체크해 주세요. @@ -766,7 +824,9 @@ 3 1 - + @@ -774,7 +834,9 @@ 4 1 - + @@ -796,14 +858,17 @@ 7 1 - + - + diff --git a/src/main/java/cfs/fine/dao/mapper/FinePenaltyDisableProcessing_mapper.xml b/src/main/java/cfs/fine/dao/mapper/FinePenaltyDisableProcessing_mapper.xml index 64611a7..d33a7bc 100644 --- a/src/main/java/cfs/fine/dao/mapper/FinePenaltyDisableProcessing_mapper.xml +++ b/src/main/java/cfs/fine/dao/mapper/FinePenaltyDisableProcessing_mapper.xml @@ -866,7 +866,6 @@ - @@ -875,7 +874,7 @@ - + @@ -913,7 +912,7 @@ , D.CAR_NO AS CAR_NO , D.OWNER AS OWNER , DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO) AS RESIDENT_NO - ,'검증원' AS last_Reader + ,'검증원' AS LAST_READER , DECODE(LENGTH(DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO)), '13', SUBSTR(DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO),1,6)) AS NO1 , DECODE(LENGTH(DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO)), '13', SUBSTR(DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO),7,7)) AS NO2 , DECODE(LENGTH(DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO)), '10', SUBSTR(DGUARD.DECRYPT('ENC','COL',D.ENC_RESIDENT_NO),1,3)) AS NO3 @@ -1063,23 +1062,23 @@ , #{carNo} , DGUARD.ENCRYPT('ENC','COL',#{residentNo}) , SYSDATE - , (select nvl(max(CHANAGE_SEQNO),0)+1 from PENALTY_ADDRESS_UPDATE_I_DAMO where penalty_manage_year = #{penaltyManageYear} and penalty_seqno = #{penaltySeqNo}) - , (select owner from PENALTY_DETAIL_INFO_DAMO where penalty_manage_year = #{penaltyManageYear} and penalty_seqno = #{penaltySeqNo}) - , (select resident_date from PENALTY_HEAD_INFO_DAMO where car_no = #{carNo2} and ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) - , (select post_no1 from PENALTY_HEAD_INFO_DAMO where car_no = #{carNo2} and ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) - , (select post_no2 from PENALTY_HEAD_INFO_DAMO where car_no = #{carNo2} and ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) - , (select address_name from PENALTY_HEAD_INFO_DAMO where car_no = #{carNo2} and ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) - , (select address_number from PENALTY_HEAD_INFO_DAMO where car_no = #{carNo2} and ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) - , (select motion_id from PENALTY_DETAIL_INFO_DAMO where penalty_manage_year = #{penaltyManageYear} and penalty_seqno = #{penaltySeqNo}) - , sysdate, #{sessionUserNm}, sysdate, #{sessionUserNm} + , (SELECT NVL(MAX(CHANAGE_SEQNO),0)+1 FROM PENALTY_ADDRESS_UPDATE_I_DAMO WHERE PENALTY_MANAGE_YEAR = #{penaltyManageYear} AND PENALTY_SEQNO = #{penaltySeqNo}) + , (SELECT OWNER FROM PENALTY_DETAIL_INFO_DAMO WHERE PENALTY_MANAGE_YEAR = #{penaltyManageYear} AND PENALTY_SEQNO = #{penaltySeqNo}) + , (SELECT RESIDENT_DATE FROM PENALTY_HEAD_INFO_DAMO WHERE CAR_NO = #{carNo2} AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) + , (SELECT POST_NO1 FROM PENALTY_HEAD_INFO_DAMO WHERE CAR_NO = #{carNo2} AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) + , (SELECT POST_NO2 FROM PENALTY_HEAD_INFO_DAMO WHERE CAR_NO = #{carNo2} AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) + , (SELECT ADDRESS_NAME FROM PENALTY_HEAD_INFO_DAMO WHERE CAR_NO = #{carNo2} AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) + , (SELECT ADDRESS_NUMBER FROM PENALTY_HEAD_INFO_DAMO WHERE CAR_NO = #{carNo2} AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo2})) + , (SELECT MOTION_ID FROM PENALTY_DETAIL_INFO_DAMO WHERE PENALTY_MANAGE_YEAR = #{penaltyManageYear} AND PENALTY_SEQNO = #{penaltySeqNo}) + , SYSDATE, #{sessionUserNm}, SYSDATE, #{sessionUserNm} ) - + - select car_no - , resident_no - from ( - select rownum, car_no, DGUARD.DECRYPT('ENC','COL',ENC_RESIDENT_NO) AS RESIDENT_NO - from PENALTY_RENT_HEAD_INFO - where CAR_NO = #{carNo} - and ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo}) + SELECT CAR_NO + , RESIDENT_NO + FROM ( + SELECT ROWNUM, CAR_NO, DGUARD.DECRYPT('ENC','COL',ENC_RESIDENT_NO) AS RESIDENT_NO + FROM PENALTY_RENT_HEAD_INFO + WHERE CAR_NO = #{carNo} + AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo}) ) - where rownum = '1' + WHERE ROWNUM = '1' - - + + @@ -1286,22 +1285,22 @@ , '' , '' FROM PENALTY_HEAD_INFO_DAMO - WHERE rownum = 1 + WHERE ROWNUM = 1 AND CAR_NO = #{carNo} AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo}) UPDATE PENALTY_RENT_HEAD_INFO - SET update_date = SYSDATE - , updater = #{sessionUserNm} - , owner = #{owner} - , car_type_name = #{carTypeName1} - , max_carry_capacity = #{maxCarryCapacity} - , post_no1 = SUBSTR(#{postNo},1,3) - , post_no2 = SUBSTR(#{postNo},4,2) - , address_name = #{addressName} - , address_number = #{addressNumber} + SET UPDATE_DATE = SYSDATE + , UPDATER = #{sessionUserNm} + , OWNER = #{owner} + , CAR_TYPE_NAME = #{carTypeName1} + , MAX_CARRY_CAPACITY = #{maxCarryCapacity} + , POST_NO1 = SUBSTR(#{postNo},1,3) + , POST_NO2 = SUBSTR(#{postNo},4,2) + , ADDRESS_NAME = #{addressName} + , ADDRESS_NUMBER = #{addressNumber} WHERE CAR_NO = #{carNo} AND ENC_RESIDENT_NO = DGUARD.ENCRYPT('ENC','COL',#{residentNo}) @@ -1341,9 +1340,9 @@ UPDATE PENALTY_RENT_DETAIL_INFO - SET update_date = sysdate - , updater = #{sessionUserNm} - , owner = #{owner} + SET UPDATE_DATE = SYSDATE + , UPDATER = #{sessionUserNm} + , OWNER = #{owner} , RENT_COMPANY = #{rentCompany} , RENT_PERIOD_1 = #{rentPeriod1} , RENT_PERIOD_2 = #{rentPeriod2} diff --git a/src/main/java/cfs/fine/web/FinePenaltyDisableProcessingController.java b/src/main/java/cfs/fine/web/FinePenaltyDisableProcessingController.java index 32f2ec5..dd8c634 100644 --- a/src/main/java/cfs/fine/web/FinePenaltyDisableProcessingController.java +++ b/src/main/java/cfs/fine/web/FinePenaltyDisableProcessingController.java @@ -317,7 +317,9 @@ public class FinePenaltyDisableProcessingController { * 수정내역 */ @RequestMapping(value="/cfs/fine/findPaymentOfPenaltySecondaryChange.do", method=RequestMethod.POST) - public @ResponseBody Map findInfoForSecondaryChange(@RequestBody ParamBean param, HttpServletRequest request) throws Exception { + public @ResponseBody Map findInfoForSecondaryChange( + @RequestBody ParamBean param, + HttpServletRequest request) throws Exception { FinePenaltyDisableProcessingVO finePenaltyDisableProcessingVO = param.getParam();