From a4df972803a82d43486ca74683a97a1e67ea27d4 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Tue, 28 May 2024 18:13:04 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EC=A0=91=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=90=EB=A3=8C=EB=A5=BC=20=EC=A0=80=EC=9E=A5(=EC=88=98?=
 =?UTF-8?q?=EC=9A=A9)=20=EC=B2=98=EB=A6=AC=ED=96=88=EC=9D=84=EB=95=8C=20?=
 =?UTF-8?q?=EB=82=A9=EB=B6=80=EC=9E=90=20=EC=A0=95=EB=B3=B4,=20=EB=82=A9?=
 =?UTF-8?q?=EB=B6=80=EC=9E=90=20=EC=A3=BC=EC=86=8C=20=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=B0=8F=20=EB=B3=80=EA=B2=BD=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmmn/service/bean/CrdnPayerHstryBean.java |  2 +-
 .../cvlc/service/bean/CrdnCvlcptSubBean.java  | 21 +++++++++++++++++++
 .../fims/payer/service/bean/PayerBean.java    |  8 ++-----
 .../sql/mapper/fims/crdn/crdn-info-mapper.xml |  2 ++
 .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml    | 12 ++++++-----
 .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp  |  6 ++++++
 6 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerHstryBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerHstryBean.java
index 138203f4..69dc1e56 100644
--- a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerHstryBean.java
+++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerHstryBean.java
@@ -56,7 +56,7 @@ public class CrdnPayerHstryBean extends AbstractBean {
 		return crdnPayerHstryMapper.insertCrdnPayerHstry(crdnPayerHstry);
 	}
 
-	/**단속 납부자 이력 정보를 등록한다.
+	/**단속 납부자 주소 이력 정보를 등록한다.
 	 * @param crdnPayerHstry 단속 납부자 이력
 	 * @return 저장 여부
 	 * <ul><li>저장됐으면 true</li>
diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java
index bfcf4888..6c481aa2 100644
--- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java
+++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java
@@ -196,6 +196,13 @@ public class CrdnCvlcptSubBean extends AbstractBean {
 			nonQueryRequest.put("changePayerYn","N");
 		}
 
+		//납부자 주소 변경
+		if(!crdnInfo.string("ADDR_SN").equals(crdn.getAddrSn())) {
+			nonQueryRequest.put("changePayerAddrYn","Y");
+		} else {
+			nonQueryRequest.put("changePayerAddrYn","N");
+		}
+
 		//단속상태값 변경
 		nonQueryRequest.put("changeStatusYn","Y");
 
@@ -250,6 +257,20 @@ public class CrdnCvlcptSubBean extends AbstractBean {
 			}
 		}
 
+		//단속 납부자 주소 변경 이력 등록
+		if(((String)nonQueryRequest.get("changePayerAddrYn")).equals("Y")) {
+			CrdnPayerHstry crdnPayerHstry = new CrdnPayerHstry();
+
+			crdnPayerHstry.setCrdnId(crdn.getCrdnId());
+			crdnPayerHstry.setRtpyrId(crdn.getRtpyrId());
+			crdnPayerHstry.setAddrSn(crdn.getAddrSn());
+
+			boolean retSuccess = crdnPayerHstryMapper.insertCrdnPayerAddrHstry(crdnPayerHstry);
+			if(!retSuccess) {
+				throw new RuntimeException("단속민원답변 수정 중 단속납부자변경 이력 등록에 실패하였습니다.");
+			}
+		}
+
 		//단속상태 변경 이력 등록
 		if(((String)nonQueryRequest.get("changeStatusYn")).equals("Y")) {
 			CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry();
diff --git a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java
index 52340acb..d13245ef 100644
--- a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java
+++ b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java
@@ -214,15 +214,11 @@ public class PayerBean extends AbstractBean {
 
 		// 등록된 최종 주소를 확인하여 주소+상세주소가 다르다면 주소를 신규 등록한다.
 		if (result.getAddr().equals(basicInfo.getRoad_nm_adres()) && result.getDtlAddr().equals(basicInfo.getUse_strnghld_adres_nm())) {
-			payer.setRtpyrId(result.getRtpyrId());				// 납부자 ID
 			// 납부자 주소의 최중 수정일자를 수정
-			updatePayerAddr(payer);
+			updatePayerAddr(result);
 		} else {
-			payer.setRtpyrId(result.getRtpyrId());				// 납부자 ID
 			// 납부자 주소를 신규 등록
-			createPayerAddr(payer);
-
-			result.setAddrSn(payer.getAddrSn());				// 주소 일련번호
+			createPayerAddr(result);
 		}
 
 		if (result != null)
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 38f5c708..671b8544 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
@@ -137,6 +137,7 @@
              , CA.OVTIME_YN             <!-- 시간외 여부 -->
              , CA.OVTIME_PRTTN_YN       <!-- 시간외 분할 여부 -->
              , P.RTPYR_ID               <!-- 납부자 ID -->
+             , PA.ADDR_SN               <!-- 주소 일련번호 -->
              , CC.CVLCPT_LINK_ID        <!-- 민원 연계 ID -->
              , CC.CVLCPT_TRSM_CD        <!-- 민원 전송 코드 -->
              , CC.CVLCPT_PRCS_CD        <!-- 민원 처리 코드 -->
@@ -148,6 +149,7 @@
          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_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')
          WHERE C.DEL_YN  = 'N'
            AND C.CRDN_ID = #{crdnId}
diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
index 42915221..441679fb 100644
--- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
@@ -347,9 +347,10 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
      , P.RTPYR_NM               <!-- 납부자 명 -->
      , P.RTPYR_SE_CD            <!-- 납부자 구분 코드 -->
      , P.RTPYR_NO               <!-- 납부자 주민번호 -->
-     , PA.ADDR                   <!-- 납부자 주소 -->
-     , PA.DTL_ADDR               <!-- 납부자 상세주소 -->
-     , PA.ZIP                    <!-- 납부자 우편번호 -->
+     , PA.ADDR_SN               <!-- 주소 일련번호 -->
+     , PA.ZIP                   <!-- 우편번호 -->
+     , PA.ADDR                  <!-- 주소 -->
+     , PA.DTL_ADDR              <!-- 상세 주소 -->
   FROM TB_CRDN C
   INNER JOIN TB_CRDN_ADI        CA ON (C.CRDN_ID = CA.CRDN_ID)
   INNER JOIN TB_CRDN_CVLCPT     CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID)
@@ -582,8 +583,9 @@ SELECT CC.CVLCPT_LINK_ID                    /* 민원 연계 ID */
     /* 단속정보 수정(crdnCvlcptMapper.updateCrdn) */
     UPDATE TB_CRDN
        SET MDFCN_DT         = <include refid="utility.now" /> /* 수정일시 */
