From 4f8cf1eb23d75c8daf0a33afabc85b5850ed18dd Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 22 Aug 2023 10:51:15 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B0=A8=EB=9F=89=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/crdn/web/Crdn05Controller.java   |  2 +-
 .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml    |  2 +
 .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  | 51 +++++++------
 .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp  | 73 ++++++++++---------
 4 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
index 04a51c29..13629820 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
@@ -95,7 +95,7 @@ public class Crdn05Controller extends ApplicationController {
 		mav.addObject("pageName", "crdn05030-info");
 		String urlTaskSeCd = hReq.getServletPath().split("/")[1];
 		mav.addObject("taskSeCd", urlTaskSeCd);
-
+		mav.addObject("sggCd", globalStngMapper.selectSggCdForCurrentUser());
 		String vltnByTask = "";
 
 		switch(urlTaskSeCd) {
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 ebece930..4e3c7117 100644
--- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
@@ -261,6 +261,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
 <select id="selectCivilComplaintReceiptInitialDataInfo" parameterType="map" resultType="dataobject">
 /* 민원접수 초기자료 상세조회(crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
+     , C.SGG_CD                 <!-- 시군구 코드 -->
      , C.TASK_SE_CD             <!-- 업무 구분 코드 -->
      , C.CRDN_REG_SE_CD         <!-- 단속 등록 구분 코드 -->
      , C.CRDN_YMD               <!-- 단속 일자 -->
@@ -287,6 +288,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
      , CC.CVLCPT_RCPT_YMD       <!-- 민원 접수 일자 -->
      , CC.CVLCPT_PRCS_PRNMNT_DT <!-- 민원 처리 예정 일시 -->
      , CC.DSTRBNC_YN            <!-- 방해 여부 -->
+     , P.RTPYR_ID               <!-- 납부자 ID -->
      , P.RTPYR_NM               <!-- 납부자 명 -->
      , P.RTPYR_SE_CD            <!-- 납부자 구분 코드 -->
      , P.RTPYR_NO               <!-- 납부자 주민번호 -->
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
index 38c85f8e..35d7accd 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
@@ -4,8 +4,10 @@
 <div class="d-flex flex-row justify-content-evenly">
 	<div class="card" style="max-width:1100px;" title="단속정보">
 		<form id="frmEdit--${pageName}">
-			<input name="crdnId" type="hidden" data-map="CRDN_ID" />
-			<input id="taskSeCd--${pageName}" name="taskSeCd" type="hidden" value="${taskSeCd}" />
+			<input type="hidden" id="crdnId-${pageName}" name="crdnId" data-map="CRDN_ID" />
+			<input type="hidden" id="rtpyrId-${pageName}" name="rtpyrId" data-map="RTPYR_ID"/>
+			<input type="hidden" id="sggCd--${pageName}" name="sggCd" value="${sggCd}" />
+			<input type="hidden" id="taskSeCd--${pageName}" name="taskSeCd" value="${taskSeCd}" />
 			<div class="row g-1">
 				<div class="col-md-12" slot="edit">
 					<template class="pvs bpv">
@@ -474,21 +476,24 @@ $(document).ready(function(){
 			}
 			
 			json.post({
-				url: wctx.url("/api/lvis/basicInfo.do"),
-				data: JSON.stringify({
+				url: wctx.url("/payer/vehicle.do"),
+				data: {
+					sggCd : $("#sggCd--${pageName}").val(),
 					vhrno : vhrno,
 					levy_stdde : crdnYmd
-				}),
+				},
 				success:resp => {
 					
-					if(resp.basicInfo != null && resp.basicInfo.vhrno != null){
+					if(resp.rtpyrId != null && resp.vehicle != null){
 						
-						var basicInfo = resp.basicInfo;
+						$("#rtpyrId--${pageName}").val(resp.rtpyrId);
 						
-						$("#rtpyrNm--${pageName}").val(basicInfo.mber_nm);
+						var vehicle = resp.vehicle;
+						
+						$("#rtpyrNm--${pageName}").val(vehicle.mber_nm);
 						
 						var pyrSeCd = "";
-						switch(basicInfo.mber_se_code){
+						switch(vehicle.mber_se_code){
 							case "11" : pyrSeCd = "01"; break;
 							case "12" : pyrSeCd = "02"; break;
 							case "13" : pyrSeCd = "03"; break;
@@ -497,24 +502,24 @@ $(document).ready(function(){
 						}
 						$("#rtpyrSeCd--${pageName}").val(pyrSeCd);
 
-						$("#rtpyrNo--${pageName}").val(basicInfo.mber_se_no);
+						$("#rtpyrNo--${pageName}").val(vehicle.mber_se_no);
 						
-						$("#vin--${pageName}").val(basicInfo.vin);
-						$("#vhclNm--${pageName}").val(basicInfo.cnm);
-						$("#vhclColor--${pageName}").val(basicInfo.color_nm);
-						$("#useFuelCd--${pageName}").val(basicInfo.use_fuel_code);
+						$("#vin--${pageName}").val(vehicle.vin);
+						$("#vhclNm--${pageName}").val(vehicle.cnm);
+						$("#vhclColor--${pageName}").val(vehicle.color_nm);
+						$("#useFuelCd--${pageName}").val(vehicle.use_fuel_code);
 						
-						if(basicInfo.vhcty_asort_code == "1"){ //승용
+						if(vehicle.vhcty_asort_code == "1"){ //승용
 							$("#ffnlgCarmdlCd--${pageName}").val("11");
-						} else if(basicInfo.vhcty_asort_code == "2"){ //승합
+						} else if(vehicle.vhcty_asort_code == "2"){ //승합
 							$("#ffnlgCarmdlCd--${pageName}").val("12");
-						} else if(basicInfo.vhcty_asort_code == "3"){ //화물
-							if(basicInfo.vhcle_tot_wt <= 4000){
+						} else if(vehicle.vhcty_asort_code == "3"){ //화물
+							if(vehicle.vhcle_tot_wt <= 4000){
 								$("#ffnlgCarmdlCd--${pageName}").val("13");
 							} else {
 								$("#ffnlgCarmdlCd--${pageName}").val("14");
 							}
-						} else if(basicInfo.vhcty_asort_code == "4"){ //특수
+						} else if(vehicle.vhcty_asort_code == "4"){ //특수
 							$("#ffnlgCarmdlCd--${pageName}").val("15");
 						} else {
 							//$("#ffnlgCarmdlCd--${pageName}").val("21"); //건설기계
@@ -523,11 +528,11 @@ $(document).ready(function(){
 						}
 
 						
-						//$("#--${pageName}").val(basicInfo.);
+						//$("#--${pageName}").val(vehicle.);
 						
-						//$("#addr--${pageName}").val(basicInfo.); //주소
-						//$("#dtlAddr--${pageName}").val(basicInfo.); //상세주소
-						//$("#zip--${pageName}").val(basicInfo.); //우편번호
+						//$("#addr--${pageName}").val(vehicle.); //주소
+						//$("#dtlAddr--${pageName}").val(vehicle.); //상세주소
+						//$("#zip--${pageName}").val(vehicle.); //우편번호
 						
 						//"use_strnghld_legaldong_code" :  "4136010300",
         				//"use_strnghld_adstrd_code" : "4136053000",
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 c80e72d2..262bfbb0 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
@@ -4,8 +4,10 @@
 <div class="d-flex flex-row justify-content-evenly">
 	<div class="card" style="max-width:1000px;">
 		<form id="frmEdit--${pageName}">
-			<input id="crdnId--${pageName}" name="crdnId" type="hidden" data-map="CRDN_ID" />
-			<input id="taskSeCd--${pageName}" name="taskSeCd" type="hidden" data-map="TASK_SE_CD" />
+			<input type="hidden" id="crdnId--${pageName}" name="crdnId" data-map="CRDN_ID" />
+			<input type="hidden" id="rtpyrId-${pageName}" name="rtpyrId" data-map="RTPYR_ID" />
+			<input type="hidden" id="sggCd--${pageName}" name="sggCd" data-map="SGG_CD" />
+			<input type="hidden" id="taskSeCd--${pageName}" name="taskSeCd" data-map="TASK_SE_CD" />
 
 			<div class="row mt-4 justify-content-end mb-3">
 				<div class="col-md-4">
@@ -855,21 +857,24 @@ $(document).ready(function(){
 			}
 
 			json.post({
-				url: wctx.url("/api/lvis/basicInfo.do"),
-				data: JSON.stringify({
+				url: wctx.url("/payer/vehicle.do"),
+				data: {
+					sggCd : $("#sggCd--${pageName}").val(),
 					vhrno : vhrno,
 					levy_stdde : crdnYmd
-				}),
+				},
 				success:resp => {
-
-					if(resp.basicInfo != null && resp.basicInfo.vhrno != null){
-
-						var basicInfo = resp.basicInfo;
-
-						$("#rtpyrNm--${pageName}").val(basicInfo.mber_nm);
-
+					
+					if(resp.rtpyrId != null && resp.vehicle != null){
+						
+						$("#rtpyrId--${pageName}").val(resp.rtpyrId);
+						
+						var vehicle = resp.vehicle;
+						
+						$("#rtpyrNm--${pageName}").val(vehicle.mber_nm);
+						
 						var pyrSeCd = "";
-						switch(basicInfo.mber_se_code){
+						switch(vehicle.mber_se_code){
 							case "11" : pyrSeCd = "01"; break;
 							case "12" : pyrSeCd = "02"; break;
 							case "13" : pyrSeCd = "03"; break;
@@ -878,38 +883,38 @@ $(document).ready(function(){
 						}
 						$("#rtpyrSeCd--${pageName}").val(pyrSeCd);
 
-						$("#rtpyrNo--${pageName}").val(basicInfo.mber_se_no);
-
-						$("#vin--${pageName}").val(basicInfo.vin);
-						$("#vhclNm--${pageName}").val(basicInfo.cnm);
-						$("#vhclColor--${pageName}").val(basicInfo.color_nm);
-						$("#useFuelCd--${pageName}").val(basicInfo.use_fuel_code);
-
-						if(basicInfo.vhcty_asort_code == "1"){ //승용
+						$("#rtpyrNo--${pageName}").val(vehicle.mber_se_no);
+						
+						$("#vin--${pageName}").val(vehicle.vin);
+						$("#vhclNm--${pageName}").val(vehicle.cnm);
+						$("#vhclColor--${pageName}").val(vehicle.color_nm);
+						$("#useFuelCd--${pageName}").val(vehicle.use_fuel_code);
+						
+						if(vehicle.vhcty_asort_code == "1"){ //승용
 							$("#ffnlgCarmdlCd--${pageName}").val("11");
-						} else if(basicInfo.vhcty_asort_code == "2"){ //승합
+						} else if(vehicle.vhcty_asort_code == "2"){ //승합
 							$("#ffnlgCarmdlCd--${pageName}").val("12");
-						} else if(basicInfo.vhcty_asort_code == "3"){ //화물
-							if(basicInfo.vhcle_tot_wt <= 4000){
+						} else if(vehicle.vhcty_asort_code == "3"){ //화물
+							if(vehicle.vhcle_tot_wt <= 4000){
 								$("#ffnlgCarmdlCd--${pageName}").val("13");
 							} else {
 								$("#ffnlgCarmdlCd--${pageName}").val("14");
 							}
-						} else if(basicInfo.vhcty_asort_code == "4"){ //특수
+						} else if(vehicle.vhcty_asort_code == "4"){ //특수
 							$("#ffnlgCarmdlCd--${pageName}").val("15");
 						} else {
 							//$("#ffnlgCarmdlCd--${pageName}").val("21"); //건설기계
 							//$("#ffnlgCarmdlCd--${pageName}").val("31"); //이륜차
-
+							
 						}
 
-
-						//$("#--${pageName}").val(basicInfo.);
-
-						//$("#addr--${pageName}").val(basicInfo.); //주소
-						//$("#dtlAddr--${pageName}").val(basicInfo.); //상세주소
-						//$("#zip--${pageName}").val(basicInfo.); //우편번호
-
+						
+						//$("#--${pageName}").val(vehicle.);
+						
+						//$("#addr--${pageName}").val(vehicle.); //주소
+						//$("#dtlAddr--${pageName}").val(vehicle.); //상세주소
+						//$("#zip--${pageName}").val(vehicle.); //우편번호
+						
 						//"use_strnghld_legaldong_code" :  "4136010300",
         				//"use_strnghld_adstrd_code" : "4136053000",
         				//"use_strnghld_mntn" :  "",
@@ -922,7 +927,7 @@ $(document).ready(function(){
         				//"use_strnghld_buld_sub_no" : "2",
 
 					}
-
+					
 				}
 			});
 		}