-         , MDFR             = #{currentUser.id}       /* 수정자 */
+         , MDFR             = #{currentUser.id}      /* 수정자 */
          , RTPYR_ID         = #{crdn.rtpyrId}        /* 납부자 ID */
+         , ADDR_SN          = #{crdn.addrSn}         /* 주소 일련번호 */
          , CRDN_YMD         = #{crdn.crdnYmd}        /* 단속 일자 */
          , CRDN_TM          = #{crdn.crdnTm}         /* 단속 시각 */
          , VHRNO            = #{crdn.vhrno}          /* 차량번호 */
@@ -608,7 +610,7 @@ SELECT CC.CVLCPT_LINK_ID                    /* 민원 연계 ID */
          , CRDN_STTS_CD     = #{crdn.crdnSttsCd}     /* 단속 상태 코드 */
          , CRDN_STTS_CHG_DT = <include refid="utility.now" />    /* 단속 상태 변경 일시 */
          </if>
-     WHERE CRDN_ID = #{crdn.crdnId}                   /* 단속 ID */
+     WHERE CRDN_ID = #{crdn.crdnId}                  /* 단속 ID */
 </update>
 
 <update id="updateCrdnAddition" parameterType="map">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
index 14ac52e2..4529f7d6 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
@@ -6,6 +6,7 @@
 		<form id="frmEdit--${pageName}">
 			<input type="text" id="crdnId--${pageName}" name="crdnId" data-map="CRDN_ID" hidden />
 			<input type="text" id="rtpyrId--${pageName}" name="rtpyrId" data-map="RTPYR_ID" hidden />
+			<input type="text" id="addrSn--${pageName}" name="addrSn" data-map="ADDR_SN" hidden />
 			<input type="text" id="sggCd--${pageName}" name="sggCd" data-map="SGG_CD" hidden />
 			<input type="text" id="taskSeCd--${pageName}" name="taskSeCd" data-map="TASK_SE_CD" hidden />
 
@@ -701,6 +702,7 @@ $(document).ready(function(){
 			sggCd			: $("#sggCd--${pageName}").val(),			// 시군구 코드
 			taskSeCd		: $("#taskSeCd--${pageName}").val(),		// 업무 구분 코드
 			rtpyrId			: $("#rtpyrId--${pageName}").val(),			// 납부자 ID
+			addrSn			: $("#addrSn--${pageName}").val(),			// 주소 일련번호
 			vhrno			: $("#vhrno--${pageName}").val(),			// 차량번호
 			rtpyrInptSeCd	: "01",										// 납부자 입력 구분 코드
 			delYn			: "N"
@@ -741,6 +743,7 @@ $(document).ready(function(){
 				if (resp.crdnPayer) {
 					var payer = resp.crdnPayer;
 					$("#rtpyrId--${pageName}").val(payer.RTPYR_ID).change();
+					$("#addrSn--${pageName}").val(payer.ADDR_SN).change();
 					$("#rtpyrNm--${pageName}").val(payer.RTPYR_NM).change();
 					$("#rtpyrSeCd--${pageName}").val(payer.RTPYR_SE_CD).change();
 					$("#rtpyrNo--${pageName}").val(payer.RTPYR_NO).change();
@@ -749,6 +752,7 @@ $(document).ready(function(){
 					$("#dtlAddr--${pageName}").val(payer.DTL_ADDR).change();
 				} else {
 					$("#rtpyrId--${pageName}").val("").change();
+					$("#addrSn--${pageName}").val("").change();
 					$("#rtpyrNm--${pageName}").val("").change();
 					$("#rtpyrSeCd--${pageName}").val("").change();
 					$("#rtpyrNo--${pageName}").val("").change();
@@ -962,6 +966,7 @@ $(document).ready(function(){
 		if(!resp.found){
 
 			$("#rtpyrId--${pageName}").val("");
+			$("#addrSn--${pageName}").val("");
 			$("#rtpyrNm--${pageName}").val("");
 			$("#rtpyrSeCd--${pageName}").val("");
 			$("#rtpyrNo--${pageName}").val("");
@@ -993,6 +998,7 @@ $(document).ready(function(){
 		}
 
 		$("#rtpyrId--${pageName}").val(resp.rtpyrId);
+		$("#addrSn--${pageName}").val(resp.addrSn);
 
 		var vehicle = resp.vehicle;