From 3353aad7038cffdeaaa663fc49e50e54ef28161c Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 28 Jul 2023 17:21:38 +0900
Subject: [PATCH 01/20] =?UTF-8?q?=ED=95=9C=EA=B8=80=20=EC=84=9C=EC=8B=9D?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fims/crdn/service/bean/Crdn01ServiceBean.java |  14 +++++++++++---
 .../cokr/xit/fims/crdn/web/Crdn01Controller.java  |   5 ++---
 .../resources/format/cvlcptOrgnl_photo.hwp        | Bin
 .../resources/format/cvlcptOrgnl_text.hwp         | Bin
 4 files changed, 13 insertions(+), 6 deletions(-)
 rename src/main/{webapp => }/resources/format/cvlcptOrgnl_photo.hwp (100%)
 rename src/main/{webapp => }/resources/format/cvlcptOrgnl_text.hwp (100%)

diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
index a1638a0b..adc457b3 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
+import org.springframework.util.ResourceUtils;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.file.service.FileQuery;
@@ -65,7 +66,10 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic
 		return crdn01Bean.removeCivilComplaint(crdnIDs);
 	}
 
-	public ModelAndView makeFileFromHwpFormat(CrdnQuery crdnQuery, String baseFormatFilePath, String attachFormatFilePath) {
+	public ModelAndView makeFileFromHwpFormat(CrdnQuery crdnQuery) {
+
+		String baseFormatFilePath = ("classpath:format/cvlcptOrgnl_text.hwp");
+		String attachFormatFilePath = ("classpath:format/cvlcptOrgnl_photo.hwp");
 
 		crdnQuery.setView("hwp");
 		DataObject dataObject = crdn01Bean.getCivilComplaintOriginalInfo(crdnQuery);
@@ -74,7 +78,10 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic
 		SimpleDateFormat ymdHypenFormat = new SimpleDateFormat("yyyy-MM-dd");
 
 		try {
-			HWPFile baseFormatFile = HWPReader.fromFile(baseFormatFilePath);
+
+			File file = ResourceUtils.getFile(baseFormatFilePath);
+
+			HWPFile baseFormatFile = HWPReader.fromFile(file);
 
 			ArrayList<String> strings = new ArrayList<String>();
 			strings.add(dataObject.string("CVLCPT_APLCNT_NM"));
@@ -136,7 +143,8 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic
 					int PHOTO_COUNT_PER_PAGE = 4;
 
 					for(int i=0; i < photoCnt; i += PHOTO_COUNT_PER_PAGE) {
-						HWPFile attachFormatFile = HWPReader.fromFile(attachFormatFilePath);
+						file = ResourceUtils.getFile(attachFormatFilePath);
+						HWPFile attachFormatFile = HWPReader.fromFile(file);
 						InsertingImageCell.IMPL_InsertPicture(attachFormatFile, "왼쪽위사진", fileInfoList.get(i).string("URL"));
 						if(i+1 < photoCnt)
 							InsertingImageCell.IMPL_InsertPicture(attachFormatFile, "오른쪽위사진", fileInfoList.get(i+1).string("URL"));
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
index 06d80884..453aaded 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
@@ -189,10 +189,9 @@ public class Crdn01Controller extends ApplicationController {
 	@RequestMapping(name="민원내역 원본 한글 파일 생성", value="/050/makeFileFromHwpFormat.do")
 	public ModelAndView makeFileFromHwpFormat(CrdnQuery crdnQuery, HttpServletRequest request) {
 
-		String baseFormatFilePath = request.getServletContext().getRealPath("resources/format/cvlcptOrgnl_text.hwp");
-		String attachFormatFilePath = request.getServletContext().getRealPath("resources/format/cvlcptOrgnl_photo.hwp");
 
-		return crdn01Service.makeFileFromHwpFormat(crdnQuery, baseFormatFilePath, attachFormatFilePath);
+
+		return crdn01Service.makeFileFromHwpFormat(crdnQuery);
 	}
 
 	/** 민원답변내용 미리보기 화면을 연다.
diff --git a/src/main/webapp/resources/format/cvlcptOrgnl_photo.hwp b/src/main/resources/format/cvlcptOrgnl_photo.hwp
similarity index 100%
rename from src/main/webapp/resources/format/cvlcptOrgnl_photo.hwp
rename to src/main/resources/format/cvlcptOrgnl_photo.hwp
diff --git a/src/main/webapp/resources/format/cvlcptOrgnl_text.hwp b/src/main/resources/format/cvlcptOrgnl_text.hwp
similarity index 100%
rename from src/main/webapp/resources/format/cvlcptOrgnl_text.hwp
rename to src/main/resources/format/cvlcptOrgnl_text.hwp

From 6cca0884d9375eac730ff9331404e689ff3d6ba2 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 31 Jul 2023 09:09:13 +0900
Subject: [PATCH 02/20] =?UTF-8?q?=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=20=EA=B0=80=EB=8A=A5=ED=95=9C=20svg=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/base/FileController.java    | 13 +---
 .../svg}/계도장 발송현황.svg                  |  0
 .../svg}/고정형cctv.svg                       |  0
 .../svg}/고지서 발송현황.svg                  |  0
 .../framework => resources/svg}/도보단속.svg  |  0
 .../framework => resources/svg}/등록대상.svg  |  0
 .../svg}/민원(즉시단속).svg                   |  0
 .../svg}/사전통보 발송현황.svg                |  0
 .../svg}/수용_미수용.svg                      |  0
 .../svg}/이동형cctv.svg                       |  0
 .../framework => resources/svg}/이첩대상.svg  |  0
 .../framework => resources/svg}/자진취하.svg  |  0
 .../fims/framework => resources/svg}/접수.svg |  0
 .../css/fims/framework/common/xit-icon.css    | 72 +++++++++----------
 14 files changed, 39 insertions(+), 46 deletions(-)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/계도장 발송현황.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/고정형cctv.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/고지서 발송현황.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/도보단속.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/등록대상.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/민원(즉시단속).svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/사전통보 발송현황.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/수용_미수용.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/이동형cctv.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/이첩대상.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/자진취하.svg (100%)
 rename src/main/{webapp/resources/image/fims/framework => resources/svg}/접수.svg (100%)

diff --git a/src/main/java/cokr/xit/fims/base/FileController.java b/src/main/java/cokr/xit/fims/base/FileController.java
index b305c9f1..c8282513 100644
--- a/src/main/java/cokr/xit/fims/base/FileController.java
+++ b/src/main/java/cokr/xit/fims/base/FileController.java
@@ -45,18 +45,11 @@ public class FileController extends cokr.xit.base.file.web.FileController {
 	public void modifySvg(HttpServletRequest request, HttpServletResponse response) throws URISyntaxException, IOException, ParserConfigurationException, SAXException {
         String requestURI = request.getRequestURI().toString();
 
-        String filepath = requestURI.replace("/file/modifySvg","/resources/image");
-        System.out.println("log : "+filepath);
+        String filepath = requestURI.split("modifySvg")[1];
         filepath = URLDecoder.decode(filepath);
-        System.out.println("log : "+filepath);
-        filepath = request.getSession().getServletContext().getRealPath(filepath);
-        System.out.println("log : "+filepath);
         filepath = filepath.replace("\\","/");
-        System.out.println("log : "+filepath);
-        String contextPath = request.getSession().getServletContext().getContextPath();
-        filepath = filepath.replace("webapp"+contextPath+"/resources", "webapp/resources");
-        System.out.println("log : "+filepath);
-        filepath = "file:///"+filepath;
+        String svgRootPath = ("classpath:svg");
+        filepath = svgRootPath + filepath;
 
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder documentBuilder = factory.newDocumentBuilder();
diff --git a/src/main/webapp/resources/image/fims/framework/계도장 발송현황.svg b/src/main/resources/svg/계도장 발송현황.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/계도장 발송현황.svg
rename to src/main/resources/svg/계도장 발송현황.svg
diff --git a/src/main/webapp/resources/image/fims/framework/고정형cctv.svg b/src/main/resources/svg/고정형cctv.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/고정형cctv.svg
rename to src/main/resources/svg/고정형cctv.svg
diff --git a/src/main/webapp/resources/image/fims/framework/고지서 발송현황.svg b/src/main/resources/svg/고지서 발송현황.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/고지서 발송현황.svg
rename to src/main/resources/svg/고지서 발송현황.svg
diff --git a/src/main/webapp/resources/image/fims/framework/도보단속.svg b/src/main/resources/svg/도보단속.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/도보단속.svg
rename to src/main/resources/svg/도보단속.svg
diff --git a/src/main/webapp/resources/image/fims/framework/등록대상.svg b/src/main/resources/svg/등록대상.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/등록대상.svg
rename to src/main/resources/svg/등록대상.svg
diff --git a/src/main/webapp/resources/image/fims/framework/민원(즉시단속).svg b/src/main/resources/svg/민원(즉시단속).svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/민원(즉시단속).svg
rename to src/main/resources/svg/민원(즉시단속).svg
diff --git a/src/main/webapp/resources/image/fims/framework/사전통보 발송현황.svg b/src/main/resources/svg/사전통보 발송현황.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/사전통보 발송현황.svg
rename to src/main/resources/svg/사전통보 발송현황.svg
diff --git a/src/main/webapp/resources/image/fims/framework/수용_미수용.svg b/src/main/resources/svg/수용_미수용.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/수용_미수용.svg
rename to src/main/resources/svg/수용_미수용.svg
diff --git a/src/main/webapp/resources/image/fims/framework/이동형cctv.svg b/src/main/resources/svg/이동형cctv.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/이동형cctv.svg
rename to src/main/resources/svg/이동형cctv.svg
diff --git a/src/main/webapp/resources/image/fims/framework/이첩대상.svg b/src/main/resources/svg/이첩대상.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/이첩대상.svg
rename to src/main/resources/svg/이첩대상.svg
diff --git a/src/main/webapp/resources/image/fims/framework/자진취하.svg b/src/main/resources/svg/자진취하.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/자진취하.svg
rename to src/main/resources/svg/자진취하.svg
diff --git a/src/main/webapp/resources/image/fims/framework/접수.svg b/src/main/resources/svg/접수.svg
similarity index 100%
rename from src/main/webapp/resources/image/fims/framework/접수.svg
rename to src/main/resources/svg/접수.svg
diff --git a/src/main/webapp/resources/css/fims/framework/common/xit-icon.css b/src/main/webapp/resources/css/fims/framework/common/xit-icon.css
index 2394723f..a832dfaf 100644
--- a/src/main/webapp/resources/css/fims/framework/common/xit-icon.css
+++ b/src/main/webapp/resources/css/fims/framework/common/xit-icon.css
@@ -1,73 +1,73 @@
 .svg-cctv-fixed:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/고정형cctv.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/고정형cctv.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/고정형cctv.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/고정형cctv.svg");
+    --bs-active : url("../../../../../file/modifySvg/고정형cctv.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/고정형cctv.svg?modify=alert");
 }
 
 .svg-cctv-drive:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/이동형cctv.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/이동형cctv.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/이동형cctv.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/이동형cctv.svg");
+    --bs-active : url("../../../../../file/modifySvg/이동형cctv.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/이동형cctv.svg?modify=alert");
 }
 
 .svg-crackdown-road:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/도보단속.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/도보단속.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/도보단속.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/도보단속.svg");
+    --bs-active : url("../../../../../file/modifySvg/도보단속.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/도보단속.svg?modify=alert");
 }
 
 .svg-crackdown-minwon:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/민원(즉시단속).svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/민원(즉시단속).svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/민원(즉시단속).svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/민원(즉시단속).svg");
+    --bs-active : url("../../../../../file/modifySvg/민원(즉시단속).svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/민원(즉시단속).svg?modify=alert");
 }
 
 .svg-target-lvy:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/등록대상.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/등록대상.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/등록대상.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/등록대상.svg");
+    --bs-active : url("../../../../../file/modifySvg/등록대상.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/등록대상.svg?modify=alert");
 }
 
 .svg-target-transfer:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/이첩대상.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/이첩대상.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/이첩대상.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/이첩대상.svg");
+    --bs-active : url("../../../../../file/modifySvg/이첩대상.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/이첩대상.svg?modify=alert");
 }
 
 .svg-sendstat-guide:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/계도장 발송현황.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/계도장 발송현황.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/계도장 발송현황.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/계도장 발송현황.svg");
+    --bs-active : url("../../../../../file/modifySvg/계도장 발송현황.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/계도장 발송현황.svg?modify=alert");
 }
 
 .svg-sendstat-before:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/사전통보 발송현황.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/사전통보 발송현황.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/사전통보 발송현황.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/사전통보 발송현황.svg");
+    --bs-active : url("../../../../../file/modifySvg/사전통보 발송현황.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/사전통보 발송현황.svg?modify=alert");
 }
 
 .svg-sendstat-nop:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/고지서 발송현황.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/고지서 발송현황.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/고지서 발송현황.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/고지서 발송현황.svg");
+    --bs-active : url("../../../../../file/modifySvg/고지서 발송현황.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/고지서 발송현황.svg?modify=alert");
 }
 
 .svg-opn-rcp:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/접수.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/접수.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/접수.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/접수.svg");
+    --bs-active : url("../../../../../file/modifySvg/접수.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/접수.svg?modify=alert");
 }
 
 .svg-opn-decision:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/수용_미수용.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/수용_미수용.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/수용_미수용.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/수용_미수용.svg");
+    --bs-active : url("../../../../../file/modifySvg/수용_미수용.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/수용_미수용.svg?modify=alert");
 }
 
 .svg-opn-selfdrop:before {
-    --bs-origin : url("../../../../../resources/image/fims/framework/자진취하.svg");
-    --bs-active : url("../../../../../file/modifySvg/fims/framework/자진취하.svg?modify=active");
-    --bs-alert : url("../../../../../file/modifySvg/fims/framework/자진취하.svg?modify=alert");
+    --bs-origin : url("../../../../../file/modifySvg/자진취하.svg");
+    --bs-active : url("../../../../../file/modifySvg/자진취하.svg?modify=active");
+    --bs-alert : url("../../../../../file/modifySvg/자진취하.svg?modify=alert");
 }
 
 [class^=svg-]:before {

From f9d32847a522253a0f5b806784a263843cb42181 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 31 Jul 2023 10:54:39 +0900
Subject: [PATCH 03/20] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=8E=B8?=
 =?UTF-8?q?=EC=A7=91=20=EC=88=98=EC=A0=95=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/crdn/crdn01020-info.jsp  |  96 ++++---
 .../WEB-INF/jsp/fims/sprt/sprt03020-main.jsp  | 121 +++++++-
 .../fims/biz/paintweb/es6-promise.auto.min.js |   1 -
 .../lib/fims/biz/paintweb/es6-promise.min.js  |   1 -
 .../paintweb/interfaces/default/layout.xhtml  |  13 +-
 .../biz/paintweb/interfaces/default/script.js |   1 +
 .../lib/fims/biz/paintweb/lang/en.json        | 268 ------------------
 .../fims/biz/paintweb/lang/{ko.json => ko.js} |  13 +-
 ...aintweb-config.json => paintweb-config.js} |  53 ++--
 .../lib/fims/biz/paintweb/paintweb.js         |  87 ++----
 10 files changed, 222 insertions(+), 432 deletions(-)
 delete mode 100644 src/main/webapp/resources/lib/fims/biz/paintweb/es6-promise.auto.min.js
 delete mode 100644 src/main/webapp/resources/lib/fims/biz/paintweb/es6-promise.min.js
 delete mode 100644 src/main/webapp/resources/lib/fims/biz/paintweb/lang/en.json
 rename src/main/webapp/resources/lib/fims/biz/paintweb/lang/{ko.json => ko.js} (98%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{paintweb-config.json => paintweb-config.js} (92%)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
index a67b8443..cc6b47be 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
 
 <div class="d-flex flex-row justify-content-evenly">
-	<div class="card" style="max-width:1100px;" title="민원접수 초기자료 편집">
+	<div class="card" style="max-width:1000px;" title="민원접수 초기자료 편집">
 		<form id="frmEdit--${pageName}">
 			<input id="crdnId--${pageName}" name="crdnId" type="hidden" data-map="CRDN_ID" />
 			<input id="taskSeCd--${pageName}" name="taskSeCd" type="hidden" value="${taskSeCd}" />
@@ -10,7 +10,7 @@
 				<div class="col-md-12" slot="edit">
 					<template class="pvs bpv">
 						<slot>
-							<label for="crdnSeCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">단속구분</label>
+							<label for="crdnSeCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">단속구분</label>
 							<select id="crdnSeCd--${pageName}" name="crdnSeCd" data-map="CRDN_SE_CD" class="form-select">
 								<c:forEach items="${FIM002List}" var="item">
 									<option value="${item.code}">${item.value}</option>
@@ -20,7 +20,7 @@
 					</template>
 				</div>
 				<div class="col-md-4">
-					<label for="crdnYmd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end required">
+					<label for="crdnYmd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end required">
 						위반일자
 					</label>
 					<input type="text" id="crdnYmd--${pageName}" name="crdnYmd" data-map="CRDN_YMD"
@@ -28,7 +28,7 @@
 		            <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 				</div>
 				<div class="col-md-4">
-					<label for="crdnTm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end required">
+					<label for="crdnTm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end required">
 						위반시간
 					</label>
 		            <input type="text" id="crdnTm--${pageName}" name="crdnTm" data-map="CRDN_TM"
@@ -36,14 +36,14 @@
 		            	placeholder="시:분:초" />
 				</div>
 				<div class="col-md-4">
-					<label for="vhrno--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end required">
+					<label for="vhrno--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end required">
 						차량번호
 					</label>
 					<input type="text" id="vhrno--${pageName}" name="vhrno" data-map="VHRNO" class="form-control" 
 						data-maxlengthb="30" required />
 				</div>
 				<div class="col-md-6">
-					<label for="vltnCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">
+					<label for="vltnCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">
 						위반내용
 					</label>
 					<select id="vltnCd--${pageName}" name="vltnCd" class="form-select" data-map="VLTN_CD">
@@ -53,26 +53,26 @@
 					</select>
 				</div>
 				<div class="col-md-6 select2-primary">
-					<label for="crdnStdgNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">법정동</label>
+					<label for="crdnStdgNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">법정동</label>
 					<input type="text" id="crdnStdgNm--${pageName}" name="crdnStdgNm" data-map="CRDN_STDG_NM" class="form-control" readonly/>
 					<button type="button" class="btn btn-sm btn-outline-dark" onclick="">검색</button>
 				</div>
 				<div class="col-md-4">
-					<label for="crdnPlc--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">위반장소</label>
+					<label for="crdnPlc--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">위반장소</label>
 					<input type="text" id="crdnPlc--${pageName}" name="crdnPlc" data-map="CRDN_PLC" class="form-control" 
 						data-maxlengthb="200" />
 				</div>
 				<div class="col-md-8" slot="edit">
 					<template class="bpv">
 						<slot>
-							<label for="dtlCrdnPlc--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">상세위반장소</label>
+							<label for="dtlCrdnPlc--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">상세위반장소</label>
 							<input type="text" id="dtlCrdnPlc--${pageName}" name="dtlCrdnPlc" data-map="DTL_CRDN_PLC" class="form-control" 
 								data-maxlenghb="200" />
 						</slot>
 					</template>
 					<template class="pvs">
 						<slot>
-							<label for="crdnSpareaCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">특별구역</label>
+							<label for="crdnSpareaCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">특별구역</label>
 							<select id="crdnSpareaCd--${pageName}" name="crdnSpareaCd" data-map="CRDN_SPAREA_CD" class="form-select">
 								<c:forEach items="${FIM007List}" var="item">
 									<option value="${item.code}">${item.value}</option>
@@ -82,45 +82,45 @@
 					</template>
 				</div>
 				<div class="col-md-6">
-					<label for="cvlcptAplcntNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">신고자</label>
+					<label for="cvlcptAplcntNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">신고자</label>
 					<input type="text" id="cvlcptAplcntNm--${pageName}" name="cvlcptAplcntNm" data-map="CVLCPT_APLCNT_NM" 
 						class="form-control" />
 				</div>
 				<div class="col-md-6">
-					<label for="cvlcptPrcsPicNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">담당자</label>
+					<label for="cvlcptPrcsPicNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">담당자</label>
 					<input type="text" id="cvlcptPrcsPicNm--${pageName}" name="cvlcptPrcsPicNm" data-map="CVLCPT_PRCS_PIC_NM" 
 						class="form-control" />
 				</div>
 				<div class="col-md-12">
-					<label for="cvlcptAplyCn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end align-top"
+					<label for="cvlcptAplyCn--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end align-top"
 					>신고내용</label>
 					<textarea type="text" id="cvlcptAplyCn--${pageName}" name="cvlcptAplyCn" data-map="CVLCPT_APLY_CN" 
 						class="form-control" cols="100%" rows="4"
 					></textarea>
 				</div>
 				<div class="col-md-6">
-					<label for="cvlcptRcptYmd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">접수일</label>
+					<label for="cvlcptRcptYmd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">접수일</label>
 					<input type="text" id="cvlcptRcptYmd--${pageName}" name="cvlcptRcptYmd" data-map="CVLCPT_RCPT_YMD" 
 						class="form-control form-date" data-fmt-type="day" maxlength="10" disabled />
 				</div>
 				<div class="col-md-6">
 					<label for="cvldptPrcsPrnmntDt--${pageName}" 
-						class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">답변기한</label>
+						class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">답변기한</label>
 					<input type="text" id="cvldptPrcsPrnmntDt--${pageName}" name="cvldptPrcsPrnmntDt" data-map="CVLCPT_PRCS_PRNMNT_DT" 
 						class="form-control form-date" data-fmt-type="day" maxlength="10" disabled />
 				</div>
 				<div class="col-md-12">
-					<label for="etcCn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">특기사항</label>
+					<label for="etcCn--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">특기사항</label>
 					<input type="text" id="etcCn--${pageName}" name="etcCn" data-map="ETC_CN" class="form-control" 
 						data-maxlengthb="1000" />
 				</div>
 				<div class="col-md-4">
-					<label for="rtpyrNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">소유자</label>
+					<label for="rtpyrNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">소유자</label>
 					<input type="text" id="rtpyrNm--${pageName}" name="rtpyrNm" data-map="RTPYR_NM" class="form-control" 
 						/>
 				</div>
 				<div class="col-md-4">
-					<label for="rtpyrSeCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">주민번호구분</label>
+					<label for="rtpyrSeCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">주민번호구분</label>
 					<select id="rtpyrSeCd--${pageName}" name="rtpyrSeCd" data-map="RTPYR_SE_CD" class="form-select">
 						<c:forEach items="${FIM011List}" var="item">
 							<option value="${item.code}">${item.value}</option>
@@ -128,22 +128,22 @@
 					</select>
 				</div>
 				<div class="col-md-4">
-					<label for="rtpyrNo--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">주민번호</label>
+					<label for="rtpyrNo--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">주민번호</label>
 					<input type="text" id="rtpyrNo--${pageName}" name="rtpyrNo" data-map="RTPYR_NO" class="form-control privacy" />
 					<input type="text" id="mask-rtpyrNo--${pageName}" class="form-control privacy-mask" disabled value="******"/>
 				</div>
 				<div class="col-md-12">
-					<label for="addr--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">주소</label>
+					<label for="addr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">주소</label>
 					<input type="text" id="addr--${pageName}" name="addr" data-map="ADDR" class="form-control w-px-700" 
 						data-maxlengthb="320" />
 				</div>
 				<div class="col-md-12">
-					<label for="dtlAddr--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">상세주소</label>
+					<label for="dtlAddr--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">상세주소</label>
 					<input type="text" id="dtlAddr--${pageName}" name="dtlAddr" data-map="DTL_ADDR" class="form-control w-px-700" 
 						data-maxlengthb="200" />
 				</div>
 				<div class="col-md-6">
-					<label for="zip--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">우편번호</label>
+					<label for="zip--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">우편번호</label>
 					<input type="text" id="zip--${pageName}" name="zip" data-map="ZIP" class="form-control w-px-100" 
 						maxlength="7" pattern="(\d{3}-\d{3}|\d{6}|\d{5})" />
 					<button type="button" class="btn btn-sm btn-outline-dark" onclick="">검색</button>
@@ -152,36 +152,36 @@
 
 				</div>
 				<div class="col-md-4">
-					<label for="vin--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차대번호</label>
+					<label for="vin--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">차대번호</label>
 					<input type="text" id="vin--${pageName}" name="vin" data-map="VIN" class="form-control" readonly 
 						placeholder="입력항목이 아닙니다." />
 				</div>
 				<div class="col-md-4" slot="edit">
 					<template class="pvs bpv">
 						<slot>
-							<label class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차량구분</label>
+							<label class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">차량구분</label>
 						</slot>
 					</template>
 				</div>
 				<div class="col-md-4" slot="edit">
 					<template class="pvs bpv">
 						<slot>
-							<label class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차종</label>
+							<label class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">차종</label>
 						</slot>
 					</template>
 				</div>
 				<div class="col-md-4">
-					<label for="vhclNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차량명칭</label>
+					<label for="vhclNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">차량명칭</label>
 					<input type="text" id="vhclNm--${pageName}" name="vhclNm" data-map="VHCL_NM" class="form-control" readonly 
 						placeholder="입력항목이 아닙니다." />
 				</div>
 				<div class="col-md-4">
-					<label for="vhclColor--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차량색상</label>
+					<label for="vhclColor--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">차량색상</label>
 					<input type="text" id="vhclColor--${pageName}" name="vhclColor" data-map="VHCL_COLOR" class="form-control" readonly 
 						placeholder="입력항목이 아닙니다." />
 				</div>
 				<div class="col-md-4">
-					<label for="useFuelCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">연료구분</label>
+					<label for="useFuelCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">연료구분</label>
 					<select id="useFuelCd--${pageName}" name="useFuelCd" data-map="USE_FUEL_CD" class="form-select" disabled>
 						<c:forEach items="${LVS005List}" var="item">
 							<option value=""></option>
@@ -192,7 +192,7 @@
 				<div class="col-md-4" slot="edit">
 					<template class="dpv eca pvs">
 						<slot>
-							<label for="towngYn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">견인지시</label>
+							<label for="towngYn--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">견인지시</label>
 							<select id="towngYn--${pageName}" name="towngYn" class="form-select" data-map="TOWNG_YN">
 								<c:forEach items="${FIM053List}" var="item">
 									<option value="${item.code}">${item.value}</option>
@@ -204,7 +204,7 @@
 				<div class="col-md-4" slot="edit">
 					<template class="dpv eca pvs">
 						<slot>
-							<label for="crdnSn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">스티커번호</label>
+							<label for="crdnSn--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">스티커번호</label>
 							<input type="text" id="crdnSn--${pageName}" name="crdnSn" data-map="CRDN_SN" class="form-control" 
 								maxlength="20" data-maxlengthb="20" />
 						</slot>
@@ -213,7 +213,7 @@
 				<div class="col-md-4" slot="edit">
 					<template class="dpv">
 						<slot>
-							<label for="parkngPsbltyRsltCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">장애차량확인</label>
+							<label for="parkngPsbltyRsltCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">장애차량확인</label>
 							<select id="parkngPsbltyRsltCd--${pageName}" name="parkngPsbltyRsltCd" data-map="PARKNG_PSBLTY_RSLT_CD" class="form-select">
 								<c:forEach items="${FIM034List}" var="item">
 									<option value="${item.code}">${item.value}</option>
@@ -225,7 +225,7 @@
 				<div class="col-md-12" slot="edit">
 					<template class="pvs bpv">
 						<slot>
-							<label for="teamNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">단속조</label>
+							<label for="teamNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">단속조</label>
 							<select id="teamNm--${pageName}" name="teamNm" data-map="TEAM_NM" class="form-select">
 							</select>
 						</slot>
@@ -234,7 +234,7 @@
 				<div class="col-md-12" slot="edit">
 					<template class="pvs bpv">
 						<slot>
-							<label class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">단속원</label>
+							<label class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">단속원</label>
 							<input type="text" id="teamer1--${pageName}" name="teamer1" data-map="TEAMER_1" class="form-control" />
 							<input type="text" id="teamer2--${pageName}" name="teamer2" data-map="TEAMER_2" class="form-control" />
 							<input type="text" id="teamer3--${pageName}" name="teamer3" data-map="TEAMER_3" class="form-control" />
@@ -261,17 +261,28 @@
 			
 		</form>
 	</div>
-	<div class="card" style="width:400px;">
-		<form id="frmFile--${pageName}" class="dpv eca" method="post" enctype="multipart/form-data">
-			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple accept="image/*" hidden />
-		</form>
+	<div class="card" style="width:500px;">
+		
 		<div class="col-md-12 d-flex justify-content-between">
 			<div class="fs-4 fw-bold">등록된 사진</div>
-			<button type="button" id="btnEditPhoto--${pageName}" class="btn btn-blue">선택 사진 편집</button>
+			<div>
+				<button type="button" id="btnDeleteExistPhoto--${pageName}" class="btn btn-blue">선택 사진 삭제</button>
+				<button type="button" id="btnEditPhoto--${pageName}" class="btn btn-blue">선택 사진 편집</button>
+			</div>
 		</div>
 		<div id="display3--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
 		</div>
 		
+		<div class="col-md-12 d-flex justify-content-between">
+			<div class="fs-4 fw-bold">추가한 사진(번호판)</div>
+			<button type="button" id="btnNumberPlateDelete--${pageName}" class="btn btn-blue">취소</button>
+		</div>
+		<div id="display4--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">	
+		</div>
+		
+		<form id="frmFile--${pageName}" class="dpv eca" method="post" enctype="multipart/form-data">
+			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple accept="image/*" hidden />
+		</form>
 		<div class="col-md-12 d-flex justify-content-between">
 			<div class="fs-4 fw-bold">추가한 사진</div>
 			<button type="button" id="btnAddFile--${pageName}" class="btn btn-blue">사진 추가</button>
@@ -439,7 +450,7 @@ $(document).ready(function(){
 		
 		window.open(wctx.url("/sprt/sprt03/020/main.do?openerPageName=${pageName}&fileId="+fileId)
 				,"editPhoto"
-				,"width=1800,height=950"
+				,"width=1400,height=750"
 		);
 	});
 	
@@ -495,7 +506,7 @@ $(document).ready(function(){
 		var editPhotoArea = "";
 		
 		crdnInfo.fileList.forEach(function(item, index){
-			editPhotoArea += "<label>"
+			editPhotoArea += "<label class='mx-2'>"
 			editPhotoArea += "<input type='radio' name='editTarget' class='form-check-input' value='"+item.FILE_ID +"' ";
 			if(index == 0){
 				editPhotoArea += " checked='checked' ";
@@ -503,7 +514,10 @@ $(document).ready(function(){
 			editPhotoArea += " />";
 			editPhotoArea += "<img src='"+ item.URL +"' width='200' height='200' />";
 			editPhotoArea += "</label>";
-			editPhotoArea += "<br />";
+			
+			if(index % 2 == 1){
+				editPhotoArea += "<br />"
+			}
 		});
 		
 		$("#display3--${pageName}").append(editPhotoArea);
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
index 60ed5c4c..a1cddf2a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
@@ -41,11 +41,11 @@
 
 </head>
 <body>
-
 <c:set var="pageKorName" scope="request">사진 편집</c:set>
-<div>
-	<img id="photo" src="" />
-</div>
+
+<img id="editableImage" />
+<div id="paintWebTarget"></div>
+   
 
 <script src="<c:url value="/resources/3rd-party/sneat/js/helpers.js"/>"></script>
 <script src="<c:url value="/resources/3rd-party/sneat/libs/jquery/jquery.js"/>"></script>
@@ -60,23 +60,114 @@
 <script src="<c:url value="/resources/3rd-party/jstree/jstree-support.js"/>"></script>
 <script src="<c:url value='/resources/3rd-party/sneat/js/config.js'/>"></script>
 <script src="<c:url value='/resources/3rd-party/sneat/libs/chartjs/chartjs.js'/>"></script>
+
+
+<script src="<c:url value='/resources/lib/fims/biz/paintweb/lang/ko.js'/>?${ver}"></script>
+<script src="<c:url value='/resources/lib/fims/biz/paintweb/paintweb-config.js'/>?${ver}"></script>
+<script src="<c:url value='/resources/lib/fims/biz/paintweb/paintweb.js'/>?${ver}"></script>
+<script src="<c:url value='/resources/lib/fims/biz/paintweb/html2canvas.min.js'/>?${ver}"></script>
+
+
+
 <script>
 
-$(document).ready(function(){
+    //FIXME: pw instance 변수명 변경시 paintweb.js의 imageSaveTo() 내의 2564 line if(pw.image.modified) 변경 필요
+    var pw;
+    var originalInfomation = {};
+    let editableImage = null;
+
+    const initEditor = () => {
+    	
+        pw = new PaintWeb();
+        pw.config.imageLoad = editableImage;
+        pw.config.guiPlaceholder = document.getElementById('paintWebTarget');
+        pw.config.configFile = 'paintweb-config.json?${ver}';
+        pw.config.imageSave = fnImageSaveTo;
+        pw.config.afterImageSave = fnAfterImageSave;
 
-	var fileInfo = [${fileInfo}];
-	
-	if(fileInfo.length > 0){
-		var fileUrl = fileInfo[0].URL;
+        pw.init();
+    };
+    
+    function fnImageSaveTo(file, imgWidth, imgHeight, doc, _self){
+    	
+    	console.log(doc);
+    	console.log(_self);
+    	
+        const isDelete = imgWidth === 0;
+        
+        if(isDelete){
+            if(!confirm('단속이미지를 정말로 삭제 하시겠습니까?'))  return;
+        }else{
+            if(!confirm('편집한 단속이미지를 저장하시겠습니까?'))  return;
+        }
 
-		$("#photo").attr("src", "${pageContext.request.contextPath}" + "/" + fileUrl);
-					
-	} else {
-		alert("사진 파일이 없습니다.");
-	}
+        //
+ 
+        // var param = originalInfomation 파일아이디,단속아이디,inpoType..
 
-});
+        // 삭제일때
+        if(isDelete){
+            
 
+            //cmmAjax({
+            //    url: '/somePath/removeFile.do',
+            //    data: $.param(param),
+            //    success: (res) => {
+            //        window.opener.callbackReloadImage();
+            //        window.close();
+            //    }
+            //})
+            return true;
+        }
+
+        // 저장일때
+        const formData = new FormData();
+        //formData.append('fileId', fileId);
+        //formData.append('file', file);
+
+        //cmmAjax({
+        //    type: 'post',
+        //    url: '/somePath/save.do',
+        //    processData: false,
+        //    contentType: false,
+        //    data: formData,
+        //    success: (res) => {
+        //        window.opener.callbackReloadImage();
+        //        window.close();
+        //    }
+        //});
+        return true;
+    };
+
+    function fnAfterImageSave(){
+    	console.log('after...');
+        window.close();
+    };
+
+    $(document).ready(function(){
+
+    	var fileInfo = [${fileInfo}];
+    	
+    	if(fileInfo.length > 0){
+    		originalInfomation = fileInfo[0];
+    		
+    		var fileUrl = fileInfo[0].URL;
+    		var fullSrc = "${pageContext.request.contextPath}" + "/" + fileUrl;
+ 		
+    		editableImage = document.getElementById('editableImage');
+    		editableImage.src = fullSrc;
+    		editableImage.onload = function () {
+                initEditor();
+                editableImage.style.display = 'none';
+            }
+            
+            
+    	} else {
+    		alert("사진 파일이 없습니다.");
+    	}
+
+    });
 </script>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/es6-promise.auto.min.js b/src/main/webapp/resources/lib/fims/biz/paintweb/es6-promise.auto.min.js
deleted file mode 100644
index fdf8bff2..00000000
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/es6-promise.auto.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.ES6Promise=e()}(this,function(){"use strict";function t(t){var e=typeof t;return null!==t&&("object"===e||"function"===e)}function e(t){return"function"==typeof t}function n(t){B=t}function r(t){G=t}function o(){return function(){return process.nextTick(a)}}function i(){return"undefined"!=typeof z?function(){z(a)}:c()}function s(){var t=0,e=new J(a),n=document.createTextNode("");return e.observe(n,{characterData:!0}),function(){n.data=t=++t%2}}function u(){var t=new MessageChannel;return t.port1.onmessage=a,function(){return t.port2.postMessage(0)}}function c(){var t=setTimeout;return function(){return t(a,1)}}function a(){for(var t=0;t<W;t+=2){var e=V[t],n=V[t+1];e(n),V[t]=void 0,V[t+1]=void 0}W=0}function f(){try{var t=Function("return this")().require("vertx");return z=t.runOnLoop||t.runOnContext,i()}catch(e){return c()}}function l(t,e){var n=this,r=new this.constructor(p);void 0===r[Z]&&O(r);var o=n._state;if(o){var i=arguments[o-1];G(function(){return P(o,r,i,n._result)})}else E(n,r,t,e);return r}function h(t){var e=this;if(t&&"object"==typeof t&&t.constructor===e)return t;var n=new e(p);return g(n,t),n}function p(){}function v(){return new TypeError("You cannot resolve a promise with itself")}function d(){return new TypeError("A promises callback cannot return that same promise.")}function _(t){try{return t.then}catch(e){return nt.error=e,nt}}function y(t,e,n,r){try{t.call(e,n,r)}catch(o){return o}}function m(t,e,n){G(function(t){var r=!1,o=y(n,e,function(n){r||(r=!0,e!==n?g(t,n):S(t,n))},function(e){r||(r=!0,j(t,e))},"Settle: "+(t._label||" unknown promise"));!r&&o&&(r=!0,j(t,o))},t)}function b(t,e){e._state===tt?S(t,e._result):e._state===et?j(t,e._result):E(e,void 0,function(e){return g(t,e)},function(e){return j(t,e)})}function w(t,n,r){n.constructor===t.constructor&&r===l&&n.constructor.resolve===h?b(t,n):r===nt?(j(t,nt.error),nt.error=null):void 0===r?S(t,n):e(r)?m(t,n,r):S(t,n)}function g(e,n){e===n?j(e,v()):t(n)?w(e,n,_(n)):S(e,n)}function A(t){t._onerror&&t._onerror(t._result),T(t)}function S(t,e){t._state===$&&(t._result=e,t._state=tt,0!==t._subscribers.length&&G(T,t))}function j(t,e){t._state===$&&(t._state=et,t._result=e,G(A,t))}function E(t,e,n,r){var o=t._subscribers,i=o.length;t._onerror=null,o[i]=e,o[i+tt]=n,o[i+et]=r,0===i&&t._state&&G(T,t)}function T(t){var e=t._subscribers,n=t._state;if(0!==e.length){for(var r=void 0,o=void 0,i=t._result,s=0;s<e.length;s+=3)r=e[s],o=e[s+n],r?P(n,r,o,i):o(i);t._subscribers.length=0}}function M(t,e){try{return t(e)}catch(n){return nt.error=n,nt}}function P(t,n,r,o){var i=e(r),s=void 0,u=void 0,c=void 0,a=void 0;if(i){if(s=M(r,o),s===nt?(a=!0,u=s.error,s.error=null):c=!0,n===s)return void j(n,d())}else s=o,c=!0;n._state!==$||(i&&c?g(n,s):a?j(n,u):t===tt?S(n,s):t===et&&j(n,s))}function x(t,e){try{e(function(e){g(t,e)},function(e){j(t,e)})}catch(n){j(t,n)}}function C(){return rt++}function O(t){t[Z]=rt++,t._state=void 0,t._result=void 0,t._subscribers=[]}function k(){return new Error("Array Methods must be provided an Array")}function F(t){return new ot(this,t).promise}function Y(t){var e=this;return new e(U(t)?function(n,r){for(var o=t.length,i=0;i<o;i++)e.resolve(t[i]).then(n,r)}:function(t,e){return e(new TypeError("You must pass an array to race."))})}function q(t){var e=this,n=new e(p);return j(n,t),n}function D(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}function K(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}function L(){var t=void 0;if("undefined"!=typeof global)t=global;else if("undefined"!=typeof self)t=self;else try{t=Function("return this")()}catch(e){throw new Error("polyfill failed because global object is unavailable in this environment")}var n=t.Promise;if(n){var r=null;try{r=Object.prototype.toString.call(n.resolve())}catch(e){}if("[object Promise]"===r&&!n.cast)return}t.Promise=it}var N=void 0;N=Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)};var U=N,W=0,z=void 0,B=void 0,G=function(t,e){V[W]=t,V[W+1]=e,W+=2,2===W&&(B?B(a):X())},H="undefined"!=typeof window?window:void 0,I=H||{},J=I.MutationObserver||I.WebKitMutationObserver,Q="undefined"==typeof self&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),R="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,V=new Array(1e3),X=void 0;X=Q?o():J?s():R?u():void 0===H&&"function"==typeof require?f():c();var Z=Math.random().toString(36).substring(2),$=void 0,tt=1,et=2,nt={error:null},rt=0,ot=function(){function t(t,e){this._instanceConstructor=t,this.promise=new t(p),this.promise[Z]||O(this.promise),U(e)?(this.length=e.length,this._remaining=e.length,this._result=new Array(this.length),0===this.length?S(this.promise,this._result):(this.length=this.length||0,this._enumerate(e),0===this._remaining&&S(this.promise,this._result))):j(this.promise,k())}return t.prototype._enumerate=function(t){for(var e=0;this._state===$&&e<t.length;e++)this._eachEntry(t[e],e)},t.prototype._eachEntry=function(t,e){var n=this._instanceConstructor,r=n.resolve;if(r===h){var o=_(t);if(o===l&&t._state!==$)this._settledAt(t._state,e,t._result);else if("function"!=typeof o)this._remaining--,this._result[e]=t;else if(n===it){var i=new n(p);w(i,t,o),this._willSettleAt(i,e)}else this._willSettleAt(new n(function(e){return e(t)}),e)}else this._willSettleAt(r(t),e)},t.prototype._settledAt=function(t,e,n){var r=this.promise;r._state===$&&(this._remaining--,t===et?j(r,n):this._result[e]=n),0===this._remaining&&S(r,this._result)},t.prototype._willSettleAt=function(t,e){var n=this;E(t,void 0,function(t){return n._settledAt(tt,e,t)},function(t){return n._settledAt(et,e,t)})},t}(),it=function(){function t(e){this[Z]=C(),this._result=this._state=void 0,this._subscribers=[],p!==e&&("function"!=typeof e&&D(),this instanceof t?x(this,e):K())}return t.prototype["catch"]=function(t){return this.then(null,t)},t.prototype["finally"]=function(t){var e=this,n=e.constructor;return e.then(function(e){return n.resolve(t()).then(function(){return e})},function(e){return n.resolve(t()).then(function(){throw e})})},t}();return it.prototype.then=l,it.all=F,it.race=Y,it.resolve=h,it.reject=q,it._setScheduler=n,it._setAsap=r,it._asap=G,it.polyfill=L,it.Promise=it,it.polyfill(),it});
\ No newline at end of file
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/es6-promise.min.js b/src/main/webapp/resources/lib/fims/biz/paintweb/es6-promise.min.js
deleted file mode 100644
index 1d9dc487..00000000
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/es6-promise.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.ES6Promise=e()}(this,function(){"use strict";function t(t){var e=typeof t;return null!==t&&("object"===e||"function"===e)}function e(t){return"function"==typeof t}function n(t){B=t}function r(t){G=t}function o(){return function(){return process.nextTick(a)}}function i(){return"undefined"!=typeof z?function(){z(a)}:c()}function s(){var t=0,e=new J(a),n=document.createTextNode("");return e.observe(n,{characterData:!0}),function(){n.data=t=++t%2}}function u(){var t=new MessageChannel;return t.port1.onmessage=a,function(){return t.port2.postMessage(0)}}function c(){var t=setTimeout;return function(){return t(a,1)}}function a(){for(var t=0;t<W;t+=2){var e=V[t],n=V[t+1];e(n),V[t]=void 0,V[t+1]=void 0}W=0}function f(){try{var t=Function("return this")().require("vertx");return z=t.runOnLoop||t.runOnContext,i()}catch(e){return c()}}function l(t,e){var n=this,r=new this.constructor(p);void 0===r[Z]&&O(r);var o=n._state;if(o){var i=arguments[o-1];G(function(){return P(o,r,i,n._result)})}else E(n,r,t,e);return r}function h(t){var e=this;if(t&&"object"==typeof t&&t.constructor===e)return t;var n=new e(p);return g(n,t),n}function p(){}function v(){return new TypeError("You cannot resolve a promise with itself")}function d(){return new TypeError("A promises callback cannot return that same promise.")}function _(t){try{return t.then}catch(e){return nt.error=e,nt}}function y(t,e,n,r){try{t.call(e,n,r)}catch(o){return o}}function m(t,e,n){G(function(t){var r=!1,o=y(n,e,function(n){r||(r=!0,e!==n?g(t,n):S(t,n))},function(e){r||(r=!0,j(t,e))},"Settle: "+(t._label||" unknown promise"));!r&&o&&(r=!0,j(t,o))},t)}function b(t,e){e._state===tt?S(t,e._result):e._state===et?j(t,e._result):E(e,void 0,function(e){return g(t,e)},function(e){return j(t,e)})}function w(t,n,r){n.constructor===t.constructor&&r===l&&n.constructor.resolve===h?b(t,n):r===nt?(j(t,nt.error),nt.error=null):void 0===r?S(t,n):e(r)?m(t,n,r):S(t,n)}function g(e,n){e===n?j(e,v()):t(n)?w(e,n,_(n)):S(e,n)}function A(t){t._onerror&&t._onerror(t._result),T(t)}function S(t,e){t._state===$&&(t._result=e,t._state=tt,0!==t._subscribers.length&&G(T,t))}function j(t,e){t._state===$&&(t._state=et,t._result=e,G(A,t))}function E(t,e,n,r){var o=t._subscribers,i=o.length;t._onerror=null,o[i]=e,o[i+tt]=n,o[i+et]=r,0===i&&t._state&&G(T,t)}function T(t){var e=t._subscribers,n=t._state;if(0!==e.length){for(var r=void 0,o=void 0,i=t._result,s=0;s<e.length;s+=3)r=e[s],o=e[s+n],r?P(n,r,o,i):o(i);t._subscribers.length=0}}function M(t,e){try{return t(e)}catch(n){return nt.error=n,nt}}function P(t,n,r,o){var i=e(r),s=void 0,u=void 0,c=void 0,a=void 0;if(i){if(s=M(r,o),s===nt?(a=!0,u=s.error,s.error=null):c=!0,n===s)return void j(n,d())}else s=o,c=!0;n._state!==$||(i&&c?g(n,s):a?j(n,u):t===tt?S(n,s):t===et&&j(n,s))}function x(t,e){try{e(function(e){g(t,e)},function(e){j(t,e)})}catch(n){j(t,n)}}function C(){return rt++}function O(t){t[Z]=rt++,t._state=void 0,t._result=void 0,t._subscribers=[]}function k(){return new Error("Array Methods must be provided an Array")}function F(t){return new ot(this,t).promise}function Y(t){var e=this;return new e(U(t)?function(n,r){for(var o=t.length,i=0;i<o;i++)e.resolve(t[i]).then(n,r)}:function(t,e){return e(new TypeError("You must pass an array to race."))})}function q(t){var e=this,n=new e(p);return j(n,t),n}function D(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}function K(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}function L(){var t=void 0;if("undefined"!=typeof global)t=global;else if("undefined"!=typeof self)t=self;else try{t=Function("return this")()}catch(e){throw new Error("polyfill failed because global object is unavailable in this environment")}var n=t.Promise;if(n){var r=null;try{r=Object.prototype.toString.call(n.resolve())}catch(e){}if("[object Promise]"===r&&!n.cast)return}t.Promise=it}var N=void 0;N=Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)};var U=N,W=0,z=void 0,B=void 0,G=function(t,e){V[W]=t,V[W+1]=e,W+=2,2===W&&(B?B(a):X())},H="undefined"!=typeof window?window:void 0,I=H||{},J=I.MutationObserver||I.WebKitMutationObserver,Q="undefined"==typeof self&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),R="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,V=new Array(1e3),X=void 0;X=Q?o():J?s():R?u():void 0===H&&"function"==typeof require?f():c();var Z=Math.random().toString(36).substring(2),$=void 0,tt=1,et=2,nt={error:null},rt=0,ot=function(){function t(t,e){this._instanceConstructor=t,this.promise=new t(p),this.promise[Z]||O(this.promise),U(e)?(this.length=e.length,this._remaining=e.length,this._result=new Array(this.length),0===this.length?S(this.promise,this._result):(this.length=this.length||0,this._enumerate(e),0===this._remaining&&S(this.promise,this._result))):j(this.promise,k())}return t.prototype._enumerate=function(t){for(var e=0;this._state===$&&e<t.length;e++)this._eachEntry(t[e],e)},t.prototype._eachEntry=function(t,e){var n=this._instanceConstructor,r=n.resolve;if(r===h){var o=_(t);if(o===l&&t._state!==$)this._settledAt(t._state,e,t._result);else if("function"!=typeof o)this._remaining--,this._result[e]=t;else if(n===it){var i=new n(p);w(i,t,o),this._willSettleAt(i,e)}else this._willSettleAt(new n(function(e){return e(t)}),e)}else this._willSettleAt(r(t),e)},t.prototype._settledAt=function(t,e,n){var r=this.promise;r._state===$&&(this._remaining--,t===et?j(r,n):this._result[e]=n),0===this._remaining&&S(r,this._result)},t.prototype._willSettleAt=function(t,e){var n=this;E(t,void 0,function(t){return n._settledAt(tt,e,t)},function(t){return n._settledAt(et,e,t)})},t}(),it=function(){function t(e){this[Z]=C(),this._result=this._state=void 0,this._subscribers=[],p!==e&&("function"!=typeof e&&D(),this instanceof t?x(this,e):K())}return t.prototype["catch"]=function(t){return this.then(null,t)},t.prototype["finally"]=function(t){var e=this,n=e.constructor;return e.then(function(e){return n.resolve(t()).then(function(){return e})},function(e){return n.resolve(t()).then(function(){throw e})})},t}();return it.prototype.then=l,it.all=F,it.race=Y,it.resolve=h,it.reject=q,it._setScheduler=n,it._setAsap=r,it._asap=G,it.polyfill=L,it.Promise=it,it});
\ No newline at end of file
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/layout.xhtml b/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/layout.xhtml
index 3837df08..872ce4f4 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/layout.xhtml
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/layout.xhtml
@@ -29,16 +29,17 @@
 
         <li data-pwTool="selection">Selection</li>
         <!--<li data-pwTool="hand">Hand</li>-->
-        <li data-pwTool="rectangle">Rectangle</li>
+        <!-- <li data-pwTool="rectangle">Rectangle</li> -->
 
         <li class="paintweb_toolSeparator">&#160;</li>
 
         <!--<li data-pwCommand="selectionCut">Cut selection</li>-->
-        <!--<li data-pwCommand="selectionCopy">Copy selection</li>-->
+        <li data-pwCommand="selectionCrop">자르기</li>
+        <li data-pwCommand="selectionFill">가림막</li>
+        <li data-pwCommand="selectionCopy">번호판</li>
         <!--<li data-pwCommand="clipboardPaste">Clipboard paste</li>-->
-        <li data-pwCommand="selectionCrop">Crop selection</li>
-        <li data-pwCommand="selectionFill">Fill selection</li>
         <!--<li data-pwTool="insertimg">Insert image</li>-->
+        <!-- 
         <li class="paintweb_strokeFillStyles">
           <p class="paintweb_opt_fillStyle">Fill
             <span data-pwColorInput="fillStyle">&#160;</span>
@@ -47,7 +48,7 @@
             <span data-pwColorInput="strokeStyle">&#160;</span>
           </p>
         </li>
-
+ 		-->
         <li class="paintweb_toolSeparator">&#160;</li>
 
         <li data-pwCommand="imageRotate">Rotate image</li>
@@ -72,7 +73,7 @@
         <!--<li data-pwTool="pencil">Pencil</li>-->
 
         <!--<li data-pwTool="eraser">Eraser</li>-->
-        <li data-pwCommand="imageClear">Clear image</li>
+        <!-- <li data-pwCommand="imageClear">Clear image</li> -->
         <li data-pwCommand="imageSave">Save image</li>
 
       </ul>
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/script.js b/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/script.js
index cfa042c1..86050415 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/script.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/script.js
@@ -1413,6 +1413,7 @@ pwlib.gui = function (app) {
       button.type = "button";
       button.classList.add('btn');
       button.classList.add('blue');
+      button.classList.add('p-1');
       button.appendChild(doc.createTextNode(button.title));
 
       if (elem.firstChild) {
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/lang/en.json b/src/main/webapp/resources/lib/fims/biz/paintweb/lang/en.json
deleted file mode 100644
index fd4d6c38..00000000
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/lang/en.json
+++ /dev/null
@@ -1,268 +0,0 @@
-{
-  // $Date: 2009-11-16 18:13:48 +0200 $
-
-  "errorInitBufferCanvas": "Error: adding the new buffer canvas element failed.",
-  "errorInitContext": "Error while initializing the canvas context.",
-  "errorElementNotFound": "Error: the following element was not found: {id}.",
-  "noComputedStyle": "Error: window.getComputedStyle is not available.",
-  "noXMLHttpRequest": "Error: window.XMLHttpRequest is not available.",
-  "errorInitCanvas": "Error: Canvas initialization failed.",
-  "noCanvasSupport": "Error: Your browser does not support Canvas.",
-  "failedConfigLoad": "Error: Failed loading the configuration.",
-  "failedLangLoad": "Error: Failed loading the language file.",
-  "failedMarkupLoad": "Error: Failed loading the interface markup file.",
-  "errorInitCommands": "Error: failed to initialize the PaintWeb commands!",
-  "noToolConfigured": "Error: you have no drawing tool configured to load!",
-  "imageLoadDifferentHost": "Warning: the configured image cannot be loaded because it is from a different domain.",
-  "toolRegisterFailed": "Error: failed to register tool '{id}'!",
-  "extensionRegisterFailed": "Error: failed to register extension '{id}'!",
-  "errorToolActivate": "Error: the tool you want could not be properly activated!",
-  "errorInitGUI": "Error: the interface failed to initialize!",
-  "failedSelectionCopy": "Error: failed to copy the selected pixels into memory.",
-  "noMainTabPanel": "Error: the interface layout has no tabbed panel with ID = main.",
-  "guiMarkupImportFailed": "Error: the interface markup code could not be imported into the main document.",
-  "guiMarkupParseFailed": "Error: the interface markup code could not be properly parsed.",
-  "missingViewport": "Error: the interface markup does not have the image viewport element.",
-  "missingViewportResizer": "Error: the interface markup does not have the image viewport resize handle.",
-  "missingCanvasResizer": "Error: the interface markup does not have the Canvas resize handle.",
-  "missingCanvasContainer": "Error: the interface markup does not have the Canvas container.",
-  "errorCpickerUnsupported": "Error: your browser does not implement the get/putImageData methods! The color picker tool cannot be used.",
-  "errorCbucketUnsupported": "Error: your browser does not implement the get/putImageData methods! The color bucket tool cannot be used.",
-  "errorClipboardUnsupported": "Error: your browser does not support get/putImageData! Clipboard operations like cut/copy/paste cannot be used.",
-  "errorTextUnsupported": "Error: your browser does not implement the Canvas Text API! The text tool cannot be used.",
-  "errorInsertimg": "The image could not be inserted. Maybe the address does not point to an image.",
-  "errorInsertimgHost": "The URL you provided points to a different host. The image cannot be added for security reasons.",
-  "errorInsertimgNotLoaded": "The image did not load yet, or the URL you provided does not point to an image.",
-  "promptInsertimg": "Type the address of the image you want to insert:",
-  "promptImageDimensions": "Please input the new image dimensions you want.",
-  "promptTextFont": "Type the name of the font you want:",
-  "errorImageSave": "The image cannot be saved!",
-
-  "guiCanvasResizer": "Resize the image canvas.",
-  "guiViewportResizer": "Resize the image viewport.",
-  "imageZoomTitle": "Zoom image (Use Up/Down Arrow key)",
-  "imageZoomLabel": "Zoom:",
-
-  "tabs": {
-    "main": {
-      "bcurve": "Bézier curve",
-      "ellipse": "Ellipse",
-      "eraser": "Eraser",
-      "line": "Line",
-      "main": "Main",
-      "pencil": "Pencil",
-      "polygon": "Polygon",
-      "rectangle": "Rectangle",
-      "selection": "Selection",
-      "shadow": "Shadow",
-      "text": "Text",
-      "textBorder": "Border"
-    },
-    "colormixer_inputs": {
-      "rgb": "RGB",
-      "rgbTitle": "sRGB: Standard Red, Green and Blue",
-      "hsv": "HSV",
-      "hsvTitle": "Hue, Saturation and Value",
-      "lab": "Lab",
-      "labTitle": "CIE Lab: Standard observer 2° D65",
-      "cmyk": "CMYK",
-      "cmykTitle": "Cyan, Magenta, Yellow and Key (Black)"
-    },
-    "colormixer_selector": {
-      "mixer": "Mixer",
-      "mixerTitle": "Color space visualisation",
-      "cpalettes": "Palettes",
-      "cpalettesTitle": "Predefined color palettes"
-    }
-  },
-
-  "floatingPanelMinimize": "Minimize",
-  "floatingPanelRestore": "Restore",
-  "floatingPanelClose": "Close",
-  "floatingPanels": {
-    "about": "About PaintWeb",
-    "colormixer": "Color mixer"
-  },
-
-  "tools": {
-    "cbucket": "Color bucket",
-    "cpicker": "Color picker",
-    "bcurve": "Bézier curve",
-    "hand": "Viewport drag",
-    "ellipse": "Ellipse",
-    "eraser": "Eraser",
-    "insertimg": "Insert image",
-    "line": "Line",
-    "pencil": "Pencil",
-    "polygon": "Polygon",
-    "rectangle": "Rectangle",
-    "selection": "Rectangle selection",
-    "text": "Text",
-    "textUnsupported": "The text tool is not supported by your browser."
-  },
-
-  "commands": {
-    "about": "About PaintWeb",
-    "clipboardPaste": "Paste clipboard",
-    "historyRedo": "Redo",
-    "historyUndo": "Undo",
-    "imageClear": "Clear image",
-    "imageSave": "Save image",
-    "imageRotate": "Rotate image",
-    "imageBright": "brighten image",
-    "imageDark": "darken image",
-    "selectionCopy": "Copy selection",
-    "selectionCrop": "Crop selection",
-    "selectionCut": "Cut selection",
-    "selectionDelete": "Delete selection",
-    "selectionFill": "Fill the selection"
-  },
-
-  "inputs": {
-    "line": {
-      "lineCap": "Line cap",
-      "lineCap_butt": "Butt",
-      "lineCap_round": "Round",
-      "lineCap_square": "Square",
-      "lineJoin": "Line join",
-      "lineJoin_bevel": "Bevel",
-      "lineJoin_miter": "Miter",
-      "lineJoin_round": "Round",
-      "lineWidth": "Line width:",
-      "miterLimit": "Miter limit:"
-    },
-    "shadow": {
-      "enable": "Enable shadows",
-      "enableTitle": "If checked, a shadow will render after each drawing operation you do.",
-      "shadowBlur": "Blur:",
-      "shadowOffsetX": "Distance X:",
-      "shadowOffsetY": "Distance Y:",
-      "shadowColor": "Color: ",
-      "shadowColorTitle": "Shadow color"
-    },
-    "selection": {
-      "transform": "Image manipulation",
-      "transformTitle": "If checked, the selected pixels will also be dragged/resized when you make changes to the selection. If unchecked, only the selection marquee will be dragged/resized - pixels will remain unaffected by any such changes.",
-      "transparent": "Transparent selection",
-      "transparentTitle": "If checked, the background will remain transparent. If unchecked, the background will be filled with the current fill color."
-    },
-    "text": {
-      "bold": "Bold",
-      "italic": "Italic",
-      "fontFamily": "Font family:",
-      "fontFamily_add": "Another font...",
-      "fontSize": "Font size:",
-      "textAlign": "Text alignment",
-      "left": "Left",
-      "center": "Center",
-      "right": "Right",
-      "textString_value": "Hello world!"
-    },
-    "shapeType": "Shape type",
-    "shapeType_both": "Both",
-    "shapeType_fill": "Fill",
-    "shapeType_stroke": "Stroke",
-    "pencilSize": "Pencil size:",
-    "eraserSize": "Eraser size:",
-    "borderWidth": "Border width:",
-    "fillStyle": "Fill ",
-    "fillStyleTitle": "Fill color",
-    "strokeStyle": "Stroke ",
-    "strokeStyleTitle": "Stroke color",
-    "colorInputAnchorContent": "Click to pick color"
-  },
-
-  "colormixer": {
-    "failedColorPaletteLoad": "Error: failed to load the color palette.",
-    "colorPalettes": {
-      "_saved": "Saved colors",
-      "anpa": "ANPA",
-      "dic": "DIC Color Guide",
-      "macos": "Mac OS",
-      "pantone-solid-coated": "PANTONE solid coated",
-      "toyo94": "TOYO 94 color finder",
-      "trumatch": "TRUMATCH colors",
-      "web": "Web safe",
-      "windows": "Windows"
-    },
-    "inputs": {
-      "hex": "Hex",
-      "alpha": "Alpha",
-      "hsv_hue": "Hue",
-      "hsv_sat": "Saturation",
-      "hsv_val": "Value",
-      "rgb_red": "Red",
-      "rgb_green": "Green",
-      "rgb_blue": "Blue",
-      "lab_cie_l": "Lightness",
-      "lab_cie_a": "a*",
-      "lab_cie_b": "b*",
-      "cmyk_cyan": "Cyan",
-      "cmyk_magenta": "Magenta",
-      "cmyk_yellow": "Yellow",
-      "cmyk_black": "Key / Black"
-    },
-    "buttons": {
-      "accept": "Accept",
-      "cancel": "Cancel",
-      "saveColor": "Save color",
-      "pickColor": "Pick color"
-    }
-  },
-
-  "status": {
-    "cbucketActive": "Click to start flood filling with the current fill color. Right click to use the stroke color for filling.",
-    "cpickerNormal": "Click to change the fill color, or Shift+Click to change the stroke color.",
-    "cpicker_fillStyle": "Click to pick the fill color.",
-    "cpicker_strokeStyle": "Click to pick the stroke color.",
-    "cpicker_shadow_shadowColor": "Click to pick the shadow color.",
-    "bcurveActive": "Click to start drawing the curve. You need four points: start, end and two control points.",
-    "bcurveControlPoint1": "Click to draw the first control point.",
-    "bcurveControlPoint2": "Click to draw the second control point. This will also end the drawing operation.",
-    "bcurveSnapping": "Hold the Shift key down for vertical/horizontal snapping.",
-    "handActive": "Click and drag the image to scroll.",
-    "ellipseActive": "Click and drag to draw an ellipse.",
-    "ellipseMousedown": "Hold the Shift key down to draw a circle.",
-    "eraserActive": "Click and drag to erase.",
-    "insertimgActive": "Waiting for the image to load...",
-    "insertimgLoaded": "Pick where you want to place the image. Click and drag to resize the image.",
-    "insertimgResize": "Hold the Shift key down to preserve the aspect ratio.",
-    "lineActive": "Click anywhere to start drawing a line.",
-    "lineMousedown": "Hold the Shift key down for vertical/horizontal snapping.",
-    "pencilActive": "Click and drag to draw.",
-    "polygonActive": "Click anywhere to start drawing a polygon.",
-    "polygonAddPoint": "Click to add another point to the polygon.",
-    "polygonEnd": "To end drawing the polygon simply click in the same place as the last point.",
-    "polygonMousedown": "Hold the Shift key down for vertical/horizontal snapping.",
-    "rectangleActive": "Click and drag to draw a rectangle.", 
-    "rectangleMousedown": "Hold the Shift key down to draw a square.",
-    "selectionActive": "Click and drag to draw a selection.",
-    "selectionAvailable": "Drag or resize the selection. Hold the Control key down to toggle the transformation mode.",
-    "selectionDrag": "Hold the Shift key down for vertical/horizontal snapping.",
-    "selectionDraw": "Hold the Shift key down to draw a square selection.",
-    "selectionResize": "Hold the Shift key down to preserve the aspect ratio.",
-    "textActive": "Pick where you want to place the text. Make sure you adjust the properties as desired.",
-    "guiCanvasResizerActive": "Move the mouse to resize the image canvas."
-  },
-
-  // Moodle-related language strings
-  "moodle": {
-    "xhrRequestFailed": "The image save request failed.",
-    "jsonParseFailed": "Parsing the JSON result from the server failed!",
-    "imageSaveFailed": "The image save operation failed.",
-    "urlMismatch": "Image address mismatch!\nThe current image is {url}.\nThe server replied a successful save for {urlServer}.",
-    "errorSubmitUnsaved": "This image is not saved!"
-  },
-  "moodleServer": {
-    "permissionDenied": "Permission denied.",
-    "saveEmptyDataUrl": "Your request has no data URL.",
-    "proxyNotFound": "Could not find the PaintWeb image file proxy script.",
-    "malformedDataUrl": "The data URL is malformed.",
-    "failedMkdir": "Failed to create the PaintWeb images folder inside the Moodle data folder.",
-    "saveFailed": "Saving the image failed.",
-    "backingupImages": "Backing-up images saved with PaintWeb...",
-    "backupFailed": "An error occurred while copying images saved by PaintWeb."
-  }
-
-  // vim:set spell spl=en fo=wan1croql tw=80 ts=2 sw=2 sts=2 sta et ai cin fenc=utf-8 ff=unix ft=javascript:
-}
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.json b/src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.js
similarity index 98%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.json
rename to src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.js
index 64d91d5e..6509a375 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.json
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.js
@@ -1,4 +1,4 @@
-{
+let lang_ko = {
   // $Date: 2009-11-16 18:13:48 +0200 $
 
   "errorInitBufferCanvas": "Error: adding the new buffer canvas element failed.",
@@ -111,11 +111,12 @@
     "imageRotate": "이미지 회전",
     "imageBright": "밝게",
     "imageDark": "어둡게",
-    "selectionCopy": "선택영역 복사",
-    "selectionCrop": "선택영역만 자르기",
+    
+    "selectionCrop": "자르기",
+    "selectionFill": "가림막",
+    "selectionCopy": "번호판",
     "selectionCut": "선택영역 잘라내기",
-    "selectionDelete": "선택영역 삭제",
-    "selectionFill": "선택영역 채우기"
+    "selectionDelete": "선택영역 삭제"
   },
 
   "inputs": {
@@ -265,4 +266,4 @@
   }
 
   // vim:set spell spl=en fo=wan1croql tw=80 ts=2 sw=2 sts=2 sta et ai cin fenc=utf-8 ff=unix ft=javascript:
-}
+};
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.json b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.js
similarity index 92%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.json
rename to src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.js
index 334d5eeb..b2979447 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.json
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.js
@@ -1,4 +1,4 @@
-{
+let paintweb_config = {
   // $Date: 2009-11-08 19:54:46 +0200 $
 
   "languages": {
@@ -119,7 +119,7 @@
    * @type CSS3Color-rgba functional notation
    * @default "rgba(0,0,0,1)"
    */
-  "fillStyle": "rgba(0,0,255,1)",
+  "fillStyle": "rgba(255,255,255,1)",
 
   /**
    * Default stroke style.
@@ -214,7 +214,7 @@
    */
   /*FIXME: 항목수정*/
   /*"tools": ["bcurve", "cbucket", "cpicker", "ellipse", "eraser", "hand", "insertimg", "line", "pencil", "polygon", "rectangle", "selection", "text"],*/
-  "tools": ["rectangle", "selection"],
+  "tools": ["selection"],
 
 
   /**
@@ -611,34 +611,35 @@
     "Control Z": { "command": "historyUndo" },
     "Control Y": { "command": "historyRedo" },
 
-    "Control N": { "command": "imageClear" },
-    "Control S": { "command": "imageSave" },
+    // "Control N": { "command": "imageClear" },
+    
 
-    "Control A":    { "command": "selectAll" },
-    "Control X":    { "command": "selectionCut" },
-    "Shift Delete": { "command": "selectionCut" },
-    "Control C":    { "command": "selectionCopy" },
-    "Control V":    { "command": "clipboardPaste" },
+    //"Control A":    { "command": "selectAll" },
+    //"Control X":    { "command": "selectionCut" },
+    //"Shift Delete": { "command": "selectionCut" },
+    //"Control C":    { "command": "selectionCopy" },
+    //"Control V":    { "command": "clipboardPaste" },
+	"Control S": { "command": "imageSave" }
 
     // Use "toolActivate": "id" to activate the tool with the given ID.
-    "C": { "toolActivate": "cpicker" },
-    "E": { "toolActivate": "ellipse" },
-    "F": { "toolActivate": "cbucket" },
-    "G": { "toolActivate": "polygon" },
-    "H": { "toolActivate": "hand" },
-    "I": { "toolActivate": "insertimg" },
-    "L": { "toolActivate": "line" },
-    "O": { "toolActivate": "eraser" },
-    "P": { "toolActivate": "pencil" },
-    "R": { "toolActivate": "rectangle" },
-    "S": { "toolActivate": "selection" },
-    "T": { "toolActivate": "text" },
-    "V": { "toolActivate": "bcurve" },
+    //"C": { "toolActivate": "cpicker" },
+    //"E": { "toolActivate": "ellipse" },
+    //"F": { "toolActivate": "cbucket" },
+    //"G": { "toolActivate": "polygon" },
+    //"H": { "toolActivate": "hand" },
+    //"I": { "toolActivate": "insertimg" },
+    //"L": { "toolActivate": "line" },
+    //"O": { "toolActivate": "eraser" },
+    //"P": { "toolActivate": "pencil" },
+    //"R": { "toolActivate": "rectangle" },
+    //"S": { "toolActivate": "selection" },
+    //"T": { "toolActivate": "text" },
+    //"V": { "toolActivate": "bcurve" },
 
     // Miscellaneous commands.
-    "X":  { "command": "swapFillStroke" },
-    "F1": { "command": "about" }
+    // "X":  { "command": "swapFillStroke" },
+    //"F1": { "command": "about" }
   }
 
   // vim:set spell spl=en fo=wan1croql tw=80 ts=2 sw=2 sts=2 sta et ai cin fenc=utf-8 ff=unix ft=javascript:
-}
+};
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
index a36d1ecb..3bcd4f37 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
@@ -527,11 +527,6 @@ function PaintWeb (win, doc) {
       return false;
     }
 
-    if (!this.config.configFile) {
-      this.initError(lang.noConfigFile);
-      return false;
-    }
-
     if (typeof this.config.guiPlaceholder !== 'object' || 
         this.config.guiPlaceholder.nodeType !== this.ELEMENT_NODE) {
       this.initError(lang.guiPlaceholderWrong);
@@ -638,8 +633,7 @@ function PaintWeb (win, doc) {
    * XMLHttpRequest object.
    */
   this.configLoad = function () {
-    pwlib.xhrLoad(PaintWeb.baseFolder + this.config.configFile, 
-        this.configReady);
+	this.configReady();
   };
 
   /**
@@ -662,16 +656,8 @@ function PaintWeb (win, doc) {
      *   3 INTERACTIVE Downloading, responseText holds the partial data.
      *   4 COMPLETED Finished with all operations.
      */
-    if (!xhr || xhr.readyState !== 4) {
-      return;
-    }
-
-    if ((xhr.status !== 304 && xhr.status !== 200) || !xhr.responseText) {
-      _self.initError(lang.failedConfigLoad);
-      return;
-    }
 
-    var config = pwlib.jsonParse(xhr.responseText);
+    var config = paintweb_config;
     pwlib.extend(_self.config, config);
 
     _self.langLoad();
@@ -689,21 +675,7 @@ function PaintWeb (win, doc) {
    * XMLHttpRequest object.
    */
   this.langLoad = function () {
-    var id   = this.config.lang,
-        file = PaintWeb.baseFolder;
-
-    // If the language is not available, always fallback to English.
-    if (!(id in this.config.languages)) {
-      id = this.config.lang = 'en';
-    }
-
-    if ('file' in this.config.languages[id]) {
-      file += this.config.languages[id].file;
-    } else {
-      file += this.config.langFolder + '/' + id + '.json';
-    }
-
-    pwlib.xhrLoad(file, this.langReady);
+    this.langReady();
   };
 
   /**
@@ -717,17 +689,9 @@ function PaintWeb (win, doc) {
    * @see PaintWeb#langLoad The method which issues the XMLHttpRequest request 
    * for loading the language file.
    */
-  this.langReady = function (xhr) {
-    if (!xhr || xhr.readyState !== 4) {
-      return;
-    }
-
-    if ((xhr.status !== 304 && xhr.status !== 200) || !xhr.responseText) {
-      _self.initError(lang.failedLangLoad);
-      return;
-    }
+  this.langReady = function () {
 
-    pwlib.extend(_self.lang, pwlib.jsonParse(xhr.responseText));
+    pwlib.extend(_self.lang, lang_ko);
 
     if (_self.initCanvas() && _self.initContext()) {
       // Start GUI load now.
@@ -751,13 +715,13 @@ function PaintWeb (win, doc) {
         this.commandRegister('selectionCrop',  this.selectionCrop) &&
         this.commandRegister('selectionFill',  this.selectionFill) &&
         //this.commandRegister('selectionCut',   this.selectionCut) &&
-        //this.commandRegister('selectionCopy',  this.selectionCopy) &&
+        this.commandRegister('selectionCopy',  this.selectionCopy) &&
         //this.commandRegister('clipboardPaste', this.clipboardPaste) &&
         this.commandRegister('imageSave',      this.imageSave) &&
         this.commandRegister('imageRotate',    this.imageRotate) &&
         this.commandRegister('imageBright',    this.imageBright) &&
         this.commandRegister('imageDark',      this.imageDark) &&
-        this.commandRegister('imageClear',     this.imageClear) &&
+        //this.commandRegister('imageClear',     this.imageClear) &&
         this.commandRegister('swapFillStroke', this.swapFillStroke) &&
         this.commandRegister('imageZoomIn',    this.imageZoomIn) &&
         this.commandRegister('imageZoomOut',   this.imageZoomOut) &&
@@ -2661,6 +2625,7 @@ function PaintWeb (win, doc) {
         imageLoad = _self.config.imageLoad,
         ext = 'png', idata = null, src = null, pos;
 
+
     if (!canvas.toDataURL) {
       return false;
     }
@@ -2714,35 +2679,21 @@ function PaintWeb (win, doc) {
     }
 
     canvas = null;
-//    alert('idata~~~'+idata)
+
     if (!idata || idata === 'data:,') {
       return false;
     }
 
-    //--------------------------------------------------------------------
-    // FIXME: 변경된 부분 : save image
-    //--------------------------------------------------------------------
-    if (!_self.config.imageSave) {
-      if (_self.config.afterImageSave) _self.config.afterImageSave();
-      return;
-    }
-
     let fileType = 'image/';
-    const regx = new RegExp('.(gif|jpg|jpeg|tiff|png|ico)$', 'i')
-    let name = (/[^(/|\\)]*$/).exec(idata)[0]
-    // 20220915_5df30439017240afbc7081ae9bfbfa2f_e 와 같은 형태인 경우 imageName으로
-    // 원본파일명 + '_e'
-    if(!regx.exec(name)){
-      const imgName = srcImg.name;
-      const idx = imgName.indexOf('.');
-
-      // 삭제가 아닌 경우 원본이미지명 + '_e' 추가
-      if(img.width !== 0){
-        name = imgName.substring(0, idx)+'_e'+ imgName.substring(idx);
-      }
-    }
-    fileType += regx.test(name) ? regx.exec(name)[0].replace('.', '') : 'jpg'
-    // mine type 'jpg' > jpeg로 변경
+    const regx = new RegExp('.(gif|jpg|jpeg|tiff|png|ico)$', 'i');
+    let name = originalInfomation.FILE_NM;;
+
+	if(regx.test(name)){
+		fileType += regx.exec(name)[0].replace('.', '');
+	} else {
+		fileType += 'jpg';
+	}
+	// mine type 'jpg' > jpeg로 변경
     fileType = fileType.replace('image/jpg', 'image/jpeg');
     const bstr = atob(idata.split(",")[1]);
     let n = bstr.length;
@@ -2755,7 +2706,7 @@ function PaintWeb (win, doc) {
 
     // 이미지 삭제인 경우 img.width, img.height 가 0
     _self.config.imageSave(file, img.width, img.height, doc, _self);
-
+	//_self.config.afterImageSave();
 
     return;
     //---------------------------------------------------------------------

From 5ee66e892e4f5c9ef07db74d748fa83333961c13 Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Mon, 31 Jul 2023 13:25:30 +0900
Subject: [PATCH 04/20] =?UTF-8?q?=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=ED=95=A8=EC=88=98=EB=AA=85=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

---
 .../java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java
index f37ed824..2fdaec15 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java
@@ -136,7 +136,7 @@ public class Crdn05ServiceBean extends AbstractServiceBean implements CrdnServic
 			excl01.setLevyExclRsnCd("192");
 			excl01.setEtcCn("");
 
-			result = excl01Bean.createLevyExclusion(excl01);
+			result = excl01Bean.create(excl01);
 			if (!result) {
 				return false;
 			}

From 05769e3684d1ee75aa02e1438c1c7a8b97a3ebab Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Mon, 31 Jul 2023 14:34:24 +0900
Subject: [PATCH 05/20] =?UTF-8?q?=EB=8B=A8=EC=86=8D=20=EC=9E=AC=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=20=EA=B4=80=EB=A6=AC=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/excl/dao/Excl03Mapper.java  |  24 --
 .../xit/fims/excl/service/Excl01Service.java  |   8 +-
 .../xit/fims/excl/service/Excl03Service.java  |   4 +-
 .../fims/excl/service/bean/Excl01Bean.java    |   6 +-
 .../excl/service/bean/Excl01ServiceBean.java  |  72 +++--
 .../fims/excl/service/bean/Excl03Bean.java    |  15 +-
 .../excl/service/bean/Excl03ServiceBean.java  | 150 +++++----
 .../xit/fims/excl/web/Excl01Controller.java   |  16 +-
 .../xit/fims/excl/web/Excl03Controller.java   |   8 +-
 .../mapper/fims/cmmn/crdnSttsHstry-mapper.xml |   2 +-
 .../sql/mapper/fims/excl/excl03-mapper.xml    | 305 +++++-------------
 .../WEB-INF/jsp/fims/excl/excl01010-main.jsp  |  13 +
 .../WEB-INF/jsp/fims/excl/excl01020-info.jsp  |  26 +-
 .../WEB-INF/jsp/fims/excl/excl03010-main.jsp  |  56 +++-
 14 files changed, 286 insertions(+), 419 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java
index 807ae8dd..009e3f31 100644
--- a/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java
+++ b/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java
@@ -5,7 +5,6 @@ import java.util.Map;
 
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
-import cokr.xit.fims.excl.Excl01Query;
 import cokr.xit.fims.excl.Excl03;
 import cokr.xit.fims.excl.Excl03Query;
 import cokr.xit.foundation.component.AbstractMapper;
@@ -86,33 +85,10 @@ public interface Excl03Mapper extends AbstractMapper {
 		return excl03 != null && deleteCrdnReReg(params().set("excl03", excl03)) == 1;
 	}
 
-
-
-
 	/**지정한 단속ID의 단속 대장 정보를 반환한다.
 	 * @param crdnId 단속ID
 	 * @return 단속 대장 정보
 	 */
 	DataObject selectCrdnInfo(String crdnId);
 
-	/**단속 재등록 정보를 등록한다.
-	 * @param params 파라미터
-	 * <ul><li>"excl03" - 단속 재등록</li>
-	 *     <li>"currentUser" - 현재 접속한 사용자</li>
-	 * </ul>
-	 * @return 저장된 정보수
-	 */
-	int insertCopyCrdn(Map<String, Object> params);
-
-	/**단속 재등록 정보를 등록한다.
-	 * @param excl03 단속 재등록
-	 * @return 저장 여부
-	 * <ul><li>저장됐으면 true</li>
-	 *     <li>그렇지 않으면 false</li>
-	 * </ul>
-	 */
-	default boolean insertCopyCrdn(Excl03 excl03) {
-		return excl03 != null && insertCopyCrdn(params().set("excl03", excl03)) == 1;
-	}
-
 }
diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java b/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java
index 79c09c70..38c52f20 100644
--- a/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java
+++ b/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java
@@ -38,7 +38,7 @@ public interface Excl01Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	Map<String, String> createLevyExclusion(Excl01 excl01);
+	Map<String, String> create(Excl01 excl01);
 
 	/**부과제외 대장 정보를 수정한다.
 	 * @param excl 부과제외 대장
@@ -47,7 +47,7 @@ public interface Excl01Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	Map<String, String> updateLevyExclusion(Excl01 excl01);
+	Map<String, String> update(Excl01 excl01);
 
 	/**부과제외 대장 정보를 삭제한다.
 	 * @param excl 부과제외 대장
@@ -56,7 +56,7 @@ public interface Excl01Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	boolean removeLevyExclusion(Excl01 excl01);
+	boolean remove(Excl01 excl01);
 
 	/**부과제외 대장 정보를 삭제한다.
 	 * @param excl 부과제외 대장
@@ -65,6 +65,6 @@ public interface Excl01Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	boolean removeLevyExclusionList(Excl01 excl01);
+	boolean removeList(Excl01 excl01);
 
 }
diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java b/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java
index 8d1365dc..d8265472 100644
--- a/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java
+++ b/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java
@@ -43,7 +43,7 @@ public interface Excl03Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	boolean createCrackdownReRegistration(Excl03 excl03);
+	boolean create(Excl03 excl03);
 
 	/**단속 재등록 정보를 삭제한다.
 	 * @param excl03 단속 재등록
@@ -52,5 +52,5 @@ public interface Excl03Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	boolean removeCrackdownReRegistration(Excl03 excl03);
+	boolean remove(Excl03 excl03);
 }
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java
index 635e32e9..fd444141 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java
@@ -62,7 +62,7 @@ public class Excl01Bean extends AbstractComponent {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	public boolean createLevyExclusion(Excl01 excl01) {
+	public boolean create(Excl01 excl01) {
 		return excl01Mapper.insert(excl01);
 	}
 
@@ -73,7 +73,7 @@ public class Excl01Bean extends AbstractComponent {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	public boolean updateLevyExclusion(Excl01 excl01) {
+	public boolean update(Excl01 excl01) {
 		return excl01Mapper.update(excl01);
 	}
 
@@ -84,7 +84,7 @@ public class Excl01Bean extends AbstractComponent {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	public boolean removeLevyExclusion(Excl01 excl01) {
+	public boolean remove(Excl01 excl01) {
 		return excl01Mapper.delete(excl01);
 	}
 
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
index b9669f8f..abf80fd5 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
@@ -48,7 +48,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 	}
 
 	@Override
-	public Map<String, String> createLevyExclusion(Excl01 excl01) {
+	public Map<String, String> create(Excl01 excl01) {
 		// 변수 선언
 		boolean retSuccess = false;												// DB 처리 결과
 		Map<String, String> retMap = new HashMap<String, String>();				// 결과 return
@@ -90,7 +90,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 		}
 
 		// 부과제외(TB_LEVY_EXCL) 대장 등록
-		retSuccess = excl01Bean.createLevyExclusion(excl01);
+		retSuccess = excl01Bean.create(excl01);
 		// 1건이 등록 되지 않았다면..
 		if (!retSuccess) {
 			retMap.put("retSaved", "false");
@@ -137,12 +137,12 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 	}
 
 	@Override
-	public Map<String, String> updateLevyExclusion(Excl01 excl01) {
+	public Map<String, String> update(Excl01 excl01) {
 		// 변수 선언
 		boolean retSuccess = false;												// DB 처리 결과
 		Map<String, String> retMap = new HashMap<String, String>();				// 결과 return
 
-		retSuccess = excl01Bean.updateLevyExclusion(excl01);
+		retSuccess = excl01Bean.update(excl01);
 		if (!retSuccess) {
 			retMap.put("retSaved", "false");
 			retMap.put("retMessage", "부과제외 대장 수정에 실패하였습니다.");
@@ -159,35 +159,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 	}
 
 	@Override
-	public boolean removeLevyExclusionList(Excl01 excl01) {
-		// 변수 선언
-		boolean retSuccess = false;												// DB 처리 결과
-		Excl01 infoLevyExcl = new Excl01();										// 부과제외(TB_LEVY_EXCL) 조회
-
-		// 부과제외ID 건수를 확인하여 1건이하면.. 종료
-		if (excl01.getLevyExclIDs().length < 1 ) {
-			return retSuccess;
-		}
-
-		// 부과제외ID 만큼 반복..
-		for (int iLoop = 0; iLoop < excl01.getLevyExclIDs().length; iLoop++) {
-			infoLevyExcl.setLevyExclId(excl01.getLevyExclIDs()[iLoop]);			// 부과제외 ID
-			infoLevyExcl.setDelRsn(excl01.getDelRsn());							// 삭제 사유
-
-			retSuccess = removeLevyExclusion(infoLevyExcl);
-			if (!retSuccess) {
-				return retSuccess;
-			}
-		}
-
-		// 처리 성공
-		retSuccess = true;
-
-		return retSuccess;
-	}
-
-	@Override
-	public boolean removeLevyExclusion(Excl01 excl01) {
+	public boolean remove(Excl01 excl01) {
 		// 변수 선언
 		boolean retSuccess = false;												// DB 처리 결과
 		String retMessage = "삭제 처리 중 ";
@@ -213,7 +185,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 		}
 
 		// 부과제외(TB_LEVY_EXCL) 삭제
-		retSuccess = excl01Bean.removeLevyExclusion(excl01);
+		retSuccess = excl01Bean.remove(excl01);
 		if (!retSuccess) {
 			retMessage = retMessage + "부과제외 자료 삭제에서 오류가 발생 되었습니다.";
 
@@ -339,4 +311,36 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 		return retSuccess;
 	}
 
+	@Override
+	public boolean removeList(Excl01 excl01) {
+		// 변수 선언
+		boolean retSuccess = false;												// DB 처리 결과
+		int dataCount = 0;														// 선택한 자료 건수
+		Excl01 infoLevyExcl = new Excl01();										// 부과제외(TB_LEVY_EXCL) 조회
+
+		// 변수 셋팅
+		dataCount = excl01.getLevyExclIDs().length;								// ID 건수
+
+		// 부과제외ID 건수를 확인하여 1건이하면.. 종료
+		if (dataCount < 1 ) {
+			return retSuccess;
+		}
+
+		// 부과제외ID 만큼 반복..
+		for (int iLoop = 0; iLoop < dataCount; iLoop++) {
+			infoLevyExcl.setLevyExclId(excl01.getLevyExclIDs()[iLoop]);			// 부과제외 ID
+			infoLevyExcl.setDelRsn(excl01.getDelRsn());							// 삭제 사유
+
+			retSuccess = remove(infoLevyExcl);
+			if (!retSuccess) {
+				return retSuccess;
+			}
+		}
+
+		// 처리 성공
+		retSuccess = true;
+
+		return retSuccess;
+	}
+
 }
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java
index 4d66e37a..f861ae08 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java
@@ -60,7 +60,7 @@ public class Excl03Bean extends AbstractComponent {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	public boolean createCrackdownReRegistration(Excl03 excl03) {
+	public boolean create(Excl03 excl03) {
 		return excl03Mapper.insert(excl03);
 	}
 
@@ -71,7 +71,7 @@ public class Excl03Bean extends AbstractComponent {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	public boolean removeCrackdownReRegistration(Excl03 excl03) {
+	public boolean remove(Excl03 excl03) {
 		return excl03Mapper.delete(excl03);
 	}
 
@@ -83,15 +83,4 @@ public class Excl03Bean extends AbstractComponent {
 		return excl03Mapper.selectCrdnInfo(crdnId);
 	}
 
-	/**단속 정보를 복사하여 신규 단속 정보를 등록한다.
-	 * @param excl03 단속 재등록
-	 * @return 저장 여부
-	 * <ul><li>저장됐으면 true</li>
-	 *     <li>그렇지 않으면 false</li>
-	 * </ul>
-	 */
-	public boolean createCopyCrackdown(Excl03 excl03) {
-		return excl03Mapper.insertCopyCrdn(excl03);
-	}
-
 }
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java
index 7f079bcc..869593e4 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java
@@ -8,13 +8,11 @@ import org.springframework.stereotype.Service;
 
 import cokr.xit.foundation.component.AbstractServiceBean;
 import cokr.xit.foundation.data.DataObject;
-import cokr.xit.base.file.service.bean.FileBean;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.service.bean.Crdn05ServiceBean;
 import cokr.xit.fims.excl.Excl03;
 import cokr.xit.fims.excl.Excl03Query;
 import cokr.xit.fims.excl.service.Excl03Service;
-import cokr.xit.fims.task.service.TaskService;
 
 /**단속 재등록 서비스 구현체.
  *
@@ -52,7 +50,7 @@ public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Serv
 	}
 
 	@Override
-	public boolean createCrackdownReRegistration(Excl03 excl03) {
+	public boolean create(Excl03 excl03) {
 		// 변수 선언
 		boolean retSuccess = false;												// DB 처리 결과
 		String retMessage = "등록 처리 중 ";
@@ -62,91 +60,89 @@ public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Serv
 
 		Crdn crdn = new Crdn();
 
-		crdn.setSggCd(infoCrdn.string("SGG_CD"));
-		crdn.setTaskSeCd(infoCrdn.string("TASK_SE_CD"));
-//		crdn.setCrdnRegSeCd(infoCrdn.string("CRDN_REG_SE_CD"));
-//		crdn.setCrdnInptSeCd(infoCrdn.string("CRDN_INPT_SE_CD"));
-//		crdn.setLinkTblNm(infoCrdn.string("LINK_TBL_NM"));
-//		crdn.setLinkId(infoCrdn.string("LINK_ID"));
-//		crdn.setRtpyrId(infoCrdn.string("RTPYR_ID"));
-//		crdn.setCrdnSeCd(infoCrdn.string("CRDN_SE_CD"));
-//		crdn.setCrdnYmd(infoCrdn.string("CRDN_YMD"));
-//		crdn.setCrdnTm(infoCrdn.string("CRDN_TM"));
-//		crdn.setVhrno(infoCrdn.string("VHRNO"));
-//		crdn.setCrdnStdgNm(infoCrdn.string("CRDN_STDG_NM"));
-//		crdn.setCrdnRoadNm(infoCrdn.string("CRDN_ROAD_NM"));
-//		crdn.setCrdnPlc(infoCrdn.string("CRDN_PLC"));
-//		crdn.setDtlCrdnPlc(infoCrdn.string("DTL_CRDN_PLC"));
-//		crdn.setTeamId(infoCrdn.string("TEAM_ID"));
-//		crdn.setVltnId(infoCrdn.string("VLTN_ID"));
-//		crdn.setCrdnSpareaCd(infoCrdn.string("CRDN_SPAREA_CD"));
-//		crdn.setCrdnBgngTm(infoCrdn.string("CRDN_BGNG_TM"));
-//		crdn.setCrdnEndHr(infoCrdn.string("CRDN_END_HR"));
-//		crdn.setCrdnSn(infoCrdn.string("CRDN_SN"));
-//		crdn.setGpsX(infoCrdn.string("GPS_X"));
-//		crdn.setGpsY(infoCrdn.string("GPS_Y"));
-//		crdn.setMoscX(infoCrdn.string("MOSC_X"));
-//		crdn.setMoscY(infoCrdn.string("MOSC_Y"));
-//		crdn.setTowngYn(infoCrdn.string("TOWNG_YN"));
-//		crdn.setAtchFileCnt(infoCrdn.string("ATCH_FILE_CNT"));
-//		crdn.setVin(infoCrdn.string("VIN"));
-//		crdn.setVhclNm(infoCrdn.string("VHCL_NM"));
-//		crdn.setVhclColor(infoCrdn.string("VHCL_COLOR"));
-//		crdn.setUseFuelCd(infoCrdn.string("USE_FUEL_CD"));
-//		crdn.setUsgSeCd(infoCrdn.string("USG_SE_CD"));
-//		crdn.setMxmmLoadQy(infoCrdn.string("MXMM_LOAD_QY"));
-//		crdn.setTkcarPsncpaCnt(infoCrdn.string("TKCAR_PSNCPA_CNT"));
-//		crdn.setCarmdlAsortNm(infoCrdn.string("CARMDL_ASORT_NM"));
-//		crdn.setCarmdlTypeNm(infoCrdn.string("CARMDL_TYPE_NM"));
-//		crdn.setCarmdlClsfNm(infoCrdn.string("CARMDL_CLSF_NM"));
-//		crdn.setErsrYmd(infoCrdn.string("ERSR_YMD"));
-//		crdn.setFfnlgCarmdlCd(infoCrdn.string("FFNLG_CARMDL_CD"));
-//		crdn.setParkngPsbltyRsltCd(infoCrdn.string("PARKNG_PSBLTY_RSLT_CD"));
-//		crdn.setVltnNmtm(infoCrdn.string("VLTN_NMTM"));
-//		crdn.setOvtimeYn(infoCrdn.string("OVTIME_YN"));
-//		crdn.setRvwSeCd(infoCrdn.string("RVW_SE_CD"));
-//		crdn.setRvwPrcsScrnNm(infoCrdn.string("RVW_PRCS_SCRN_NM"));
-//		crdn.setRvwDt(infoCrdn.string("RVW_DT"));
-//		crdn.setRvwr(infoCrdn.string("RVWR"));
-//		crdn.setFfnlgAmt(infoCrdn.string("FFNLG_AMT"));
-//		crdn.setFfnlgRductRt(infoCrdn.string("FFNLG_RDUCT_RT"));
-//		crdn.setLevyAmt(infoCrdn.string("LEVY_AMT"));
-//		crdn.setAdvntceBgngYmd(infoCrdn.string("ADVNTCE_BGNG_YMD"));
-//		crdn.setAdvntceDudtYmd(infoCrdn.string("ADVNTCE_DUDT_YMD"));
-//		crdn.setAdvntceLevyAmt(infoCrdn.string("ADVNTCE_LEVY_AMT"));
-//		crdn.setOpnnSbmsnYn(infoCrdn.string("OPNN_SBMSN_YN"));
-//		crdn.setEtcCn(infoCrdn.string("ETC_CN"));
-//		crdn.setLevyId("");
-//		crdn.setCrdnSttsCd("01");
-//		crdn.setCrdnSttsChgDt("");
-//		crdn.setAdtnAmt(infoCrdn.string("0"));
-//		crdn.setMinusAmt(infoCrdn.string("0"));
-//		crdn.setRcvmtAmt(infoCrdn.string("0"));
-		crdn.setBfrCrdnId(infoCrdn.string("CRDN_ID"));
+		crdn.setSggCd(infoCrdn.string("SGG_CD"));										// 시군구 코드
+		crdn.setTaskSeCd(infoCrdn.string("TASK_SE_CD"));								// 업무 구분 코드
+		crdn.setCrdnRegSeCd("03");														// 단속 등록 구분 코드(FIM026) - 재 등록
+		crdn.setCrdnInptSeCd(infoCrdn.string("CRDN_INPT_SE_CD"));						// 단속 입력 구분 코드
+		crdn.setLinkTblNm(infoCrdn.string("LINK_TBL_NM"));								// 연계 테이블 명
+		crdn.setLinkId(infoCrdn.string("LINK_ID"));										// 연계 ID
+		crdn.setRtpyrId(infoCrdn.string("RTPYR_ID"));									// 납부자 ID
+		crdn.setCrdnSeCd(infoCrdn.string("CRDN_SE_CD"));								// 단속 구분 코드
+		crdn.setCrdnYmd(infoCrdn.string("CRDN_YMD"));									// 단속 일자
+		crdn.setCrdnTm(infoCrdn.string("CRDN_TM"));										// 단속 시각
+		crdn.setVhrno(infoCrdn.string("VHRNO"));										// 차량번호
+		crdn.setCrdnStdgNm(infoCrdn.string("CRDN_STDG_NM"));							// 단속 법정동 명
+		crdn.setCrdnRoadNm(infoCrdn.string("CRDN_ROAD_NM"));							// 단속 도로 명
+		crdn.setCrdnPlc(infoCrdn.string("CRDN_PLC"));									// 단속 장소
+		crdn.setDtlCrdnPlc(infoCrdn.string("DTL_CRDN_PLC"));							// 상세 단속 장소
+		crdn.setTeamId(infoCrdn.string("TEAM_ID"));										// 조 ID
+		crdn.setVltnId(infoCrdn.string("VLTN_ID"));										// 위반 ID
+		crdn.setVltnCd(infoCrdn.string("VLTN_CD"));										// 위반 코드
+		crdn.setCrdnSpareaCd(infoCrdn.string("CRDN_SPAREA_CD"));						// 단속 특별구역 코드
+		crdn.setCrdnBgngTm(infoCrdn.string("CRDN_BGNG_TM"));							// 단속 시작 시각
+		crdn.setCrdnEndHr(infoCrdn.string("CRDN_END_HR"));								// 단속 종료 시각
+		crdn.setCrdnSn(infoCrdn.string("CRDN_SN"));										// 단속 일련번호
+		crdn.setGpsX(infoCrdn.string("GPS_X"));											// GPS X
+		crdn.setGpsY(infoCrdn.string("GPS_Y"));											// GPS Y
+		crdn.setMoscX(infoCrdn.string("MOSC_X"));										// 모자이크 X
+		crdn.setMoscY(infoCrdn.string("MOSC_Y"));										// 모자이크 Y
+		crdn.setTowngYn(infoCrdn.string("TOWNG_YN"));									// 견인 여부
+		crdn.setAtchFileCnt(Integer.parseInt(infoCrdn.string("ATCH_FILE_CNT")));		// 첨부 파일 수
+		crdn.setVin(infoCrdn.string("VIN"));											// 차대번호
+		crdn.setVhclNm(infoCrdn.string("VHCL_NM"));										// 차량 명
+		crdn.setVhclColor(infoCrdn.string("VHCL_COLOR"));								// 차량 색상
+		crdn.setUseFuelCd(infoCrdn.string("USE_FUEL_CD"));								// 사용 연료 코드
+		crdn.setUsgSeCd(infoCrdn.string("USG_SE_CD"));									// 용도 구분 코드
+		crdn.setMxmmLoadQy(infoCrdn.string("MXMM_LOAD_QY"));							// 최대 적재 량
+		crdn.setTkcarPsncpaCnt(infoCrdn.string("TKCAR_PSNCPA_CNT"));					// 승차 정원 수
+		crdn.setCarmdlAsortNm(infoCrdn.string("CARMDL_ASORT_NM"));						// 차종 종별 명
+		crdn.setCarmdlTypeNm(infoCrdn.string("CARMDL_TYPE_NM"));						// 차종 유형 명
+		crdn.setCarmdlClsfNm(infoCrdn.string("CARMDL_CLSF_NM"));						// 차종 분류 명
+		crdn.setErsrYmd(infoCrdn.string("ERSR_YMD"));									// 말소 일자
+		crdn.setFfnlgCarmdlCd(infoCrdn.string("FFNLG_CARMDL_CD"));						// 과태료 차종 코드
+		crdn.setParkngPsbltyRsltCd(infoCrdn.string("PARKNG_PSBLTY_RSLT_CD"));			// 주차 가능 결과 코드
+		crdn.setVltnNmtm(infoCrdn.string("VLTN_NMTM"));									// 위반 횟수
+		crdn.setOvtimeYn(infoCrdn.string("OVTIME_YN"));									// 시간외 여부
+		crdn.setRvwSeCd(infoCrdn.string("RVW_SE_CD"));									// 검토 구분 코드
+		crdn.setRvwPrcsScrnNm(infoCrdn.string("RVW_PRCS_SCRN_NM"));						// 검토 처리 화면 명
+		crdn.setRvwDt(infoCrdn.string("RVW_DT"));										// 검토 일시
+		crdn.setRvwr(infoCrdn.string("RVWR"));											// 검토자
+		crdn.setFfnlgAmt(0);															// 과태료 금액 - 초기 값
+		crdn.setFfnlgRductRt(infoCrdn.string("FFNLG_RDUCT_RT"));						// 과태료 감경 율
+		crdn.setLevyAmt(0);																// 부과 금액 - 초기 값
+//		crdn.setAdvntceBgngYmd("");														// 사전통지 시작 일자
+//		crdn.setAdvntceDudtYmd("");														// 사전통지 납기 일자
+		crdn.setAdvntceLevyAmt(0);														// 사전통지 부과 금액 - 초기 값
+		crdn.setOpnnSbmsnYn("N");														// 의견 제출 여부
+		crdn.setEtcCn(infoCrdn.string("ETC_CN"));										// 기타 내용
+//		crdn.setLevyId("");																// 부과 ID
+		crdn.setCrdnSttsCd("01");														// 단속 상태 코드
+		crdn.setCrdnSttsChgDt("");														// 단속 상태 변경 일시
+		crdn.setAdtnAmt(0);																// 가산 금액
+		crdn.setMinusAmt(0);															// 감경 금액
+		crdn.setRcvmtAmt(0);															// 수납 금액
+		crdn.setBfrCrdnId(infoCrdn.string("CRDN_ID"));									// 이전 단속 ID
 		crdn.setDelYn("N");
 
 		// 단속 대장 입력
+		crdn.setDoGuidance("");
+
 		retSuccess = crdn05Service.create(crdn);
 		if (!retSuccess) {
 		retMessage = "단속 대장 등록에 실패하였습니다.";
 
 		// 예외를 발생시켜서 오류메세지를 보내고 Database 롤백..
 		throw new RuntimeException(retMessage);
-	}
-
-//		// 단속 대장 자료 복사
-//		retSuccess = excl03Bean.createCopyCrackdown(excl03);
-//		if (!retSuccess) {
-//			retMessage = "재부과 대장에 실패하였습니다.";
-//
-//			// 예외를 발생시켜서 오류메세지를 보내고 Database 롤백..
-//			throw new RuntimeException(retMessage);
-//		}
+		}
 
 		// 단속 대장 사진 복사
 
+
 		// 재부과 대장 등록
-		retSuccess = excl03Bean.createCrackdownReRegistration(excl03);
+		excl03.setCrdnId(crdn.getCrdnId());
+		excl03.setCrdnRegSeCd("03");
+
+		retSuccess = excl03Bean.create(excl03);
 		if (!retSuccess) {
 			retMessage = "재부과 대장 등록에 실패하였습니다.";
 
@@ -161,8 +157,8 @@ public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Serv
 	}
 
 	@Override
-	public boolean removeCrackdownReRegistration(Excl03 excl03) {
-		return excl03Bean.removeCrackdownReRegistration(excl03);
+	public boolean remove(Excl03 excl03) {
+		return excl03Bean.remove(excl03);
 	}
 
 }
diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
index c8759d08..d19d3a67 100644
--- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
+++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
@@ -107,8 +107,8 @@ public class Excl01Controller extends ApplicationController {
 	 * }</code></pre>
 	 */
 	@PostMapping(name = "부과제외 대장 등록", value = "/020/create.do")
-	public ModelAndView createLevyExclusion(Excl01 excl01) {
-		Map<String, String> retMap = excl01Service.createLevyExclusion(excl01);
+	public ModelAndView create(Excl01 excl01) {
+		Map<String, String> retMap = excl01Service.create(excl01);
 
 		return new ModelAndView("jsonView")
 				.addObject("retSaved", retMap.get("retSaved"))
@@ -123,8 +123,8 @@ public class Excl01Controller extends ApplicationController {
 	 * }</code></pre>
 	 */
 	@PostMapping(name = "부과제외 대장 수정", value = "/020/update.do")
-	public ModelAndView updateLevyExclusion(Excl01 excl01) {
-		Map<String, String> retMap = excl01Service.updateLevyExclusion(excl01);
+	public ModelAndView update(Excl01 excl01) {
+		Map<String, String> retMap = excl01Service.update(excl01);
 
 		return new ModelAndView("jsonView")
 				.addObject("retSaved", retMap.get("retSaved"))
@@ -140,8 +140,8 @@ public class Excl01Controller extends ApplicationController {
 	 * }</code></pre>
 	 */
 	@PostMapping(name = "부과제외 대장 제거", value = "/010/remove.do")
-	public ModelAndView removeLevyExclusion(Excl01 excl01) {
-		boolean saved = excl01Service.removeLevyExclusion(excl01);
+	public ModelAndView remove(Excl01 excl01) {
+		boolean saved = excl01Service.remove(excl01);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
@@ -156,8 +156,8 @@ public class Excl01Controller extends ApplicationController {
 	 * }</code></pre>
 	 */
 	@PostMapping(name = "부과제외 대장 제거", value = "/010/removes.do")
-	public ModelAndView removeLevyExclusionList(Excl01 excl01) {
-		boolean saved = excl01Service.removeLevyExclusionList(excl01);
+	public ModelAndView removeList(Excl01 excl01) {
+		boolean saved = excl01Service.removeList(excl01);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java
index 9ea2e669..d82dc8a9 100644
--- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java
+++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java
@@ -97,8 +97,8 @@ public class Excl03Controller extends ApplicationController {
 	 * }</code></pre>
 	 */
 	@PostMapping(name = "단속 재등록 등록", value = "/010/create.do")
-	public ModelAndView createCrackdownReRegistration(Excl03 excl03) {
-		boolean saved = excl03Service.createCrackdownReRegistration(excl03);
+	public ModelAndView create(Excl03 excl03) {
+		boolean saved = excl03Service.create(excl03);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
@@ -113,8 +113,8 @@ public class Excl03Controller extends ApplicationController {
 	 * }</code></pre>
 	 */
 	@PostMapping(name = "단속 재등록 제거", value = "/010/remove.do")
-	public ModelAndView removeCrackdownReRegistration(Excl03 excl03) {
-		boolean saved = excl03Service.removeCrackdownReRegistration(excl03);
+	public ModelAndView remove(Excl03 excl03) {
+		boolean saved = excl03Service.remove(excl03);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
diff --git a/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml
index 29f2a4bc..de8ea805 100644
--- a/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml
@@ -62,7 +62,7 @@
 
 	<insert id="insertCrdnSttsHstry" parameterType="map">/* 단속 상태 이력 등록(crdnSttsHstryMapper.insertCrdnSttsHstry) */
         <selectKey resultType="string" keyProperty="crdnSttsHstry.sttsHstryId" keyColumn="NEW_ID" order="BEFORE">
-            SELECT LPAD(IFNULL(MAX(STTS_HSTRY_ID) + 1, 1), 20, '0') NEW_ID FROM TB_CRDN_STTS_HSTRY
+            SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(STTS_HSTRY_ID,5)) + 1, 1) AS INT), 16, '0')) AS NEW_ID FROM TB_CRDN_STTS_HSTRY
         </selectKey>
         INSERT
           INTO TB_CRDN_STTS_HSTRY (
diff --git a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml
index cc54cf76..eade5071 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml
@@ -147,31 +147,30 @@
 	</select>
 
 	<insert id="insertCrdnReReg" parameterType="map">/* 단속 재등록 등록(excl03Mapper.insertCrdnReReg) */
+        <selectKey resultType="string" keyProperty="excl03.reRegId" keyColumn="NEW_ID" order="BEFORE">
+            SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(RE_REG_ID,5)) + 1, 1) AS INT), 16, '0')) AS NEW_ID FROM TB_CRDN_RE_REG
+        </selectKey>
         INSERT INTO TB_CRDN_RE_REG (
                RE_REG_ID                                                                                        /* 재등록 ID */
-             , BEF_CRDN_ID                                                                                      /* 신규 단속 ID */
+             , BFR_CRDN_ID                                                                                      /* 신규 단속 ID */
              , CRDN_ID                                                                                          /* 단속 ID */
+             , RE_REG_YMD                                                                                       /* 재 등록 일자 */
              , CRDN_REG_SE_CD                                                                                   /* 단속 등록 구분 코드 */
              , ETC_CN                                                                                           /* 기타 내용 */
              , DEL_YN                                                                                           /* 삭제 여부 */
              , REG_DT                                                                                           /* 등록 일시 */
              , RGTR                                                                                             /* 등록자 */
-             , DEL_DT                                                                                           /* 삭제 일시 */
-             , DLTR                                                                                             /* 삭제자 */
-             , DEL_RSN                                                                                          /* 삭제 사유 */
              )
         VALUES (
-               #{reRegId}                                                                                       /* 재등록 ID */
-             , #{befCrdnId}                                                                                     /* 신규 단속 ID */
-             , #{crdnId}                                                                                        /* 단속 ID */
-             , #{crdnRegSeCd}                                                                                   /* 단속 등록 구분 코드 */
-             , #{etcCn}                                                                                         /* 기타 내용 */
-             , #{delYn}                                                                                         /* 삭제 여부 */
-             , <include refid="utility.now" />                                                                  /* 등록 일시 */
-             , #{currentUser.id}                                                                                /* 등록자 */
-             , #{removedAt}                                                                                     /* 삭제 일시 */
-             , #{removedBy}                                                                                     /* 삭제자 */
-             , #{delRsn}                                                                                        /* 삭제 사유 */
+               #{excl03.reRegId}                                                                                /* 재등록 ID */
+             , #{excl03.bfrCrdnId}                                                                              /* 신규 단속 ID */
+             , #{excl03.crdnId}                                                                                 /* 단속 ID */
+             , <include refid="utility.today" />                                                                /* 재 등록 일자 */
+             , #{excl03.crdnRegSeCd}                                                                            /* 단속 등록 구분 코드 */
+             , #{excl03.etcCn}                                                                                  /* 기타 내용 */
+             , 'N'                                                                                              /* 삭제 여부 */
+             , #{excl03.createdAt}                                                                              /* 등록 일시 */
+             , #{excl03.createdBy}                                                                              /* 등록자 */
              )
 	</insert>
 
@@ -186,214 +185,74 @@
 	</update>
 
 	<select id="selectCrdnInfo" parameterType="map" resultType="dataobject">/* 단속 재등록 객체 가져오기(excl03Mapper.selectCrdnInfo) */
-        SELECT CRDN_ID
-             , SGG_CD
-             , TASK_SE_CD
-             , CRDN_REG_SE_CD
-             , CRDN_INPT_SE_CD
-             , LINK_TBL_NM
-             , LINK_ID
-             , RTPYR_ID
-             , CRDN_SE_CD
-             , CRDN_YMD
-             , CRDN_TM
-             , VHRNO
-             , CRDN_STDG_NM
-             , CRDN_ROAD_NM
-             , CRDN_PLC
-             , DTL_CRDN_PLC
-             , TEAM_ID
-             , VLTN_ID
-             , CRDN_SPAREA_CD
-             , CRDN_BGNG_TM
-             , CRDN_END_HR
-             , CRDN_SN
-             , GPS_X
-             , GPS_Y
-             , MOSC_X
-             , MOSC_Y
-             , TOWNG_YN
-             , ATCH_FILE_CNT
-             , VIN
-             , VHCL_NM
-             , VHCL_COLOR
-             , USE_FUEL_CD
-             , USG_SE_CD
-             , MXMM_LOAD_QY
-             , TKCAR_PSNCPA_CNT
-             , CARMDL_ASORT_NM
-             , CARMDL_TYPE_NM
-             , CARMDL_CLSF_NM
-             , ERSR_YMD
-             , FFNLG_CARMDL_CD
-             , PARKNG_PSBLTY_RSLT_CD
-             , VLTN_NMTM
-             , OVTIME_YN
-             , RVW_SE_CD
-             , RVW_PRCS_SCRN_NM
-             , RVW_DT
-             , RVWR
-             , FFNLG_AMT
-             , FFNLG_RDUCT_RT
-             , LEVY_AMT
-             , ADVNTCE_BGNG_YMD
-             , ADVNTCE_DUDT_YMD
-             , ADVNTCE_LEVY_AMT
-             , OPNN_SBMSN_YN
-             , ETC_CN
-             , LEVY_ID
-             , CRDN_STTS_CD
-             , CRDN_STTS_CHG_DT
-             , ADTN_AMT
-             , MINUS_AMT
-             , RCVMT_AMT
-             , BFR_CRDN_ID
-             , DEL_YN                                                                                           /* 삭제 여부 */
-             , REG_DT                                                                                           /* 등록 일시 */
-             , RGTR                                                                                             /* 등록자 */
-          FROM TB_CRDN
-         WHERE CRDN_ID                  =  #{crdnId}                                                            /* 단속 ID */
+        SELECT A.CRDN_ID
+             , A.SGG_CD
+             , A.TASK_SE_CD
+             , A.CRDN_REG_SE_CD
+             , A.CRDN_INPT_SE_CD
+             , A.LINK_TBL_NM
+             , A.LINK_ID
+             , A.RTPYR_ID
+             , A.CRDN_SE_CD
+             , A.CRDN_YMD
+             , A.CRDN_TM
+             , A.VHRNO
+             , A.CRDN_STDG_NM
+             , A.CRDN_ROAD_NM
+             , A.CRDN_PLC
+             , A.DTL_CRDN_PLC
+             , A.TEAM_ID
+             , A.VLTN_ID
+             , (SELECT VLTN_CD FROM TB_VLTN_INFO X WHERE X.VLTN_ID = A.VLTN_ID AND X.SGG_CD = A.SGG_CD AND X.TASK_SE_CD = A.TASK_SE_CD) AS VLTN_CD
+             , A.CRDN_SPAREA_CD
+             , A.CRDN_BGNG_TM
+             , A.CRDN_END_HR
+             , A.CRDN_SN
+             , A.GPS_X
+             , A.GPS_Y
+             , A.MOSC_X
+             , A.MOSC_Y
+             , A.TOWNG_YN
+             , A.ATCH_FILE_CNT
+             , A.VIN
+             , A.VHCL_NM
+             , A.VHCL_COLOR
+             , A.USE_FUEL_CD
+             , A.USG_SE_CD
+             , A.MXMM_LOAD_QY
+             , A.TKCAR_PSNCPA_CNT
+             , A.CARMDL_ASORT_NM
+             , A.CARMDL_TYPE_NM
+             , A.CARMDL_CLSF_NM
+             , A.ERSR_YMD
+             , A.FFNLG_CARMDL_CD
+             , A.PARKNG_PSBLTY_RSLT_CD
+             , A.VLTN_NMTM
+             , A.OVTIME_YN
+             , A.RVW_SE_CD
+             , A.RVW_PRCS_SCRN_NM
+             , A.RVW_DT
+             , A.RVWR
+             , A.FFNLG_AMT
+             , A.FFNLG_RDUCT_RT
+             , A.LEVY_AMT
+             , A.ADVNTCE_BGNG_YMD
+             , A.ADVNTCE_DUDT_YMD
+             , A.ADVNTCE_LEVY_AMT
+             , A.OPNN_SBMSN_YN
+             , A.ETC_CN
+             , A.LEVY_ID
+             , A.CRDN_STTS_CD
+             , A.CRDN_STTS_CHG_DT
+             , A.ADTN_AMT
+             , A.MINUS_AMT
+             , A.RCVMT_AMT
+             , A.BFR_CRDN_ID
+             , A.DEL_YN                                                                                         /* 삭제 여부 */
+             , A.REG_DT                                                                                         /* 등록 일시 */
+             , A.RGTR                                                                                           /* 등록자 */
+          FROM TB_CRDN A
+         WHERE A.CRDN_ID                =  #{crdnId}                                                            /* 단속 ID */
 	</select>
 
-	<insert id="insertCopyCrdn" parameterType="map">/* 단속 재등록 등록(excl03Mapper.insertCopyCrdn) */
-        <selectKey resultType="string" keyProperty="crdnId" keyColumn="NEW_ID" order="BEFORE">
-            SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(CRDN_ID,5)) + 1, 1) AS INT), 16, '0')) AS NEW_ID FROM TB_CRDN
-        </selectKey>
-        INSERT INTO TB_CRDN (
-               CRDN_ID
-             , SGG_CD
-             , TASK_SE_CD
-             , CRDN_REG_SE_CD
-             , CRDN_INPT_SE_CD
-             , LINK_TBL_NM
-             , LINK_ID
-             , RTPYR_ID
-             , CRDN_SE_CD
-             , CRDN_YMD
-             , CRDN_TM
-             , VHRNO
-             , CRDN_STDG_NM
-             , CRDN_ROAD_NM
-             , CRDN_PLC
-             , DTL_CRDN_PLC
-             , TEAM_ID
-             , VLTN_ID
-             , CRDN_SPAREA_CD
-             , CRDN_BGNG_TM
-             , CRDN_END_HR
-             , CRDN_SN
-             , GPS_X
-             , GPS_Y
-             , MOSC_X
-             , MOSC_Y
-             , TOWNG_YN
-             , ATCH_FILE_CNT
-             , VIN
-             , VHCL_NM
-             , VHCL_COLOR
-             , USE_FUEL_CD
-             , USG_SE_CD
-             , MXMM_LOAD_QY
-             , TKCAR_PSNCPA_CNT
-             , CARMDL_ASORT_NM
-             , CARMDL_TYPE_NM
-             , CARMDL_CLSF_NM
-             , ERSR_YMD
-             , FFNLG_CARMDL_CD
-             , PARKNG_PSBLTY_RSLT_CD
-             , VLTN_NMTM
-             , OVTIME_YN
-             , RVW_SE_CD
-             , RVW_PRCS_SCRN_NM
-             , RVW_DT
-             , RVWR
-             , FFNLG_AMT
-             , FFNLG_RDUCT_RT
-             , LEVY_AMT
-             , ADVNTCE_BGNG_YMD
-             , ADVNTCE_DUDT_YMD
-             , ADVNTCE_LEVY_AMT
-             , OPNN_SBMSN_YN
-             , ETC_CN
-             , LEVY_ID
-             , CRDN_STTS_CD
-             , CRDN_STTS_CHG_DT
-             , ADTN_AMT
-             , MINUS_AMT
-             , RCVMT_AMT
-             , BFR_CRDN_ID
-             , DEL_YN                                                                                           /* 삭제 여부 */
-             , REG_DT                                                                                           /* 등록 일시 */
-             , RGTR                                                                                             /* 등록자 */
-             )
-        SELECT
-             , #{excl03.crdnId}
-             , SGG_CD
-             , TASK_SE_CD
-             , CRDN_REG_SE_CD
-             , CRDN_INPT_SE_CD
-             , LINK_TBL_NM
-             , LINK_ID
-             , RTPYR_ID
-             , CRDN_SE_CD
-             , CRDN_YMD
-             , CRDN_TM
-             , VHRNO
-             , CRDN_STDG_NM
-             , CRDN_ROAD_NM
-             , CRDN_PLC
-             , DTL_CRDN_PLC
-             , TEAM_ID
-             , VLTN_ID
-             , CRDN_SPAREA_CD
-             , CRDN_BGNG_TM
-             , CRDN_END_HR
-             , CRDN_SN
-             , GPS_X
-             , GPS_Y
-             , MOSC_X
-             , MOSC_Y
-             , TOWNG_YN
-             , ATCH_FILE_CNT
-             , VIN
-             , VHCL_NM
-             , VHCL_COLOR
-             , USE_FUEL_CD
-             , USG_SE_CD
-             , MXMM_LOAD_QY
-             , TKCAR_PSNCPA_CNT
-             , CARMDL_ASORT_NM
-             , CARMDL_TYPE_NM
-             , CARMDL_CLSF_NM
-             , ERSR_YMD
-             , FFNLG_CARMDL_CD
-             , PARKNG_PSBLTY_RSLT_CD
-             , VLTN_NMTM
-             , OVTIME_YN
-             , RVW_SE_CD
-             , RVW_PRCS_SCRN_NM
-             , RVW_DT
-             , RVWR
-             , FFNLG_AMT
-             , FFNLG_RDUCT_RT
-             , LEVY_AMT
-             , ADVNTCE_BGNG_YMD
-             , ADVNTCE_DUDT_YMD
-             , ADVNTCE_LEVY_AMT
-             , OPNN_SBMSN_YN
-             , ETC_CN
-             , NULL                                                                                             /* 부과 ID */
-             , '01'                                                                                             /* 단속 상태 코드 */
-             , <include refid="utility.now" />                                                                  /* 단속 상태 변경 일시 */
-             , '0'                                                                                              /* 가산 금액 */
-             , '0'                                                                                              /* 감경 금액 */
-             , '0'                                                                                              /* 수납 금액 */
-             , CRDN_ID
-             , 'N'                                                                                              /* 삭제 여부 */
-             , #{excl03.createdAt}                                                                              /* 등록 일시 */
-             , #{excl03.createdBy}                                                                              /* 등록자 */
-          FROM TB_CRDN
-         WHERE CRDN_ID                  = #{excl03.bfrCrdnId}                                                   /* 이전 단속 ID */
-	</insert>
-
 </mapper>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
index aa010c02..8b25781b 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
@@ -423,6 +423,19 @@
 
 	// 이벤트
 	function setEvent${pageName}() {
+		// form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용
+		$("#frmSearch--${pageName}").find(".form-date").each(function() {
+			$(this).on("input",function() {
+				let value = this.value.replaceAll("-", "");
+
+				if (value.length > 7) {
+					this.value = value.substring(0,4) + "-" + value.substring(4,6) + "-" + value.substring(6);
+				} else if(value.length > 5) {
+					this.value = value.substring(0,4) + "-" + value.substring(4);
+				}
+			});
+		});
+
 		// DataTables 스크롤 이벤트
 		$("#table-responsive--${pageName}").scroll(function() {
 			let el = $(this);
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
index 7e286d90..ce247668 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
@@ -149,21 +149,19 @@
 
 	// 이벤트 설정
 	function setEvent${pageName}() {
-
-	}
-
-	// 일자 포맷
-	$("#frmEdit--${pageName}").find(".form-date").each(function() {
-		$(this).on("input",function() {
-			let value = this.value.replaceAll("-", "");
-
-			if (value.length > 7) {
-				this.value = value.substring(0, 4) + "-" + value.substring(4, 6) + "-" + value.substring(6);
-			} else if(value.length > 5){
-				this.value = value.substring(0, 4) + "-" + value.substring(4);
-			}
+		// form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용
+		$("#frmEdit--${pageName}").find(".form-date").each(function() {
+			$(this).on("input",function() {
+				let value = this.value.replaceAll("-", "");
+
+				if (value.length > 7) {
+					this.value = value.substring(0,4) + "-" + value.substring(4,6) + "-" + value.substring(6);
+				} else if(value.length > 5) {
+					this.value = value.substring(0,4) + "-" + value.substring(4);
+				}
+			});
 		});
-	});
+	}
 
 	/**************************************************************************
 	 * function
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
index 3a67c152..d0c10959 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
@@ -144,7 +144,7 @@
 							</div>
 				            <span class="container-window-btn-right">
 								<!-- 업무 버튼 -->
-								<button class="btn btn-primary" id="btnCreate--${pageName}" title="등록" onclick="fnCreate${pageName}();">
+								<button class="btn btn-primary" id="btnCreate--${pageName}" title="등록" onclick="fnSave${pageName}();">
 									등록
 								</button>
 								<button class="btn btn-primary" id="btnRemove--${pageName}" title="삭제" onclick="fnRemove${pageName}();">
@@ -242,14 +242,13 @@
 	 **************************************************************************/
 	var ${pageName}Control = new DatasetControl({
 		  prefix : "crdnReReg"
-		, prefixName : "단속재등록"
+		, prefixName : "단속 재등록"
 		, infoSize : "lg"
 		, keymapper : info => info ? info.RE_REG_ID : ""
 		, dataGetter : obj => obj.crdnReRegList
 		, appendData : true
 		, urls : {
 			  load : wctx.url(prefixUrl + "/010/list.do")				// 검색
-			, getInfo : wctx.url(prefixUrl + "/020/info.do")			// 등록 및 수정 팝업
 			, create : wctx.url(prefixUrl + "/010/create.do")			// 신규 등록
 			, remove : wctx.url(prefixUrl + "/010/remove.do")			// 자료 삭제
 		}
@@ -328,11 +327,31 @@
 	/**************************************************************************
 	 *
 	 **************************************************************************/
-	// 초기 설정
+	// 저장 callback
+	${pageName}Control.onSave = (resp) => {
+		if (resp.saved)
+			${pageName}Control.load(1);
+	}
+
+	// 저장
+	${pageName}Control.save = (info) => {
+		if (!info) return;
+
+		ajax.post({
+			  url : ${pageName}Control.urls.create
+			, data : info
+			, success : resp => ${pageName}Control.onSave(resp)
+		});
+	}
+
+	/**************************************************************************
+	 * 초기 셋팅
+	 **************************************************************************/
+	// 화면 초기값 셋팅
 	function initForm${pageName}() {
 		// 달력 초기화
 		initDatepicker("frmSearch--${pageName}");
-		$("#schDateFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-365).date);
+		$("#schDateFrom--${pageName}").datepicker("setDate", new Date());
 		$("#schDateTo--${pageName}").datepicker("setDate", new Date());
 
 		${pageName}Control.dataset.clear();
@@ -340,6 +359,19 @@
 
 	// 이벤트
 	function setEvent${pageName}() {
+		// form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용
+		$("#frmSearch--${pageName}").find(".form-date").each(function() {
+			$(this).on("input",function() {
+				let value = this.value.replaceAll("-", "");
+
+				if (value.length > 7) {
+					this.value = value.substring(0,4) + "-" + value.substring(4,6) + "-" + value.substring(6);
+				} else if(value.length > 5) {
+					this.value = value.substring(0,4) + "-" + value.substring(4);
+				}
+			});
+		});
+
 		// DataTables 스크롤 이벤트
 		$("#table-responsive--${pageName}").scroll(function() {
 			let el = $(this);
@@ -410,8 +442,8 @@
 
 	}
 
-	// 등록
-	function fnCreate${pageName}() {
+	// 저장
+	function fnSave${pageName}() {
 		let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID");
 
 		// 부과제외ID 가 없다면.. return
@@ -423,10 +455,11 @@
 				bfrCrdnId : crdnId
 		};
 
-		ajax.post({
-			  url : ${pageName}Control.urls.create
-			, data : params
-//			, success : resp => ${pageName}Control.onSave(resp)
+ 		dialog.alert({
+			  content : "현재 정보를 ${prefixName} 하겠습니까?"
+			, onOK : () => {
+				${pageName}Control.save(params);
+			}
 		});
 	}
 
@@ -463,7 +496,6 @@
 		$("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked", true);
 
 		fnResetAndChangeBiz${pageName}(defaultBizValue);
-
 	});
 
 // #sourceURL=excl03010-main.jsp

From b49948c68195774e0ec231f0e04444458e4b3af1 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 31 Jul 2023 16:12:52 +0900
Subject: [PATCH 06/20] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=8E=B8?=
 =?UTF-8?q?=EC=A7=91=20=EC=88=98=EC=A0=95=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/sprt/sprt03020-main.jsp  |  64 +--
 .../js/fims/framework/cmm/xitPaintwebUtil.js  |  81 +++
 .../biz/paintweb/extensions/colormixer.js     |   1 +
 .../fims/biz/paintweb/extensions/moodle.js    | 363 -------------
 .../fims/biz/paintweb/extensions/mousekeys.js |   1 +
 .../default/script.js => guiScript.js}        |   5 +
 .../lib/fims/biz/paintweb/includes/debug.js   | 451 -----------------
 .../lib/fims/biz/paintweb/includes/json2.js   | 478 ------------------
 .../biz/paintweb/{lang/ko.js => korean.js}    |   4 +-
 .../default/layout.xhtml => layout.js}        |  11 +-
 .../lib/fims/biz/paintweb/paintweb-config.js  |  41 +-
 .../lib/fims/biz/paintweb/paintweb.js         | 331 ++----------
 .../paintweb/{includes/lib.js => pwlib.js}    |   0
 .../default => style}/icons/bcurve.png        | Bin
 .../default => style}/icons/cbucket.png       | Bin
 .../icons/clipboardPaste.png                  | Bin
 .../default => style}/icons/cpicker.png       | Bin
 .../default => style}/icons/ellipse.png       | Bin
 .../default => style}/icons/eraser.png        | Bin
 .../default => style}/icons/hand.png          | Bin
 .../default => style}/icons/help.png          | Bin
 .../default => style}/icons/historyRedo.png   | Bin
 .../default => style}/icons/historyUndo.png   | Bin
 .../default => style}/icons/i_addPhoto.png    | Bin
 .../default => style}/icons/i_block.png       | Bin
 .../default => style}/icons/i_cancel.png      | Bin
 .../biz/paintweb/style/icons/i_carnumber.png  | Bin 0 -> 41493 bytes
 .../default => style}/icons/i_centerAlign.png | Bin
 .../default => style}/icons/i_colorfill.png   | Bin
 .../default => style}/icons/i_copy.png        | Bin
 .../default => style}/icons/i_crop.png        | Bin
 .../default => style}/icons/i_cut.png         | Bin
 .../default => style}/icons/i_delete.png      | Bin
 .../default => style}/icons/i_fontBold.png    | Bin
 .../default => style}/icons/i_fontItalic.png  | Bin
 .../default => style}/icons/i_fontSize.png    | Bin
 .../default => style}/icons/i_leftAlign.png   | Bin
 .../default => style}/icons/i_paste.png       | Bin
 .../default => style}/icons/i_pinch.png       | Bin
 .../default => style}/icons/i_replay.png      | Bin
 .../default => style}/icons/i_rightAlign.png  | Bin
 .../default => style}/icons/i_rotation.png    | Bin
 .../default => style}/icons/i_save.png        | Bin
 .../default => style}/icons/i_select.png      | Bin
 .../default => style}/icons/i_square.png      | Bin
 .../default => style}/icons/imageClear.png    | Bin
 .../default => style}/icons/imageRotate.png   | Bin
 .../default => style}/icons/imageSave.png     | Bin
 .../default => style}/icons/insertimg.png     | Bin
 .../default => style}/icons/line-cap-butt.png | Bin
 .../icons/line-cap-round.png                  | Bin
 .../icons/line-cap-square.png                 | Bin
 .../icons/line-join-bevel.png                 | Bin
 .../icons/line-join-miter.png                 | Bin
 .../icons/line-join-round.png                 | Bin
 .../default => style}/icons/line.png          | Bin
 .../default => style}/icons/paintweb.png      | Bin
 .../default => style}/icons/pencil.png        | Bin
 .../default => style}/icons/polygon.png       | Bin
 .../default => style}/icons/rectangle.png     | Bin
 .../default => style}/icons/selection.png     | Bin
 .../default => style}/icons/selectionCopy.png | Bin
 .../default => style}/icons/selectionCrop.png | Bin
 .../default => style}/icons/selectionCut.png  | Bin
 .../icons/selectionDelete.png                 | Bin
 .../default => style}/icons/selectionFill.png | Bin
 .../icons/shapeType-both.png                  | Bin
 .../icons/shapeType-fill.png                  | Bin
 .../icons/shapeType-stroke.png                | Bin
 .../icons/text-align-center.png               | Bin
 .../icons/text-align-left.png                 | Bin
 .../icons/text-align-right.png                | Bin
 .../default => style}/icons/text-bold.png     | Bin
 .../default => style}/icons/text-italic.png   | Bin
 .../default => style}/icons/text-size.png     | Bin
 .../default => style}/icons/text.png          | Bin
 .../default => style}/icons/zoom.png          | Bin
 .../default => style}/images/button.png       | Bin
 .../default => style}/images/checkers-big.png | Bin
 .../default => style}/images/checkers.png     | Bin
 .../images/floatingPanel-close.png            | Bin
 .../images/floatingPanel-minimize.png         | Bin
 .../images/floatingPanel-restore.png          | Bin
 .../images/floatingPanel-title.png            | Bin
 .../images/paintweb-logo.png                  | Bin
 .../images/toolbar-colors.png                 | Bin
 .../{interfaces/default => style}/style.css   |  17 +-
 .../lib/fims/biz/paintweb/tools/selection.js  |  59 ++-
 88 files changed, 243 insertions(+), 1664 deletions(-)
 create mode 100644 src/main/webapp/resources/js/fims/framework/cmm/xitPaintwebUtil.js
 delete mode 100644 src/main/webapp/resources/lib/fims/biz/paintweb/extensions/moodle.js
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default/script.js => guiScript.js} (99%)
 delete mode 100644 src/main/webapp/resources/lib/fims/biz/paintweb/includes/debug.js
 delete mode 100644 src/main/webapp/resources/lib/fims/biz/paintweb/includes/json2.js
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{lang/ko.js => korean.js} (99%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default/layout.xhtml => layout.js} (98%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{includes/lib.js => pwlib.js} (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/bcurve.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/cbucket.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/clipboardPaste.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/cpicker.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/ellipse.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/eraser.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/hand.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/help.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/historyRedo.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/historyUndo.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_addPhoto.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_block.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_cancel.png (100%)
 create mode 100644 src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_carnumber.png
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_centerAlign.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_colorfill.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_copy.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_crop.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_cut.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_delete.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_fontBold.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_fontItalic.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_fontSize.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_leftAlign.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_paste.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_pinch.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_replay.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_rightAlign.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_rotation.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_save.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_select.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/i_square.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/imageClear.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/imageRotate.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/imageSave.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/insertimg.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/line-cap-butt.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/line-cap-round.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/line-cap-square.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/line-join-bevel.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/line-join-miter.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/line-join-round.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/line.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/paintweb.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/pencil.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/polygon.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/rectangle.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/selection.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/selectionCopy.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/selectionCrop.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/selectionCut.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/selectionDelete.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/selectionFill.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/shapeType-both.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/shapeType-fill.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/shapeType-stroke.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/text-align-center.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/text-align-left.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/text-align-right.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/text-bold.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/text-italic.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/text-size.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/text.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/icons/zoom.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/button.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/checkers-big.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/checkers.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/floatingPanel-close.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/floatingPanel-minimize.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/floatingPanel-restore.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/floatingPanel-title.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/paintweb-logo.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/images/toolbar-colors.png (100%)
 rename src/main/webapp/resources/lib/fims/biz/paintweb/{interfaces/default => style}/style.css (98%)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
index a1cddf2a..082e1c85 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
@@ -39,6 +39,7 @@
 	<link rel="stylesheet" href="<c:url value="/resources/3rd-party/jquery-ui/1.13.2/themes/redmond/jquery-ui.css"/>" />
 	<link rel="stylesheet" href="<c:url value="/resources/lib/fims/framework/datepicker/datepicker.css"/>" />
 
+	<link rel="stylesheet" href="<c:url value="/resources/lib/fims/biz/paintweb/style/style.css"/>?${ver}" />
 </head>
 <body>
 <c:set var="pageKorName" scope="request">사진 편집</c:set>
@@ -61,9 +62,14 @@
 <script src="<c:url value='/resources/3rd-party/sneat/js/config.js'/>"></script>
 <script src="<c:url value='/resources/3rd-party/sneat/libs/chartjs/chartjs.js'/>"></script>
 
-
-<script src="<c:url value='/resources/lib/fims/biz/paintweb/lang/ko.js'/>?${ver}"></script>
+<!-- json, xhtml -->
+<script src="<c:url value='/resources/lib/fims/biz/paintweb/korean.js'/>?${ver}"></script>
 <script src="<c:url value='/resources/lib/fims/biz/paintweb/paintweb-config.js'/>?${ver}"></script>
+<script src="<c:url value='/resources/lib/fims/biz/paintweb/layout.js'/>?${ver}"></script>
+<!-- init -->
+<script src="<c:url value='/resources/lib/fims/biz/paintweb/pwlib.js'/>?${ver}"></script>
+<script src="<c:url value='/resources/lib/fims/biz/paintweb/guiScript.js'/>?${ver}"></script>
+
 <script src="<c:url value='/resources/lib/fims/biz/paintweb/paintweb.js'/>?${ver}"></script>
 <script src="<c:url value='/resources/lib/fims/biz/paintweb/html2canvas.min.js'/>?${ver}"></script>
 
@@ -74,14 +80,14 @@
     //FIXME: pw instance 변수명 변경시 paintweb.js의 imageSaveTo() 내의 2564 line if(pw.image.modified) 변경 필요
     var pw;
     var originalInfomation = {};
-    let editableImage = null;
-
+    var editableImage = null;
+	var isNumberPlate = false;
+    
     const initEditor = () => {
     	
         pw = new PaintWeb();
         pw.config.imageLoad = editableImage;
         pw.config.guiPlaceholder = document.getElementById('paintWebTarget');
-        pw.config.configFile = 'paintweb-config.json?${ver}';
         pw.config.imageSave = fnImageSaveTo;
         pw.config.afterImageSave = fnAfterImageSave;
 
@@ -92,11 +98,9 @@
     	
     	console.log(doc);
     	console.log(_self);
-    	
-        const isDelete = imgWidth === 0;
         
-        if(isDelete){
-            if(!confirm('단속이미지를 정말로 삭제 하시겠습니까?'))  return;
+        if(isNumberPlate){
+            if(!confirm('번호판 이미지를 추가하시겠습니까?'))  return;
         }else{
             if(!confirm('편집한 단속이미지를 저장하시겠습니까?'))  return;
         }
@@ -105,42 +109,24 @@
  
         // var param = originalInfomation 파일아이디,단속아이디,inpoType..
 
-        // 삭제일때
-        if(isDelete){
+        // 번호판일때
+        if(isNumberPlate){
             
 
-            //cmmAjax({
-            //    url: '/somePath/removeFile.do',
-            //    data: $.param(param),
-            //    success: (res) => {
-            //        window.opener.callbackReloadImage();
-            //        window.close();
-            //    }
-            //})
+            
             return true;
-        }
-
-        // 저장일때
-        const formData = new FormData();
-        //formData.append('fileId', fileId);
-        //formData.append('file', file);
-
-        //cmmAjax({
-        //    type: 'post',
-        //    url: '/somePath/save.do',
-        //    processData: false,
-        //    contentType: false,
-        //    data: formData,
-        //    success: (res) => {
-        //        window.opener.callbackReloadImage();
-        //        window.close();
-        //    }
-        //});
-        return true;
+        } else {
+            // 저장일때
+            const formData = new FormData();
+            //formData.append('fileId', fileId);
+            //formData.append('file', file);
+            return true;
+        
+        
     };
 
     function fnAfterImageSave(){
-    	console.log('after...');
+
         window.close();
     };
 
diff --git a/src/main/webapp/resources/js/fims/framework/cmm/xitPaintwebUtil.js b/src/main/webapp/resources/js/fims/framework/cmm/xitPaintwebUtil.js
new file mode 100644
index 00000000..8a457308
--- /dev/null
+++ b/src/main/webapp/resources/js/fims/framework/cmm/xitPaintwebUtil.js
@@ -0,0 +1,81 @@
+/**
+ * 전달받은 이미지를 base64로 인코딩한다
+ * @param file - 이미지 파일 또는 이미지 URL
+ * @param maxWidth - 인코딩 시의 이미지 max width 사이즈
+ * @returns {Promise<any>}
+ */
+var readImage = () => {
+    let image = this.$refs.image.src
+    this.toBlob(image)
+        .then(res => {
+            console.log(res)
+            this.image = {
+                filename: res.name,
+                size: res.size,
+                type: res.type,
+                lastModified: res.lastModified
+            }
+        })
+};
+
+/**
+ * 이미지 url을 blob 파일로 변환하여 전달한다
+ * @param url
+ * @returns {Promise<any>}
+ */
+var toBlob = (url) => {
+    return new Promise((resolve, reject) => {
+        this.base64Encode(url)
+            .then(res => {
+                let byteString = atob(res.dataUrl)
+                let ab = new ArrayBuffer(byteString.length)
+                let ia = new Uint8Array(ab)
+
+                for (let i = 0; i < byteString.length; i++) {
+                    ia[i] = byteString.charCodeAt(i)
+                }
+
+                // write the array buffer to blob
+                let blob = new Blob([ab], {type: 'image/' + res.type})
+
+                let formData = new FormData()
+                formData.append('file', blob, res.name)
+                resolve(formData.get('file'))
+            })
+    })
+};
+
+/**
+ * 전달받은 이미지를 base64로 인코딩한다
+ */
+var base64Encode = (url) => {
+    const re = new RegExp('.(gif|jpg|jpeg|tiff|png|ico)$', 'i')
+    let name = (/[^(/|\\)]*$/).exec(url)[0]
+    let type = re.test(name) ? re.exec(name)[0].replace('.', '') : 'jpg'
+
+    return new Promise((resolve, reject) => {
+        let image = new Image()
+
+        image.onload = function (event) {
+            let canvas = document.createElement('canvas')
+            // draw canvas
+            canvas.width = image.naturalWidth
+            canvas.height = image.naturalHeight
+            canvas.getContext('2d').drawImage(image, 0, 0)
+
+            let dataUrl = canvas.toDataURL('image/' + type)
+            resolve({
+                name: name,
+                type: type,
+                dataUrl: dataUrl.split(',')[1]
+            })
+        }
+        image.onerror = function () {
+            let msg = `"${file}"을 로딩하는 데 오류가 발생하였습니다. 이미지 파일을 확인해주세요.`
+            alert(msg)
+            console.error(msg)
+        }
+        image.crossOrigin = 'anonymous';
+        image.src = url
+    })
+}
\ No newline at end of file
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/colormixer.js b/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/colormixer.js
index c6933c40..c003ad86 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/colormixer.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/colormixer.js
@@ -35,6 +35,7 @@
  * @param {PaintWeb} app Reference to the main paint application object.
  */
 pwlib.extensions.colormixer = function (app) {
+	
   var _self     = this,
       config    = app.config.colormixer,
       doc       = app.doc,
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/moodle.js b/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/moodle.js
deleted file mode 100644
index e9d3b71b..00000000
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/moodle.js
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Copyright (C) 2009 Mihai Şucan
- *
- * This file is part of PaintWeb.
- *
- * PaintWeb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PaintWeb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PaintWeb.  If not, see <http://www.gnu.org/licenses/>.
- *
- * $URL: http://code.google.com/p/paintweb $
- * $Date: 2009-10-29 19:05:49 +0200 $
- */
-
-/**
- * @author <a lang="ro" href="http://www.robodesign.ro/mihai">Mihai Şucan</a>
- * @fileOverview Holds the integration code for PaintWeb inside <a 
- * href="http://www.moodle.org">Moodle</a>.
- */
-
-/**
- * @class The Moodle extension for PaintWeb. This extension handles the Moodle 
- * integration inside the PaintWeb code.
- *
- * <p><strong>Note:</strong> This extension is supposed to work with Moodle 1.9 
- * and Moodle 2.0.
- *
- * @param {PaintWeb} app Reference to the main paint application object.
- */
-pwlib.extensions.moodle = function (app) {
-  var _self         = this,
-      appEvent      = pwlib.appEvent,
-      config        = app.config,
-      gui           = app.gui,
-      lang          = app.lang.moodle,
-      moodleServer  = config.moodleServer,
-      tinymceEditor = null,
-      qfErrorShown  = false;
-
-  // Holds information related to Moodle.
-  var moodleInfo = {
-    // Holds the URL of the image the user is saving.
-    imageURL: null,
-
-    // The class name for the element which holds the textarea buttons (toggle 
-    // on/off).
-    // This element exists only in Moodle 1.9.
-    textareaButtons: 'textareaicons',
-
-    // The image save handler script on the server-side. The path is relative to 
-    // the PaintWeb base folder.
-    // This used with Moodle 2.0.
-    imageSaveHandler20: '../ext/moodle/imagesave20.php',
-
-    // The image save handler script for Moodle 1.9.
-    imageSaveHandler19: '../ext/moodle/imagesave19.php',
-
-    // This holds the release version of Moodle being used. This should be 1.9 
-    // or 2.0.
-    release: 0,
-
-    // Moodle 2.0 draft item ID used for file storage.
-    draftitemid: null
-  };
-
-  /**
-   * The <code>extensionRegister</code> event handler. Setup event listeners, 
-   * determine Moodle version, and more.
-   *
-   * @returns {Boolean} True if the extension initialized successfully, or false 
-   * if not.
-   */
-  this.extensionRegister = function () {
-    // Register application events.
-    app.events.add('guiShow',   this.guiShow);
-    app.events.add('guiHide',   this.guiHide);
-    app.events.add('imageSave', this.imageSave);
-
-    if (moodleServer && moodleServer.release) {
-      var matches = moodleServer.release.match(/^\s*(\d+\.\d+)/);
-      if (matches && matches[1]) {
-        moodleInfo.release = parseFloat(matches[1]);
-      }
-    }
-
-    if (typeof window.qf_errorHandler === 'function' && config.tinymce && 
-        !config.tinymce.onSubmitUnsaved) {
-      config.tinymce.onSubmitUnsaved = this.onSubmitUnsaved;
-    }
-
-    return true;
-  };
-
-  /**
-   * The <code>submit</code> event handler for the form to which the PaintWeb 
-   * instance is attached to. This method is invoked by the TinyMCE plugin when 
-   * the form is submitted while the user edits an image with unsaved changes.
-   * @private
-   */
-  this.onSubmitUnsaved = function () {
-    var tmce           = config.tinymceEditor,
-        textarea       = tmce ? tmce.getElement() : null,
-        guiPlaceholder = config.guiPlaceholder,
-        prevSibling    = guiPlaceholder.previousSibling;
-
-    if (tmce && textarea && window.qf_errorHandler) {
-      try {
-        qf_errorHandler(textarea, "\n - " + lang.errorSubmitUnsaved);
-      } catch (err) {
-        return;
-      }
-
-      qfErrorShown = true;
-
-      // Due to the styling of the error shown by Moodle, PaintWeb must have 
-      // clear:right.
-      if (prevSibling && prevSibling.className && 
-          prevSibling.className.indexOf('paintweb_tinymce_status') !== -1) {
-        prevSibling.style.clear = 'right';
-      } else {
-        guiPlaceholder.style.clear = 'right';
-      }
-    }
-  };
-
-  /**
-   * The <code>imageSave</code> application event handler. When the user 
-   * attempts to save an image, this extension handles the event by sending the 
-   * image data to the Moodle server, to perform the actual save operation.
-   *
-   * @private
-   * @param {pwlib.appEvent.imageSave} ev The application event object.
-   */
-  this.imageSave = function (ev) {
-    if (!ev.dataURL) {
-      return;
-    }
-
-    ev.preventDefault();
-
-    moodleInfo.imageURL = config.imageLoad.src;
-    if (!moodleInfo.imageURL || moodleInfo.imageURL.substr(0, 5) === 'data:') {
-      moodleInfo.imageURL = '-';
-    }
-
-    if (config.moodleSaveMethod === 'dataURL') {
-      app.events.dispatch(new appEvent.imageSaveResult(true, 
-            moodleInfo.imageURL, ev.dataURL));
-
-    } else {
-      var handlerURL = PaintWeb.baseFolder,
-          send       = 'url=' + encodeURIComponent(moodleInfo.imageURL) +
-                       '&dataURL=' + encodeURIComponent(ev.dataURL),
-          headers    = {'Content-Type': 'application/x-www-form-urlencoded'};
-
-      // In Moodle 2.0 we include the context ID and the draft item ID, such 
-      // that the image save script can properly save the new image inside the 
-      // current draft area of the current textarea element.
-      if (moodleInfo.release >= 2) {
-        handlerURL += moodleInfo.imageSaveHandler20;
-        if (moodleServer.contextid) {
-          send += '&contextid=' + encodeURIComponent(moodleServer.contextid);
-        }
-        if (moodleInfo.draftitemid) {
-          send += '&draftitemid=' + encodeURIComponent(moodleInfo.draftitemid);
-        }
-
-      } else {
-        handlerURL += moodleInfo.imageSaveHandler19;
-      }
-
-      pwlib.xhrLoad(handlerURL, imageSaveReady, 'POST', send, headers);
-    }
-  };
-
-  /**
-   * The image save <code>onreadystatechange</code> event handler for the 
-   * <code>XMLHttpRequest</code> which performs the image save. This function 
-   * uses the reply to determine if the image save operation is successful or 
-   * not.
-   *
-   * <p>The {@link pwlib.appEvent.imageSaveResult} application event is 
-   * dispatched.
-   *
-   * <p>The server-side script must reply with a JSON object with the following 
-   * properties:
-   *
-   * <ul>
-   *   <li><var>successful</var> which tells if the image save operation was 
-   *   successful or not;
-   *
-   *   <li><var>url</var> which must tell the same URL as the image we just 
-   *   saved (sanity/security check);
-   *
-   *   <li><var>urlNew</var> is optional. This allows the server-side script to 
-   *   change the image URL;
-   *
-   *   <li><var>errorMessage</var> is optional. When the image save was not 
-   *   successful, an error message can be displayed.
-   * </ul>
-   *
-   * @private
-   * @param {XMLHttpRequest} xhr The XMLHttpRequest object.
-   */
-  function imageSaveReady (xhr) {
-    if (!xhr || xhr.readyState !== 4) {
-      return;
-    }
-
-    var result = {successful: false, url: moodleInfo.imageURL};
-
-    if ((xhr.status !== 304 && xhr.status !== 200) || !xhr.responseText) {
-      alert(lang.xhrRequestFailed);
-
-      app.events.dispatch(new appEvent.imageSaveResult(false, result.url, null, 
-            lang.xhrRequestFailed));
-
-      return;
-    }
-
-    try {
-      result = JSON.parse(xhr.responseText);
-    } catch (err) {
-      result.errorMessage = lang.jsonParseFailed + "\n" + err;
-      alert(result.errorMessage);
-    }
-
-    if (result.successful) {
-      if (result.url !== moodleInfo.imageURL) {
-        alert(pwlib.strf(lang.urlMismatch, {
-                url: moodleInfo.imageURL,
-                urlServer: result.url || 'null'}));
-      }
-    } else {
-      if (result.errorMessage) {
-        alert(lang.imageSaveFailed + "\n" + result.errorMessage);
-      } else {
-        alert(lang.imageSaveFailed);
-      }
-    }
-
-    app.events.dispatch(new appEvent.imageSaveResult(result.successful, 
-          result.url, result.urlNew, result.errorMessage));
-  };
-
-  /**
-   * The <code>guiShow</code> application event handler. When the PaintWeb GUI 
-   * is shown, we must hide the textarea icons for the current textarea element, 
-   * inside a Moodle page.
-   * @private
-   */
-  this.guiShow = function () {
-    var pNode = config.guiPlaceholder.parentNode,
-        textareaButtons  
-          = pNode.getElementsByClassName(moodleInfo.textareaButtons)[0];
-
-    // These show in Moodle 1.9.
-    if (textareaButtons) {
-      textareaButtons.style.display = 'none';
-    }
-
-    qfErrorShown = false;
-
-    // For Moodle 2.0 we must determine the draft item ID in order to properly 
-    // perform the image save operation into the current draft area.
-    if (moodleInfo.release < 2) {
-      return;
-    }
-
-    // Typically the TinyMCE editor instance is attached to a textarea element 
-    // which has a name=whatever[text] or similar form. In the same form as the 
-    // textarea, there must be a hidden input element with the 
-    // name=whatever[itemid]. The value of that input holds the draft item ID.
-    var tmce     = config.tinymceEditor,
-        textarea = tmce ? tmce.getElement() : null,
-        frm      = textarea ? textarea.form : null;
-
-    if (!tmce || !textarea || !textarea.name || !frm) {
-      return;
-    }
-
-    var fieldname = textarea.name.replace(/\[text\]$/, '');
-    if (!fieldname) {
-      return;
-    }
-
-    var draftitemid = frm.elements.namedItem(fieldname + '[itemid]'),
-        format = frm.elements.namedItem(fieldname + '[format]');
-
-    if (draftitemid) {
-      moodleInfo.draftitemid = draftitemid.value;
-    }
-
-    if (format) {
-      format.style.display = 'none';
-    }
-  };
-
-  /**
-   * The <code>guiHide</code> application event handler. When the PaintWeb GUI 
-   * is hidden, we must show again the textarea icons for the current textarea 
-   * element, inside a Moodle page.
-   * @private
-   */
-  this.guiHide = function () {
-    var guiPlaceholder = config.guiPlaceholder,
-        prevSibling = guiPlaceholder.previousSibling;
-        pNode = guiPlaceholder.parentNode,
-        textareaButtons 
-          = pNode.getElementsByClassName(moodleInfo.textareaButtons)[0];
-
-    // These show in Moodle 1.9.
-    if (textareaButtons) {
-      textareaButtons.style.display = '';
-    }
-
-    var tmce     = config.tinymceEditor,
-        textarea = tmce ? tmce.getElement() : null,
-        frm      = textarea ? textarea.form : null;
-
-    if (!tmce || !textarea || !textarea.name || !frm) {
-      return;
-    }
-
-    if (qfErrorShown) {
-      if (window.qf_errorHandler) {
-        qf_errorHandler(textarea, '');
-      }
-
-      if (prevSibling && prevSibling.className && 
-          prevSibling.className.indexOf('paintweb_tinymce_status') !== -1) {
-        prevSibling.style.clear = '';
-      } else {
-        guiPlaceholder.style.clear = '';
-      }
-    }
-
-    // The format input element only shows in Moodle 2.0.
-    if (moodleInfo.release >= 2) {
-      var fieldname = textarea.name.replace(/\[text\]$/, '');
-      if (!fieldname) {
-        return;
-      }
-
-      var format = frm.elements.namedItem(fieldname + '[format]');
-
-      if (format) {
-        format.style.display = '';
-      }
-    }
-  };
-};
-
-// vim:set spell spl=en fo=wan1croqlt tw=80 ts=2 sw=2 sts=2 sta et ai cin fenc=utf-8 ff=unix:
-
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/mousekeys.js b/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/mousekeys.js
index fca2e836..4466b457 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/mousekeys.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/extensions/mousekeys.js
@@ -32,6 +32,7 @@
  * @param {PaintWeb} app Reference to the main paint application object.
  */
 pwlib.extensions.mousekeys = function (app) {
+
   var _self     = this,
       canvas    = app.buffer.canvas,
       config    = app.config,
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/script.js b/src/main/webapp/resources/lib/fims/biz/paintweb/guiScript.js
similarity index 99%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/script.js
rename to src/main/webapp/resources/lib/fims/biz/paintweb/guiScript.js
index 86050415..6aa6a6ea 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/script.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/guiScript.js
@@ -872,10 +872,12 @@ pwlib.gui = function (app) {
 
     var selCrop   = this.commands.selectionCrop,
         selFill   = this.commands.selectionFill,
+		selForNumPlt   = this.commands.selectionForNumberPlate,
         selDelete = this.commands.selectionDelete;
 
     selCrop.className   += classDisabled;
     selFill.className   += classDisabled;
+	selForNumPlt.className   += classDisabled;
     selDelete.className += classDisabled;
 
     return true;
@@ -1000,6 +1002,9 @@ pwlib.gui = function (app) {
       placeholder.focus();
     } catch (err) { }
 
+
+	this.toolActivate("selection"); //영역 선택
+	
     app.events.dispatch(new appEvent.guiShow());
   };
 
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/includes/debug.js b/src/main/webapp/resources/lib/fims/biz/paintweb/includes/debug.js
deleted file mode 100644
index 810e2c6b..00000000
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/includes/debug.js
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright (C) 2008, 2009 Mihai Şucan
- *
- * This file is part of PaintWeb.
- *
- * PaintWeb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PaintWeb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PaintWeb.  If not, see <http://www.gnu.org/licenses/>.
- *
- * $URL: http://code.google.com/p/paintweb $
- * $Date: 2009-05-11 19:37:56 +0300 $
- */
-
-/**
- * @author <a lang="ro" href="http://www.robodesign.ro/mihai">Mihai Şucan</a>
- * @fileOverview Minimal code used for aiding debugging PaintWeb.
- */
-
-// Opera compatibility
-if (!window.console) {
-  /**
-   * @namespace Holds a simple method used for debugging. Opera doesn't have the 
-   * window.console API like Firefox+Firebug has.
-   */
-  window.console = {};
-}
-
-if (!window.console.log) {
-  /**
-   * Display a message in the debugger. If available, opera.postError is used, 
-   * otherwise no message is displayed.
-   *
-   * @param {mixed} mixed Any number of arguments, each one is displayed in the 
-   * debugger.
-   */
-  window.console.log = function () {
-    var msg = '';
-
-    for (var i = 0, n = arguments.length; i < n; i++) {
-      msg += arguments[i] + ' ';
-    }
-
-    if (window.opera && window.opera.postError) {
-      opera.postError(msg);
-    }
-  };
-}
-
-if (!window.console.warn) {
-  /**
-   * Display a message in the debugger. If available, opera.postError is used, 
-   * otherwise no warning is displayed.
-   *
-   * @param {mixed} mixed Any number of arguments, each one is displayed in the 
-   * debugger.
-   */
-  window.console.warn = function () {
-    console.log.apply(null, arguments);
-  };
-}
-
-/**
- * JavaScript code performance profiler.
- * <p>Nested timers are accounted for - see the example below.
- *
- * @example
- * <code>// To profile your code just do:
- * var profiler = new $.profiler();
- *
- * profiler.start('long test');
- *   // ... more code ...
- *   profiler.start('function 1');
- *   // ... more code ...
- *   profiler.stop('function 1');
- *   // ... more code ...
- *   profiler.start('function 2');
- *   // ... more code ...
- *   profiler.stop('function 2');
- *   // ... more code ...
- * profiler.stop('long test');
- *
- * // To see the results do:
- * profiler.reportText();
- * // or ..
- * profiler.reportData();</code>
- *
- * @class JavaScript code performance profiler.
- */
-var libProfiler = function () {
-  /**
-   * @ignore
-   * @class Function timer. This is the constructor used for instancing a single 
-   * timer object created by the profiler.
-   *
-   * @private
-   * @param {String} name_ The timer name.
-   * @param {Boolean} [independent_=false] Tells if the timer is independent.  
-   * Means this timer will not affect the timers execution stack.
-   */
-  function fnTimer (name_, independent_) {
-    this.avgOwnTimePerCall = 0;
-    this.avgRunTimePerCall = 0;
-    this.calls = 0;
-    this.maxOwnTimePerCall = 0;
-    this.maxRunTimePerCall = 0;
-    this.minOwnTimePerCall = 0;
-    this.minRunTimePerCall = 0;
-    this.name = name_;
-    this.ownTimeTotal = 0;
-    this.runTimeTotal = 0;
-    this.state = fnTimer.STATE_NONE;
-    this.independent = independent_;
-
-    var startTime_ = 0,
-        subTimerStart_ = 0,
-        subTime_ = 0,
-        stack_ = 0;
-
-    /*
-     * Start timing function execution.
-     */
-    this.start = function () {
-      if (this.state == fnTimer.STATE_START ||
-          this.state == fnTimer.STATE_SUB) {
-        stack_++;
-        return;
-      }
-
-      startTime_ = (new Date ()).getTime();
-      this.state = fnTimer.STATE_START;
-    };
-
-    /*
-     * Stop timing function execution.
-     */
-    this.stop = function () {
-      if (this.state == fnTimer.STATE_SUB) {
-        this.subTimerEnd();
-      }
-
-      if (this.state != fnTimer.STATE_START) {
-        return;
-      }
-
-      this.calls++;
-
-      if (stack_) {
-        stack_--;
-        return;
-      }
-
-      var runTime = (new Date ()).getTime() - startTime_;
-      var ownTime = runTime - subTime_;
-      subTime_ = 0;
-
-      this.runTimeTotal += runTime;
-      this.ownTimeTotal += ownTime;
-
-      this.avgRunTimePerCall = this.runTimeTotal / this.calls;
-      this.avgOwnTimePerCall = this.ownTimeTotal / this.calls;
-
-      if (runTime < this.minRunTimePerCall) {
-        this.minRunTimePerCall = runTime;
-      }
-
-      if (runTime > this.maxRunTimePerCall) {
-        this.maxRunTimePerCall = runTime;
-      }
-
-      if (ownTime < this.minOwnTimePerCall) {
-        this.minOwnTimePerCall = ownTime;
-      }
-
-      if (ownTime > this.maxOwnTimePerCall) {
-        this.maxOwnTimePerCall = ownTime;
-      }
-
-      this.state = fnTimer.STATE_STOP;
-    };
-
-    /*
-     * Start timing sub-function execution. The sub-function execution timer is 
-     * used for calculating the ownTime (runTime - sub-function execution time).
-     */
-    this.subTimerStart = function () {
-      if (this.independent || this.state != fnTimer.STATE_START) {
-        return;
-      }
-
-      subTimerStart_ = (new Date()).getTime();
-
-      this.state = fnTimer.STATE_SUB;
-    };
-
-    /*
-     * Stop timing sub-function execution.
-     */
-    this.subTimerEnd = function () {
-      if (this.independent || this.state != fnTimer.STATE_SUB) {
-        return;
-      }
-
-      subTime_ += (new Date()).getTime() - subTimerStart_;
-      this.state = fnTimer.STATE_START;
-    };
-  };
-
-  fnTimer.STATE_NONE    = 0;
-  fnTimer.STATE_START   = 1;
-  fnTimer.STATE_SUB     = 2;
-  fnTimer.STATE_STOP    = 3;
-
-  /**
-   * Holds the timer objects.
-   */
-  this.timers = {};
-
-  var activeTimer_ = null,
-      timersStack_ = [];
-
-  /**
-   * Start/create a function timer.
-   *
-   * @param {String} name The timer name.
-   * @param {Boolean} [independent=false] Tells if the timer should be 
-   * independent or not. This means that this new function timer is not be 
-   * considered affecting the execution time of existing function timers in the 
-   * call stack.
-   */
-  this.start = function (name, independent) {
-    var timer = this.timers[name];
-    if (!timer) {
-      timer = this.timers[name] = new fnTimer(name, independent);
-    }
-
-    if (!timer.independent && activeTimer_ != name) {
-      var activeTimer = activeTimer_ ? this.timers[activeTimer_] : null;
-
-      if (activeTimer && activeTimer.state == fnTimer.STATE_START) {
-        timersStack_.push(activeTimer_);
-        activeTimer.subTimerStart();
-      }
-
-      activeTimer_ = name;
-    }
-
-    timer.start();
-  };
-
-  /**
-   * Stop a function timer.
-   */
-  this.stop = function (name) {
-    var timer = this.timers[name];
-    if (!timer) {
-      return;
-    }
-
-    timer.stop();
-
-    if (timer.independent || name != activeTimer_ ||
-        name == activeTimer_ && timer.state == fnTimer.STATE_START) {
-      return;
-    }
-
-    if (timersStack_.length > 0) {
-      activeTimer_ = timersStack_.pop();
-
-      var activeTimer = this.timers[activeTimer_];
-      activeTimer.subTimerEnd();
-
-    } else {
-      activeTimer_ = null;
-    }
-  };
-
-  /**
-   * Generate timers report data.
-   *
-   * @returns {Object} Holds all the information gathered by the timers.
-   */
-  this.reportData = function () {
-    var name, timer, timerDetails,
-        data = {
-          avgCallsPerTimer: 0,
-          avgOwnTimePerCall: 0,
-          avgOwnTimePerTimer: 0,
-          avgRunTimePerCall: 0,
-          avgRunTimePerTimer: 0,
-          callsTotal: 0,
-          maxCallsPerTimer: 0,
-          maxCallsPerTimerName: '',
-          maxOwnTimePerCall: 0,
-          maxOwnTimePerCallName: '',
-          maxRunTimePerCall: 0,
-          maxRunTimePerCallName: '',
-          minCallsPerTimer: 0,
-          minCallsPerTimerName: '',
-          minOwnTimePerCall: 0,
-          minOwnTimePerCallName: '',
-          minRunTimePerCall: 0,
-          minRunTimePerCallName: '',
-          ownTimeTotal: 0,
-          runTimeTotal: 0,
-          timers: 0,
-          timerDetails: []
-        };
-
-    for (name in this.timers) {
-      timer = this.timers[name];
-      if (timer.state != fnTimer.STATE_STOP) {
-        continue;
-      }
-
-      timerDetails = {
-        name: name,
-        avgOwnTimePerCall: timer.avgOwnTimePerCall,
-        avgRunTimePerCall: timer.avgRunTimePerCall,
-        calls: timer.calls,
-        maxOwnTimePerCall: timer.maxOwnTimePerCall,
-        maxRunTimePerCall: timer.maxRunTimePerCall,
-        minOwnTimePerCall: timer.minOwnTimePerCall,
-        minRunTimePerCall: timer.minRunTimePerCall,
-        runTimeTotal: timer.runTimeTotal,
-        ownTimeTotal: timer.ownTimeTotal
-      };
-      data.timerDetails.push(timerDetails);
-
-      if (timer.calls > data.maxCallsPerTimer || !data.timers) {
-        data.maxCallsPerTimer = timer.calls;
-        data.maxCallsPerTimerName = name;
-      }
-
-      if (timer.maxOwnTimePerCall > data.maxOwnTimePerCall || !data.timers) {
-        data.maxOwnTimePerCall = timer.maxOwnTimePerCall;
-        data.maxOwnTimePerCallName = name;
-      }
-
-      if (timer.maxRunTimePerCall > data.maxRunTimePerCall || !data.timers) {
-        data.maxRunTimePerCall = timer.maxRunTimePerCall;
-        data.maxRunTimePerCallName = name;
-      }
-
-      if (timer.calls < data.minCallsPerTimer || !data.timers) {
-        data.minCallsPerTimer = timer.calls;
-        data.minCallsPerTimerName = name;
-      }
-
-      if (timer.minOwnTimePerCall < data.minOwnTimePerCall || !data.timers) {
-        data.minOwnTimePerCall = timer.minOwnTimePerCall;
-        data.minOwnTimePerCallName = name;
-      }
-
-      if (timer.minRunTimePerCall < data.minRunTimePerCall || !data.timers) {
-        data.minRunTimePerCall = timer.minRunTimePerCall;
-        data.minRunTimePerCallName = name;
-      }
-
-      data.runTimeTotal += timer.runTimeTotal;
-      data.ownTimeTotal += timer.ownTimeTotal;
-      data.callsTotal += timer.calls;
-      data.timers++;
-    }
-
-    if (data.timers == 0) {
-      return data;
-    }
-
-    data.avgCallsPerTimer = data.callsTotal / data.timers;
-    data.avgOwnTimePerCall = data.ownTimeTotal / data.callsTotal;
-    data.avgOwnTimePerTimer = data.ownTimeTotal / data.timers;
-    data.avgRunTimePerCall = data.runTimeTotal / data.callsTotal;
-    data.avgRunTimePerTimer = data.runTimeTotal / data.timers;
-
-    return data;
-  };
-
-  /**
-   * Generate a report in text format.
-   *
-   * @returns {String} All the information gathered by the timers, as text.
-   */
-  this.reportText = function () {
-    var data = this.reportData(),
-        timer, result = '';
-
-    if (!data.timers) {
-      return '';
-    }
-
-    for (var i = 0; i < data.timers; i++) {
-      timer = data.timerDetails[i];
-      result += timer.name + ":\n" +
-        '  Avg ownTime / call: ' + timer.avgOwnTimePerCall + " ms\n" +
-        '  Avg runTime / call: ' + timer.avgRunTimePerCall + " ms\n" +
-        '  Calls: ' + timer.calls + "\n"+
-        '  Max ownTime / call: ' + timer.maxOwnTimePerCall + " ms\n" +
-        '  Max runTime / call: ' + timer.maxRunTimePerCall + " ms\n" +
-        '  Min ownTime / call: ' + timer.minOwnTimePerCall + " ms\n" +
-        '  Min runTime / call: ' + timer.minRunTimePerCall + " ms\n" +
-        '  runTime: ' + timer.runTimeTotal + " ms\n" +
-        '  ownTime: ' + timer.ownTimeTotal + " ms\n\n";
-    }
-
-    result += "Overview info:\n" +
-      '  Avg calls / timer: ' + data.avgCallsPerTimer + "\n" +
-      '  Avg ownTime / call: ' + data.avgOwnTimePerCall + " ms\n" +
-      '  Avg ownTime / timer: ' + data.avgOwnTimePerTimer + " ms\n" +
-      '  Avg runTime / call: ' + data.avgRunTimePerCall + " ms\n" +
-      '  Avg runTime / timer: ' + data.avgRunTimePerTimer + " ms\n" +
-      '  Calls total: ' + data.callsTotal + "\n" +
-      '  Max calls / timer: ' + data.maxCallsPerTimer + ' (' +
-           data.maxCallsPerTimerName + ")\n" +
-      '  Max ownTime / call: ' + data.maxOwnTimePerCall + ' ms (' +
-           data.maxOwnTimePerCallName + ")\n" +
-      '  Max runTime / call: ' + data.maxRunTimePerCall + ' ms (' +
-           data.maxRunTimePerCallName + ")\n" +
-      '  Min calls / timer: ' + data.minCallsPerTimer + ' (' +
-           data.minCallsPerTimerName + ")\n" +
-      '  Min ownTime / call: ' + data.minOwnTimePerCall + ' ms (' +
-           data.minOwnTimePerCallName + ")\n" +
-      '  Min runTime / call: ' + data.minRunTimePerCall + ' ms (' +
-           data.minRunTimePerCallName + ")\n" +
-      '  Accumulated ownTime: ' + data.ownTimeTotal + " ms\n" +
-      '  Accumulated runTime: ' + data.runTimeTotal + " ms\n" +
-      '  Timers: ' + data.timers;
-
-    return result;
-  };
-
-  /**
-   * Reset/clear all the timers.
-   */
-  this.reset = function () {
-    this.timers = {};
-    activeTimer_ = null;
-    timersStack_ = [];
-  };
-};
-
-// vim:set spell spl=en fo=wan1croqlt tw=80 ts=2 sw=2 sts=2 sta et ai cin fenc=utf-8 ff=unix:
-
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/includes/json2.js b/src/main/webapp/resources/lib/fims/biz/paintweb/includes/json2.js
deleted file mode 100644
index 7e27df51..00000000
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/includes/json2.js
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
-    http://www.JSON.org/json2.js
-    2009-04-16
-
-    Public Domain.
-
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-    See http://www.JSON.org/js.html
-
-    This file creates a global JSON object containing two methods: stringify
-    and parse.
-
-        JSON.stringify(value, replacer, space)
-            value       any JavaScript value, usually an object or array.
-
-            replacer    an optional parameter that determines how object
-                        values are stringified for objects. It can be a
-                        function or an array of strings.
-
-            space       an optional parameter that specifies the indentation
-                        of nested structures. If it is omitted, the text will
-                        be packed without extra whitespace. If it is a number,
-                        it will specify the number of spaces to indent at each
-                        level. If it is a string (such as '\t' or '&nbsp;'),
-                        it contains the characters used to indent at each level.
-
-            This method produces a JSON text from a JavaScript value.
-
-            When an object value is found, if the object contains a toJSON
-            method, its toJSON method will be called and the result will be
-            stringified. A toJSON method does not serialize: it returns the
-            value represented by the name/value pair that should be serialized,
-            or undefined if nothing should be serialized. The toJSON method
-            will be passed the key associated with the value, and this will be
-            bound to the object holding the key.
-
-            For example, this would serialize Dates as ISO strings.
-
-                Date.prototype.toJSON = function (key) {
-                    function f(n) {
-                        // Format integers to have at least two digits.
-                        return n < 10 ? '0' + n : n;
-                    }
-
-                    return this.getUTCFullYear()   + '-' +
-                         f(this.getUTCMonth() + 1) + '-' +
-                         f(this.getUTCDate())      + 'T' +
-                         f(this.getUTCHours())     + ':' +
-                         f(this.getUTCMinutes())   + ':' +
-                         f(this.getUTCSeconds())   + 'Z';
-                };
-
-            You can provide an optional replacer method. It will be passed the
-            key and value of each member, with this bound to the containing
-            object. The value that is returned from your method will be
-            serialized. If your method returns undefined, then the member will
-            be excluded from the serialization.
-
-            If the replacer parameter is an array of strings, then it will be
-            used to select the members to be serialized. It filters the results
-            such that only members with keys listed in the replacer array are
-            stringified.
-
-            Values that do not have JSON representations, such as undefined or
-            functions, will not be serialized. Such values in objects will be
-            dropped; in arrays they will be replaced with null. You can use
-            a replacer function to replace those with JSON values.
-            JSON.stringify(undefined) returns undefined.
-
-            The optional space parameter produces a stringification of the
-            value that is filled with line breaks and indentation to make it
-            easier to read.
-
-            If the space parameter is a non-empty string, then that string will
-            be used for indentation. If the space parameter is a number, then
-            the indentation will be that many spaces.
-
-            Example:
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}]);
-            // text is '["e",{"pluribus":"unum"}]'
-
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
-            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
-
-            text = JSON.stringify([new Date()], function (key, value) {
-                return this[key] instanceof Date ?
-                    'Date(' + this[key] + ')' : value;
-            });
-            // text is '["Date(---current time---)"]'
-
-
-        JSON.parse(text, reviver)
-            This method parses a JSON text to produce an object or array.
-            It can throw a SyntaxError exception.
-
-            The optional reviver parameter is a function that can filter and
-            transform the results. It receives each of the keys and values,
-            and its return value is used instead of the original value.
-            If it returns what it received, then the structure is not modified.
-            If it returns undefined then the member is deleted.
-
-            Example:
-
-            // Parse the text. Values that look like ISO date strings will
-            // be converted to Date objects.
-
-            myData = JSON.parse(text, function (key, value) {
-                var a;
-                if (typeof value === 'string') {
-                    a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
-                    if (a) {
-                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
-                            +a[5], +a[6]));
-                    }
-                }
-                return value;
-            });
-
-            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
-                var d;
-                if (typeof value === 'string' &&
-                        value.slice(0, 5) === 'Date(' &&
-                        value.slice(-1) === ')') {
-                    d = new Date(value.slice(5, -1));
-                    if (d) {
-                        return d;
-                    }
-                }
-                return value;
-            });
-
-
-    This is a reference implementation. You are free to copy, modify, or
-    redistribute.
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
-*/
-
-/*jslint evil: true */
-
-/*global JSON */
-
-/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
-    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
-    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
-    lastIndex, length, parse, prototype, push, replace, slice, stringify,
-    test, toJSON, toString, valueOf
-*/
-
-// Create a JSON object only if one does not already exist. We create the
-// methods in a closure to avoid creating global variables.
-
-if (!this.JSON) {
-    JSON = {};
-}
-(function () {
-
-    function f(n) {
-        // Format integers to have at least two digits.
-        return n < 10 ? '0' + n : n;
-    }
-
-    if (typeof Date.prototype.toJSON !== 'function') {
-
-        Date.prototype.toJSON = function (key) {
-
-            return this.getUTCFullYear()   + '-' +
-                 f(this.getUTCMonth() + 1) + '-' +
-                 f(this.getUTCDate())      + 'T' +
-                 f(this.getUTCHours())     + ':' +
-                 f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z';
-        };
-
-        String.prototype.toJSON =
-        Number.prototype.toJSON =
-        Boolean.prototype.toJSON = function (key) {
-            return this.valueOf();
-        };
-    }
-
-    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        gap,
-        indent,
-        meta = {    // table of character substitutions
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        },
-        rep;
-
-
-    function quote(string) {
-
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can safely slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe escape
-// sequences.
-
-        escapable.lastIndex = 0;
-        return escapable.test(string) ?
-            '"' + string.replace(escapable, function (a) {
-                var c = meta[a];
-                return typeof c === 'string' ? c :
-                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-            }) + '"' :
-            '"' + string + '"';
-    }
-
-
-    function str(key, holder) {
-
-// Produce a string from holder[key].
-
-        var i,          // The loop counter.
-            k,          // The member key.
-            v,          // The member value.
-            length,
-            mind = gap,
-            partial,
-            value = holder[key];
-
-// If the value has a toJSON method, call it to obtain a replacement value.
-
-        if (value && typeof value === 'object' &&
-                typeof value.toJSON === 'function') {
-            value = value.toJSON(key);
-        }
-
-// If we were called with a replacer function, then call the replacer to
-// obtain a replacement value.
-
-        if (typeof rep === 'function') {
-            value = rep.call(holder, key, value);
-        }
-
-// What happens next depends on the value's type.
-
-        switch (typeof value) {
-        case 'string':
-            return quote(value);
-
-        case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
-            return isFinite(value) ? String(value) : 'null';
-
-        case 'boolean':
-        case 'null':
-
-// If the value is a boolean or null, convert it to a string. Note:
-// typeof null does not produce 'null'. The case is included here in
-// the remote chance that this gets fixed someday.
-
-            return String(value);
-
-// If the type is 'object', we might be dealing with an object or an array or
-// null.
-
-        case 'object':
-
-// Due to a specification blunder in ECMAScript, typeof null is 'object',
-// so watch out for that case.
-
-            if (!value) {
-                return 'null';
-            }
-
-// Make an array to hold the partial results of stringifying this object value.
-
-            gap += indent;
-            partial = [];
-
-// Is the value an array?
-
-            if (Object.prototype.toString.apply(value) === '[object Array]') {
-
-// The value is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
-                length = value.length;
-                for (i = 0; i < length; i += 1) {
-                    partial[i] = str(i, value) || 'null';
-                }
-
-// Join all of the elements together, separated with commas, and wrap them in
-// brackets.
-
-                v = partial.length === 0 ? '[]' :
-                    gap ? '[\n' + gap +
-                            partial.join(',\n' + gap) + '\n' +
-                                mind + ']' :
-                          '[' + partial.join(',') + ']';
-                gap = mind;
-                return v;
-            }
-
-// If the replacer is an array, use it to select the members to be stringified.
-
-            if (rep && typeof rep === 'object') {
-                length = rep.length;
-                for (i = 0; i < length; i += 1) {
-                    k = rep[i];
-                    if (typeof k === 'string') {
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
-                for (k in value) {
-                    if (Object.hasOwnProperty.call(value, k)) {
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            }
-
-// Join all of the member texts together, separated with commas,
-// and wrap them in braces.
-
-            v = partial.length === 0 ? '{}' :
-                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
-                        mind + '}' : '{' + partial.join(',') + '}';
-            gap = mind;
-            return v;
-        }
-    }
-
-// If the JSON object does not yet have a stringify method, give it one.
-
-    if (typeof JSON.stringify !== 'function') {
-        JSON.stringify = function (value, replacer, space) {
-
-// The stringify method takes a value and an optional replacer, and an optional
-// space parameter, and returns a JSON text. The replacer can be a function
-// that can replace values, or an array of strings that will select the keys.
-// A default replacer method can be provided. Use of the space parameter can
-// produce text that is more easily readable.
-
-            var i;
-            gap = '';
-            indent = '';
-
-// If the space parameter is a number, make an indent string containing that
-// many spaces.
-
-            if (typeof space === 'number') {
-                for (i = 0; i < space; i += 1) {
-                    indent += ' ';
-                }
-
-// If the space parameter is a string, it will be used as the indent string.
-
-            } else if (typeof space === 'string') {
-                indent = space;
-            }
-
-// If there is a replacer, it must be a function or an array.
-// Otherwise, throw an error.
-
-            rep = replacer;
-            if (replacer && typeof replacer !== 'function' &&
-                    (typeof replacer !== 'object' ||
-                     typeof replacer.length !== 'number')) {
-                throw new Error('JSON.stringify');
-            }
-
-// Make a fake root object containing our value under the key of ''.
-// Return the result of stringifying the value.
-
-            return str('', {'': value});
-        };
-    }
-
-
-// If the JSON object does not yet have a parse method, give it one.
-
-    if (typeof JSON.parse !== 'function') {
-        JSON.parse = function (text, reviver) {
-
-// The parse method takes a text and an optional reviver function, and returns
-// a JavaScript value if the text is a valid JSON text.
-
-            var j;
-
-            function walk(holder, key) {
-
-// The walk method is used to recursively walk the resulting structure so
-// that modifications can be made.
-
-                var k, v, value = holder[key];
-                if (value && typeof value === 'object') {
-                    for (k in value) {
-                        if (Object.hasOwnProperty.call(value, k)) {
-                            v = walk(value, k);
-                            if (v !== undefined) {
-                                value[k] = v;
-                            } else {
-                                delete value[k];
-                            }
-                        }
-                    }
-                }
-                return reviver.call(holder, key, value);
-            }
-
-
-// Parsing happens in four stages. In the first stage, we replace certain
-// Unicode characters with escape sequences. JavaScript handles many characters
-// incorrectly, either silently deleting them, or treating them as line endings.
-
-            cx.lastIndex = 0;
-            if (cx.test(text)) {
-                text = text.replace(cx, function (a) {
-                    return '\\u' +
-                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-                });
-            }
-
-// In the second stage, we run the text against regular expressions that look
-// for non-JSON patterns. We are especially concerned with '()' and 'new'
-// because they can cause invocation, and '=' because it can cause mutation.
-// But just to be safe, we want to reject all unexpected forms.
-
-// We split the second stage into 4 regexp operations in order to work around
-// crippling inefficiencies in IE's and Safari's regexp engines. First we
-// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
-// replace all simple value tokens with ']' characters. Third, we delete all
-// open brackets that follow a colon or comma or that begin the text. Finally,
-// we look to see that the remaining characters are only whitespace or ']' or
-// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-
-            if (/^[\],:{}\s]*$/.
-test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
-replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
-replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-// In the third stage we use the eval function to compile the text into a
-// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-// in JavaScript: it can begin a block or an object literal. We wrap the text
-// in parens to eliminate the ambiguity.
-
-                j = eval('(' + text + ')');
-
-// In the optional fourth stage, we recursively walk the new structure, passing
-// each name/value pair to a reviver function for possible transformation.
-
-                return typeof reviver === 'function' ?
-                    walk({'': j}, '') : j;
-            }
-
-// If the text is not JSON parseable, then a SyntaxError is thrown.
-
-            throw new SyntaxError('JSON.parse');
-        };
-    }
-}());
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.js b/src/main/webapp/resources/lib/fims/biz/paintweb/korean.js
similarity index 99%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.js
rename to src/main/webapp/resources/lib/fims/biz/paintweb/korean.js
index 6509a375..51c00c31 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/lang/ko.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/korean.js
@@ -114,7 +114,9 @@ let lang_ko = {
     
     "selectionCrop": "자르기",
     "selectionFill": "가림막",
-    "selectionCopy": "번호판",
+    "selectionForNumberPlate": "번호판",
+    
+    "selectionCopy": "선택영역 복사",
     "selectionCut": "선택영역 잘라내기",
     "selectionDelete": "선택영역 삭제"
   },
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/layout.xhtml b/src/main/webapp/resources/lib/fims/biz/paintweb/layout.js
similarity index 98%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/layout.xhtml
rename to src/main/webapp/resources/lib/fims/biz/paintweb/layout.js
index 872ce4f4..b75f91f1 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/layout.xhtml
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/layout.js
@@ -1,4 +1,4 @@
-<div xmlns="http://www.w3.org/1999/xhtml">
+let xhtml = `<div xmlns="http://www.w3.org/1999/xhtml">
   <!-- $Date: 2009-11-08 13:19:52 +0200 $ -->
   <h1 class="paintweb_appTitle">PaintWeb</h1>
 
@@ -27,7 +27,7 @@
 
         <li class="paintweb_toolSeparator">&#160;</li>
 
-        <li data-pwTool="selection">Selection</li>
+        <li data-pwTool="selection" hidden>영역 선택</li>
         <!--<li data-pwTool="hand">Hand</li>-->
         <!-- <li data-pwTool="rectangle">Rectangle</li> -->
 
@@ -36,7 +36,8 @@
         <!--<li data-pwCommand="selectionCut">Cut selection</li>-->
         <li data-pwCommand="selectionCrop">자르기</li>
         <li data-pwCommand="selectionFill">가림막</li>
-        <li data-pwCommand="selectionCopy">번호판</li>
+        <li data-pwCommand="selectionForNumberPlate">번호판</li>
+        <!-- <li data-pwCommand="selectionCopy">선택영역 복사</li> -->
         <!--<li data-pwCommand="clipboardPaste">Clipboard paste</li>-->
         <!--<li data-pwTool="insertimg">Insert image</li>-->
         <!-- 
@@ -153,9 +154,7 @@
       <p data-pwId="selTab_selectionCopy">Copy selection</p>
       <p data-pwId="selTab_clipboardPaste">Clipboard paste</p>
 
-      <p data-pwCommand="selectionCrop">Crop selection</p>
       <p data-pwCommand="selectionDelete">Delete selection</p>
-      <p data-pwCommand="selectionFill">Fill selection</p>
 
       <p class="paintweb_opt_selectionTransparent">
         <label><input data-pwConfig="selection.transparent" type="checkbox" 
@@ -409,4 +408,4 @@
   </div>
 
   <!-- vim:set spell spl=en fo=tcroqwanl1 tw=80 ts=2 sw=2 sts=2 sta et ai cin fenc=utf-8 ff=unix: -->
-</div>
+</div>`;
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.js b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.js
index b2979447..e8a77465 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb-config.js
@@ -7,14 +7,6 @@ let paintweb_config = {
 
   "lang": "ko",
 
-  "langFolder": "lang",
-
-  /*
-  The graphical user interface you want to use.
-  @type String
-  @default "default"
-  */
-  "gui": "default",
 
   /**
    * The folder contains all the interfaces.
@@ -24,29 +16,6 @@ let paintweb_config = {
    */
   "interfacesFolder": "interfaces",
 
-  /**
-   * The interface markup file. The file must be an XHTML valid document.
-   *
-   * @type String
-   * @default "layout.xhtml"
-   */
-  "guiMarkup": "layout.xhtml",
-
-  /**
-   * The interface style file.
-   *
-   * @type String
-   * @default "style.css"
-   */
-  "guiStyle": "style.css",
-
-  /**
-   * The interface script file.
-   *
-   * @type String
-   * @default script.js
-   */
-  "guiScript": "script.js",
 
   /**
    * The image viewport width. Make sure the value is a CSS length, like "50%", 
@@ -69,7 +38,7 @@ let paintweb_config = {
    * @default "400px"
    * 672px
    */
-  "viewportHeight": "82%",
+  "viewportHeight": "100%",
 
   /**
    * Image save quality for the JPEG format.
@@ -77,7 +46,7 @@ let paintweb_config = {
    * @type Number
    * @default 0.9
    */
-  "jpegSaveQuality": 0.9,
+  "jpegSaveQuality": 1.0,
 
   /**
    * The default image width.
@@ -611,14 +580,14 @@ let paintweb_config = {
     "Control Z": { "command": "historyUndo" },
     "Control Y": { "command": "historyRedo" },
 
-    // "Control N": { "command": "imageClear" },
+    "Control N": { "command": "imageClear" },
     
 
     //"Control A":    { "command": "selectAll" },
     //"Control X":    { "command": "selectionCut" },
     //"Shift Delete": { "command": "selectionCut" },
-    //"Control C":    { "command": "selectionCopy" },
-    //"Control V":    { "command": "clipboardPaste" },
+    "Control C":    { "command": "selectionCopy" },
+    "Control V":    { "command": "clipboardPaste" },
 	"Control S": { "command": "imageSave" }
 
     // Use "toolActivate": "id" to activate the tool with the given ID.
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
index 3bcd4f37..d25057c5 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
@@ -503,29 +503,6 @@ function PaintWeb (win, doc) {
 
     temp_.onInit = handler;
 
-    // Check Canvas support.
-    if (!doc.createElement('canvas').getContext) {
-      this.initError(lang.noCanvasSupport);
-      return false;
-    }
-
-    // Basic functionality used within the Web application.
-    if (!window.getComputedStyle) {
-      try {
-        if (!win.getComputedStyle(doc.createElement('div'), null)) {
-          this.initError(lang.noComputedStyle);
-          return false;
-        }
-      } catch (err) {
-        this.initError(lang.noComputedStyle);
-        return false;
-      }
-    }
-
-    if (!window.XMLHttpRequest) {
-      this.initError(lang.noXMLHttpRequest);
-      return false;
-    }
 
     if (typeof this.config.guiPlaceholder !== 'object' || 
         this.config.guiPlaceholder.nodeType !== this.ELEMENT_NODE) {
@@ -540,42 +517,36 @@ function PaintWeb (win, doc) {
     }
 
     // JSON parser and serializer.
-    if (!window.JSON) {
-      this.scriptLoad(PaintWeb.baseFolder + 'includes/json2.js', 
-          this.jsonlibReady);
-    } else {
-      this.jsonlibReady();
+    pwlib = window.pwlib;
+    appEvent = pwlib.appEvent;
+
+    // Create the custom application events object.
+    _self.events = new pwlib.appEvents(_self);
+
+	
+    pwlib.extend(_self.config, paintweb_config);
+
+    pwlib.extend(_self.lang, lang_ko);
+
+    if (!(_self.initCanvas() && _self.initContext())) {
+	   _self.initError(lang.errorInitCanvas);
+		return;
     }
 
-    return true;
-  };
 
-  /**
-   * The <code>load</code> event handler for the JSON library script.
-   * @private
-   */
-  this.jsonlibReady = function () {
-    if (window.pwlib) {
-      _self.pwlibReady();
-    } else {
-      _self.scriptLoad(PaintWeb.baseFolder + 'includes/lib.js', 
-          _self.pwlibReady);
+    _self.gui = new pwlib.gui(_self);
+
+    if (!_self.gui.init(xhtml)) {
+		_self.initError(lang.errorInitGUI);
+		return;	
     }
-  };
 
-  /**
-   * The <code>load</code> event handler for the PaintWeb library script.
-   * @private
-   */
-  this.pwlibReady = function () {
-    pwlib = window.pwlib;
-    appEvent = pwlib.appEvent;
+	_self.initTools();
 
-    // Create the custom application events object.
-    _self.events = new pwlib.appEvents(_self);
-    _self.configLoad();
+    return true;
   };
 
+
   /**
    * Report an initialization error.
    *
@@ -622,84 +593,12 @@ function PaintWeb (win, doc) {
     }
   };
 
-  /**
-   * Asynchronously load the configuration file. This method issues an 
-   * XMLHttpRequest to load the JSON file.
-   *
-   * @private
-   *
-   * @see PaintWeb.config.configFile The configuration file.
-   * @see pwlib.xhrLoad The library function being used for creating the 
-   * XMLHttpRequest object.
-   */
-  this.configLoad = function () {
-	this.configReady();
-  };
-
-  /**
-   * The configuration reader. This is the event handler for the XMLHttpRequest 
-   * object, for the <code>onreadystatechange</code> event.
-   *
-   * @private
-   *
-   * @param {XMLHttpRequest} xhr The XMLHttpRequest object being handled.
-   *
-   * @see PaintWeb#configLoad The method which issues the XMLHttpRequest request 
-   * for loading the configuration file.
-   */
-  this.configReady = function (xhr) {
-    /*
-     * readyState values:
-     *   0 UNINITIALIZED open() has not been called yet.
-     *   1 LOADING send() has not been called yet.
-     *   2 LOADED send() has been called, headers and status are available.
-     *   3 INTERACTIVE Downloading, responseText holds the partial data.
-     *   4 COMPLETED Finished with all operations.
-     */
 
-    var config = paintweb_config;
-    pwlib.extend(_self.config, config);
 
-    _self.langLoad();
-  };
 
-  /**
-   * Asynchronously load the language file. This method issues an XMLHttpRequest 
-   * to load the JSON file.
-   *
-   * @private
-   *
-   * @see PaintWeb.config.lang The language you want for the PaintWeb user 
-   * interface.
-   * @see pwlib.xhrLoad The library function being used for creating the 
-   * XMLHttpRequest object.
-   */
-  this.langLoad = function () {
-    this.langReady();
-  };
 
-  /**
-   * The language file reader. This is the event handler for the XMLHttpRequest 
-   * object, for the <code>onreadystatechange</code> event.
-   *
-   * @private
-   *
-   * @param {XMLHttpRequest} xhr The XMLHttpRequest object being handled.
-   *
-   * @see PaintWeb#langLoad The method which issues the XMLHttpRequest request 
-   * for loading the language file.
-   */
-  this.langReady = function () {
 
-    pwlib.extend(_self.lang, lang_ko);
 
-    if (_self.initCanvas() && _self.initContext()) {
-      // Start GUI load now.
-      _self.guiLoad();
-    } else {
-      _self.initError(lang.errorInitCanvas);
-    }
-  };
 
   /**
    * Initialize the PaintWeb commands.
@@ -711,21 +610,24 @@ function PaintWeb (win, doc) {
   this.initCommands = function () {
     if (this.commandRegister('historyUndo',    this.historyUndo) &&
         this.commandRegister('historyRedo',    this.historyRedo) &&
-        this.commandRegister('selectAll',      this.selectAll) &&
-        this.commandRegister('selectionCrop',  this.selectionCrop) &&
+		this.commandRegister('selectionCrop',  this.selectionCrop) &&
         this.commandRegister('selectionFill',  this.selectionFill) &&
-        //this.commandRegister('selectionCut',   this.selectionCut) &&
-        this.commandRegister('selectionCopy',  this.selectionCopy) &&
-        //this.commandRegister('clipboardPaste', this.clipboardPaste) &&
-        this.commandRegister('imageSave',      this.imageSave) &&
-        this.commandRegister('imageRotate',    this.imageRotate) &&
+        this.commandRegister('selectionForNumberPlate',  this.selectionForNumberPlate) &&
+		this.commandRegister('imageRotate',    this.imageRotate) &&
         this.commandRegister('imageBright',    this.imageBright) &&
         this.commandRegister('imageDark',      this.imageDark) &&
-        //this.commandRegister('imageClear',     this.imageClear) &&
-        this.commandRegister('swapFillStroke', this.swapFillStroke) &&
-        this.commandRegister('imageZoomIn',    this.imageZoomIn) &&
+        this.commandRegister('imageSave',      this.imageSave) &&
+        
+		this.commandRegister('imageZoomIn',    this.imageZoomIn) &&
         this.commandRegister('imageZoomOut',   this.imageZoomOut) &&
-        this.commandRegister('imageZoomReset', this.imageZoomReset)) {
+        this.commandRegister('imageZoomReset', this.imageZoomReset) && 
+
+		this.commandRegister('selectAll',      this.selectAll) &&
+        this.commandRegister('selectionCut',   this.selectionCut) &&
+        this.commandRegister('selectionCopy',  this.selectionCopy) &&
+        this.commandRegister('clipboardPaste', this.clipboardPaste) &&
+        this.commandRegister('imageClear',     this.imageClear) &&
+        this.commandRegister('swapFillStroke', this.swapFillStroke)) {
       return true;
     } else {
       this.initError(lang.errorInitCommands);
@@ -733,103 +635,8 @@ function PaintWeb (win, doc) {
     }
   };
 
-  /**
-   * Load th PaintWeb GUI. This method loads the GUI markup file, the stylesheet 
-   * and the script.
-   *
-   * @private
-   *
-   * @see PaintWeb.config.guiStyle The interface style file.
-   * @see PaintWeb.config.guiScript The interface script file.
-   * @see pwlib.gui The interface object.
-   */
-  this.guiLoad = function () {
-    var cfg    = this.config,
-        gui    = this.config.gui,
-        base   = PaintWeb.baseFolder + cfg.interfacesFolder + '/' + gui + '/',
-        style  = base + cfg.guiStyle,
-        script = base + cfg.guiScript;
-
-    this.styleLoad(gui + 'style', style);
-
-    if (pwlib.gui) {
-      this.guiScriptReady();
-    } else {
-      this.scriptLoad(script, this.guiScriptReady);
-    }
-  };
-
-  /**
-   * The <code>load</code> event handler for the PaintWeb GUI script. This 
-   * method creates an instance of the GUI object that just loaded and starts 
-   * loading the GUI markup.
-   *
-   * @private
-   *
-   * @see PaintWeb.config.guiScript The interface script file.
-   * @see PaintWeb.config.guiMarkup The interface markup file.
-   * @see pwlib.gui The interface object.
-   * @see pwlib.xhrLoad The library function being used for creating the 
-   * XMLHttpRequest object.
-   */
-  this.guiScriptReady = function () {
-    var cfg    = _self.config,
-        gui    = _self.config.gui,
-        base   = cfg.interfacesFolder + '/' + gui + '/',
-        markup = base + cfg.guiMarkup;
-
-    _self.gui = new pwlib.gui(_self);
-
-    // Check if the interface markup is cached already.
-    if (markup in pwlib.fileCache) {
-      if (_self.gui.init(pwlib.fileCache[markup])) {
-        _self.initTools();
-      } else {
-        _self.initError(lang.errorInitGUI);
-      }
-
-    } else {
-      pwlib.xhrLoad(PaintWeb.baseFolder + markup, _self.guiMarkupReady);
-    }
-  };
-
-  /**
-   * The GUI markup reader. This is the event handler for the XMLHttpRequest 
-   * object, for the <code>onreadystatechange</code> event.
-   *
-   * @private
-   *
-   * @param {XMLHttpRequest} xhr The XMLHttpRequest object being handled.
-   *
-   * @see PaintWeb#guiScriptReady The method which issues the XMLHttpRequest 
-   * request for loading the interface markup file.
-   */
-  this.guiMarkupReady = function (xhr) {
-    if (!xhr || xhr.readyState !== 4) {
-      return;
-    }
-
-    if (xhr.status !== 304 && xhr.status !== 200) {
-      _self.initError(lang.failedMarkupLoad);
-      return;
-    }
 
-    var param;
-    /*if (xhr.responseXML && xhr.responseXML.documentElement) {	// by gu
-      param = xhr.responseXML;
-    } else */if (xhr.responseText) {
-      param = xhr.responseText;
-    } else {
-      _self.initError(lang.failedMarkupLoad);
-      return;
-    }
 
-    if (_self.gui.init(param)) {
-      _self.initTools();
-    } else {
-      _self.initError(lang.errorInitGUI);
-    }
-  };
 
   /**
    * Initialize the Canvas elements. This method creates the elements and 
@@ -1084,8 +891,11 @@ function PaintWeb (win, doc) {
     }
 
     this.initialized = PaintWeb.INIT_DONE;
-
+	
+	//this.toolActivate("selection");
+	
     this.events.dispatch(new appEvent.appInit(this.initialized));
+
   };
 
   /**
@@ -2424,41 +2234,6 @@ function PaintWeb (win, doc) {
     xhr.send('');
   };
 
-  /**
-   * Insert a stylesheet into the document.
-   *
-   * @param {String} id The stylesheet ID. This is used to avoid inserting the 
-   * same style in the document.
-   * @param {String} url The URL of the stylesheet you want to insert.
-   * @param {String} [media='screen, projection'] The media attribute.
-   * @param {Function} [handler] The <code>load</code> event handler.
-   */
-  this.styleLoad = function (id, url, media, handler) {
-    id = 'paintweb_style_' + id;
-
-    var elem = doc.getElementById(id);
-    if (elem) {
-      return;
-    }
-
-    if (!media) {
-      media = 'screen, projection';
-    }
-
-    elem = doc.createElement('link');
-
-    if (handler) {
-      elem.addEventListener('load', handler, false);
-    }
-
-    elem.id = id;
-    elem.rel = 'stylesheet';
-    elem.type = 'text/css';
-    elem.media = media;
-    elem.href = url;
-
-    this.elems.head.appendChild(elem);
-  };
 
   /**
    * Perform action undo.
@@ -2740,8 +2515,9 @@ function PaintWeb (win, doc) {
 			bufferCanvas = _self.buffer.canvas,
 			bufferCtx 	 = _self.buffer.context,
 	        img = _self.image;
-	    var bufferStyle = _self.buffer.canvas.style,
-	    	layerStyle  = layerCanvas.style;
+
+	    var bufferStyle = _self.buffer.canvas.style;
+	    var layerStyle  = layerCanvas.style;
 	    
 		  
 	      var srcCanvas = doc.createElement('canvas');
@@ -2766,16 +2542,11 @@ function PaintWeb (win, doc) {
 	        
 		  img.width  = layerCanvas.width;
 		  img.height = layerCanvas.height;
-		  _self.events.dispatch(new appEvent.imageSizeChange(layerCanvas.width, layerCanvas.height));
 
-	      bufferStyle.width  = layerStyle.width  = layerCanvas.width  + 'px';
-	      bufferStyle.height = layerStyle.height = layerCanvas.height + 'px';
-	      
-	      _self.events.dispatch(new appEvent.canvasSizeChange(layerCanvas.width, layerCanvas.height, img.canvasScale));
-	      
-	      var zoom = _self.image.zoom;
-	      _self.image.zoom=1;
-	      _self.imageZoomTo(zoom);
+		  bufferStyle.width  = layerStyle.width  = (layerCanvas.width * img.canvasScale)  + 'px';
+	      bufferStyle.height = layerStyle.height = (layerCanvas.height * img.canvasScale) + 'px';
+
+	      _self.events.dispatch(new appEvent.canvasSizeChange(bufferCanvas.width * img.canvasScale, bufferCanvas.height * img.canvasScale, img.canvasScale));
 
 	      return true; 
 	  };
@@ -2965,6 +2736,14 @@ function PaintWeb (win, doc) {
     }
   };
 
+  this.selectionForNumberPlate = function (ev) {
+    if (!_self.tool || _self.tool._id !== 'selection') {
+      return false;
+    } else {
+      return _self.tool.selectionForNumberPlate(ev);
+    }
+  };
+
   /**
    * Paste the current clipboard image. This only works when some ImageData is 
    * available in {@link PaintWeb#clipboard}.
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/includes/lib.js b/src/main/webapp/resources/lib/fims/biz/paintweb/pwlib.js
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/includes/lib.js
rename to src/main/webapp/resources/lib/fims/biz/paintweb/pwlib.js
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/bcurve.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/bcurve.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/bcurve.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/bcurve.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/cbucket.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/cbucket.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/cbucket.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/cbucket.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/clipboardPaste.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/clipboardPaste.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/clipboardPaste.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/clipboardPaste.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/cpicker.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/cpicker.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/cpicker.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/cpicker.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/ellipse.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/ellipse.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/ellipse.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/ellipse.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/eraser.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/eraser.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/eraser.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/eraser.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/hand.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/hand.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/hand.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/hand.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/help.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/help.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/help.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/help.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/historyRedo.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/historyRedo.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/historyRedo.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/historyRedo.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/historyUndo.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/historyUndo.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/historyUndo.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/historyUndo.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_addPhoto.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_addPhoto.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_addPhoto.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_addPhoto.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_block.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_block.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_block.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_block.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_cancel.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_cancel.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_cancel.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_cancel.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_carnumber.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_carnumber.png
new file mode 100644
index 0000000000000000000000000000000000000000..f89e8bcd9c0af116f87a3e29cae8f7139b61dd16
GIT binary patch
literal 41493
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

literal 0
HcmV?d00001

diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_centerAlign.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_centerAlign.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_centerAlign.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_centerAlign.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_colorfill.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_colorfill.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_colorfill.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_colorfill.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_copy.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_copy.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_copy.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_copy.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_crop.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_crop.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_crop.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_crop.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_cut.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_cut.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_cut.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_cut.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_delete.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_delete.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_delete.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_delete.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_fontBold.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_fontBold.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_fontBold.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_fontBold.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_fontItalic.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_fontItalic.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_fontItalic.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_fontItalic.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_fontSize.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_fontSize.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_fontSize.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_fontSize.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_leftAlign.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_leftAlign.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_leftAlign.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_leftAlign.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_paste.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_paste.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_paste.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_paste.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_pinch.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_pinch.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_pinch.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_pinch.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_replay.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_replay.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_replay.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_replay.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_rightAlign.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_rightAlign.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_rightAlign.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_rightAlign.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_rotation.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_rotation.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_rotation.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_rotation.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_save.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_save.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_save.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_save.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_select.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_select.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_select.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_select.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_square.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_square.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/i_square.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/i_square.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/imageClear.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/imageClear.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/imageClear.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/imageClear.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/imageRotate.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/imageRotate.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/imageRotate.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/imageRotate.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/imageSave.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/imageSave.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/imageSave.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/imageSave.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/insertimg.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/insertimg.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/insertimg.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/insertimg.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-cap-butt.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-cap-butt.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-cap-butt.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-cap-butt.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-cap-round.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-cap-round.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-cap-round.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-cap-round.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-cap-square.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-cap-square.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-cap-square.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-cap-square.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-join-bevel.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-join-bevel.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-join-bevel.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-join-bevel.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-join-miter.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-join-miter.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-join-miter.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-join-miter.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-join-round.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-join-round.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line-join-round.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line-join-round.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/line.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/line.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/paintweb.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/paintweb.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/paintweb.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/paintweb.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/pencil.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/pencil.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/pencil.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/pencil.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/polygon.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/polygon.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/polygon.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/polygon.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/rectangle.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/rectangle.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/rectangle.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/rectangle.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selection.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selection.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selection.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selection.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionCopy.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionCopy.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionCopy.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionCopy.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionCrop.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionCrop.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionCrop.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionCrop.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionCut.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionCut.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionCut.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionCut.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionDelete.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionDelete.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionDelete.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionDelete.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionFill.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionFill.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/selectionFill.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/selectionFill.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/shapeType-both.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/shapeType-both.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/shapeType-both.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/shapeType-both.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/shapeType-fill.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/shapeType-fill.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/shapeType-fill.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/shapeType-fill.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/shapeType-stroke.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/shapeType-stroke.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/shapeType-stroke.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/shapeType-stroke.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-align-center.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-align-center.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-align-center.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-align-center.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-align-left.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-align-left.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-align-left.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-align-left.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-align-right.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-align-right.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-align-right.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-align-right.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-bold.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-bold.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-bold.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-bold.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-italic.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-italic.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-italic.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-italic.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-size.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-size.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text-size.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text-size.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/text.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/text.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/zoom.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/zoom.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/icons/zoom.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/icons/zoom.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/button.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/button.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/button.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/button.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/checkers-big.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/checkers-big.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/checkers-big.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/checkers-big.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/checkers.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/checkers.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/checkers.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/checkers.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/floatingPanel-close.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/floatingPanel-close.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/floatingPanel-close.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/floatingPanel-close.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/floatingPanel-minimize.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/floatingPanel-minimize.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/floatingPanel-minimize.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/floatingPanel-minimize.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/floatingPanel-restore.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/floatingPanel-restore.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/floatingPanel-restore.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/floatingPanel-restore.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/floatingPanel-title.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/floatingPanel-title.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/floatingPanel-title.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/floatingPanel-title.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/paintweb-logo.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/paintweb-logo.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/paintweb-logo.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/paintweb-logo.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/toolbar-colors.png b/src/main/webapp/resources/lib/fims/biz/paintweb/style/images/toolbar-colors.png
similarity index 100%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/images/toolbar-colors.png
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/images/toolbar-colors.png
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/style.css b/src/main/webapp/resources/lib/fims/biz/paintweb/style/style.css
similarity index 98%
rename from src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/style.css
rename to src/main/webapp/resources/lib/fims/biz/paintweb/style/style.css
index 6304ccbd..834cd4bd 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/interfaces/default/style.css
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/style/style.css
@@ -40,7 +40,7 @@
   background: #999;
   border: 1px solid #000;
   height: 400px;
-  min-height: 150px;
+  min-height: 500px;
   min-width: 535px;
   overflow: auto;
   position: relative
@@ -191,11 +191,13 @@
   display: block;
   height: 31px;
   overflow: hidden;
-  text-indent: 33px;
-  width: 31px;
+  text-indent: 31px;
+  width:31px;
   white-space: nowrap
 }
 
+
+
 .paintweb_strokeFillStyles:hover, .paintweb_strokeFillStyles:focus,
 .paintweb_tool:hover, .paintweb_tool:focus,
 .paintweb_command:hover, .paintweb_command:focus,
@@ -516,7 +518,7 @@
   clear: left
 }
 
-.paintweb_cmd_selectionDelete, .paintweb_cmd_selectionFill {
+.paintweb_cmd_selectionDelete, .paintweb_cmd_selectionFill, .paintweb_cmd_selectionForNumberPlate {
   border-left: 0;
   border-top: 0
 }
@@ -984,6 +986,13 @@
 
 .paintweb_cmd_selectionCrop a { background-image: url('icons/i_crop.png') }
 
+.paintweb_cmd_selectionForNumberPlate a { 
+	background-image: url('icons/i_carnumber.png'); 
+	background-size: contain;
+	text-indent: 150px;
+	width : 150px;
+}
+
 .paintweb_cmd_selectionDelete a { background-image: url('icons/i_block.png') }
 
 .paintweb_cmd_selectionFill a { background-image: url('icons/i_colorfill.png') }
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/tools/selection.js b/src/main/webapp/resources/lib/fims/biz/paintweb/tools/selection.js
index a211121c..66e2a167 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/tools/selection.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/tools/selection.js
@@ -344,8 +344,10 @@ pwlib.tools.selection = function (app) {
 
     // Register selection-related commands
     app.commandRegister('selectionCrop',   _self.selectionCrop);
-    app.commandRegister('selectionDelete', _self.selectionDelete);
-    app.commandRegister('selectionFill',   _self.selectionFill);
+	app.commandRegister('selectionForNumberPlate',   _self.selectionForNumberPlate);
+	app.commandRegister('selectionFill',   _self.selectionFill);  
+	app.commandRegister('selectionDelete', _self.selectionDelete);
+    
 
     if (!timer) {
       timer = setInterval(timerFn, app.config.toolDrawDelay);
@@ -388,8 +390,11 @@ pwlib.tools.selection = function (app) {
 
     // Unregister selection-related commands
     app.commandUnregister('selectionCrop');
-    app.commandUnregister('selectionDelete');
-    app.commandUnregister('selectionFill');
+	app.commandUnregister('selectionFill');
+	app.commandUnregister('selectionForNumberPlate');
+	
+	app.commandUnregister('selectionDelete');
+    
 
     return true;
   };
@@ -1360,11 +1365,12 @@ pwlib.tools.selection = function (app) {
       sel.context.fillStyle = bufferContext.fillStyle;
       sel.context.fillRect(0, 0, sel.widthOriginal, sel.heightOriginal);
       bufferContext.fillRect(sel.x, sel.y, sel.width, sel.height);
-
     } else {
       layerContext.fillStyle = bufferContext.fillStyle;
       layerContext.fillRect(sel.x, sel.y, sel.width, sel.height);
       app.historyAdd();
+
+      _self.selectionDrop(); //선택영역 해제
     }
 
     return true;
@@ -1400,6 +1406,42 @@ pwlib.tools.selection = function (app) {
 
     app.imageCrop(sel.x, sel.y, w, h);
 
+	isNumberPlate = false;
+
+    return true;
+  };
+
+  /**
+   * 번호판 캡쳐
+   *
+   * <p>This method invokes the {@link this#selectionMerge} and {@link 
+   * PaintWeb#imageCrop} methods.
+   *
+   * @returns {Boolean} True if the operation was successful, or false if not.
+   */
+  this.selectionForNumberPlate = function () {
+    if (_self.state !== _self.STATE_SELECTED) {
+      return false;
+    }
+
+    _self.selectionMerge();
+
+    var w    = sel.width,
+        h    = sel.height,
+        sumX = sel.x + w,
+        sumY = sel.y + h;
+
+    if (sumX > image.width) {
+      w -= sumX - image.width;
+    }
+    if (sumY > image.height) {
+      h -= sumY - image.height;
+    }
+
+    app.imageCrop(sel.x, sel.y, w, h);
+
+	isNumberPlate = true;
+	
     return true;
   };
 
@@ -1426,16 +1468,13 @@ pwlib.tools.selection = function (app) {
 
       case config.keys.selectionCrop:
         return _self.selectionCrop(ev);
+      case config.keys.selectionFill:
+        return _self.selectionFill(ev);
 
       case config.keys.selectionDelete:
         return _self.selectionDelete(ev);
-
       case config.keys.selectionDrop:
         return _self.selectionDrop(ev);
-
-      case config.keys.selectionFill:
-        return _self.selectionFill(ev);
-
       default:
         return false;
     }

From d78327972e137d9c0943f63fe19bad838a805a4d Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 31 Jul 2023 16:13:31 +0900
Subject: [PATCH 07/20] no message

---
 src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
index 082e1c85..8cfe6537 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
@@ -122,7 +122,7 @@
             //formData.append('file', file);
             return true;
         
-        
+        }
     };
 
     function fnAfterImageSave(){

From 4733043bb84edc1a3941bd2c25ee787aa715a21c Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Mon, 31 Jul 2023 17:37:54 +0900
Subject: [PATCH 08/20] =?UTF-8?q?w-85=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/resources/css/fims/framework/common/xit-core.css   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/webapp/resources/css/fims/framework/common/xit-core.css b/src/main/webapp/resources/css/fims/framework/common/xit-core.css
index daadd747..ca5339f1 100644
--- a/src/main/webapp/resources/css/fims/framework/common/xit-core.css
+++ b/src/main/webapp/resources/css/fims/framework/common/xit-core.css
@@ -10973,6 +10973,10 @@ button.list-group-item-gray.active {
     width: 75% !important;
 }
 
+.w-85 {
+    width: 85% !important;
+}
+
 .w-100 {
     width: 100% !important;
 }

From dce292e403cdbccb94b36a7b30703049db77481c Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 31 Jul 2023 17:50:54 +0900
Subject: [PATCH 09/20] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=8E=B8?=
 =?UTF-8?q?=EC=A7=91=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/crdn/crdn01020-info.jsp  | 90 ++++++++++++-------
 .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  | 50 +++++++----
 .../WEB-INF/jsp/fims/sprt/sprt03020-main.jsp  | 22 +----
 .../lib/fims/biz/paintweb/paintweb.js         |  4 +-
 4 files changed, 95 insertions(+), 71 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
index cc6b47be..8d757f06 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
@@ -262,6 +262,9 @@
 		</form>
 	</div>
 	<div class="card" style="width:500px;">
+		<form id="frmFile--${pageName}" method="post" enctype="multipart/form-data">
+			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple accept="image/*" hidden />
+		</form>
 		
 		<div class="col-md-12 d-flex justify-content-between">
 			<div class="fs-4 fw-bold">등록된 사진</div>
@@ -270,32 +273,20 @@
 				<button type="button" id="btnEditPhoto--${pageName}" class="btn btn-blue">선택 사진 편집</button>
 			</div>
 		</div>
-		<div id="display3--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
-		</div>
-		
-		<div class="col-md-12 d-flex justify-content-between">
-			<div class="fs-4 fw-bold">추가한 사진(번호판)</div>
-			<button type="button" id="btnNumberPlateDelete--${pageName}" class="btn btn-blue">취소</button>
-		</div>
-		<div id="display4--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">	
+		<div id="display0--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
 		</div>
-		
-		<form id="frmFile--${pageName}" class="dpv eca" method="post" enctype="multipart/form-data">
-			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple accept="image/*" hidden />
-		</form>
+
+		<form id="frmUploadSet--${pageName}" method="post" enctype="multipart/form-data">
+			<input type="file" id="inputUploadSet--${pageName}" name="inputUploadSet" multiple accept="image/*" hidden />
+		</form>		
 		<div class="col-md-12 d-flex justify-content-between">
 			<div class="fs-4 fw-bold">추가한 사진</div>
+			<button type="button" id="btnOpenVideoCapture--${pageName}" class="btn btn-blue">동영상 캡쳐</button>
 			<button type="button" id="btnAddFile--${pageName}" class="btn btn-blue">사진 추가</button>
 		</div>
 		<div id="display--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
 		</div>
-		
-		<div class="col-md-12 d-flex justify-content-between" id="cpatureTitleArea--${pageName}">
-			<div class="fs-4 fw-bold">캡쳐 이미지</div>
-			<button type="button" id="btnOpenVideoCapture--${pageName}" class="btn btn-blue">동영상 캡쳐</button>
-		</div>
-		<div id="display2--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">	
-		</div>
+
 		
 	</div>
 
@@ -312,13 +303,15 @@ $(document).ready(function(){
 	var $P = pageObject["${pageName}"];
 
 	$P.captureFileArr = [];
+	$P.localUploadArr = [];
+	$P.numberPlateArr = [];
 	
 	/**************************************************************************
 	 * DatasetControl, Dataset, FormFields
 	 **************************************************************************/
 	$P.formFields = new FimsFormFields("#frmEdit--${pageName}");
 
-	$P.uploadSet = uploadSupport("#uploadFileList--${pageName}");
+	$P.uploadSet = uploadSupport("#inputUploadSet--${pageName}");
 
 	$P.crdnControl = new DatasetControl({
 	    urls : { load : "", create : wctx.url("/${taskSeCd}/crdn/crdn01/020/save.do") },
@@ -344,6 +337,13 @@ $(document).ready(function(){
 		if(formData.get("uploadFileList").size == 0){
 			formData.delete("uploadFileList");
 		}
+		
+		if($P.localUploadArr.length > 0){
+			$P.localUploadArr.forEach(item => formData.append("uploadFileList",item));
+		}
+		if($P.numberPlateArr.length > 0){
+			$P.numberPlateArr.forEach(item => formData.append("uploadFileList",item));
+		}
 		if($P.captureFileArr.length > 0){
 			$P.captureFileArr.forEach(item => formData.append("uploadFileList",item));
 		}
@@ -362,8 +362,13 @@ $(document).ready(function(){
 		$P.formFields.set(item);
 	}
 	 
-	$P.uploadSet.onDatasetChange  = () => { $P.fnDisplay(); };
-	$P.uploadSet.onRemove = () => { $P.fnDisplay(); };
+	$P.uploadSet.onDatasetChange  = () => { 
+		var files = $P.uploadSet.getDataset();
+		files.forEach(item => $P.localUploadArr.push(item));
+		
+		$P.fnDisplay(); 
+	};
+	$P.uploadSet.onRemove = () => { };
 
 	$P.crdnControl.onSave = (resp) => {
 		if (resp.saved) {
@@ -377,17 +382,26 @@ $(document).ready(function(){
 
 	$P.fnDisplay = () => {
 		var displayArea = document.querySelector("#display--${pageName}");
-		var imgTags = $P.uploadSet.inStrings("<img src='{url}' width='200' height='200' />").join("\n");
-		displayArea.innerHTML = imgTags;
 		
-		var display2Area = document.querySelector("#display2--${pageName}");
-		var imgTags2 = "";
+		var imgTagsFromUploadSet = $P.localUploadArr.map(function(item){
+			return "<img src='"+item.url+"' width='200' height='200' />";
+		}).join("\n");
+		
+		var imgTagsFromNumberPlate = "";
+		if($P.numberPlateArr.length > 0){
+			$P.numberPlateArr.forEach(function(item, index){
+				imgTagsFromNumberPlate += "<img src='" + item.url + "' width='200' height='200' />";
+			});
+		}
+		
+		var imgTagsFromVideo = "";
 		if($P.captureFileArr.length > 0){
 			$P.captureFileArr.forEach(function(item, index){
-				imgTags2 += "<img src='" + item.url + "' width='200' height='200' />";
+				imgTagsFromVideo += "<img src='" + item.url + "' width='200' height='200' />";
 			});
 		}
-		display2Area.innerHTML = imgTags2;
+
+		displayArea.innerHTML = imgTagsFromUploadSet + imgTagsFromNumberPlate + imgTagsFromVideo;
 	};
 
 	$P.fnSave = () => {
@@ -430,13 +444,22 @@ $(document).ready(function(){
 			});
 		});
 		
+	}
+	
+	$P.editPhotoCallback = (modifiedFile, originalFileInfo, isNumberPlate) => {
+		console.log(modifiedFile);
+		console.log(originalFileInfo);
+		console.log(isNumberPlate);
+		
 	}
 	/**************************************************************************
 	 * element.on
 	 **************************************************************************/
 	 
 	$("#btnInst--${pageName}").on('click', () => $P.fnSave());
-	$("#btnAddFile--${pageName}").on('click', () => { $("#uploadFileList--${pageName}").trigger("click"); });
+	
+	$("#btnAddFile--${pageName}").on('click', () => { $("#inputUploadSet--${pageName}").trigger("click"); });
+	
 	$("#btnOpenVideoCapture--${pageName}").on('click', () => {
 		var crdnId = $("#crdnId--${pageName}").val();
 		
@@ -446,7 +469,7 @@ $(document).ready(function(){
 		);
 	});
 	$("#btnEditPhoto--${pageName}").on('click', () => {
-		var fileId = $("#display3--${pageName}").find("[name='editTarget']:checked").val();
+		var fileId = $("#display0--${pageName}").find("[name='editTarget']:checked").val();
 		
 		window.open(wctx.url("/sprt/sprt03/020/main.do?openerPageName=${pageName}&fileId="+fileId)
 				,"editPhoto"
@@ -498,8 +521,7 @@ $(document).ready(function(){
 	$P.crdnControl.setData([crdnInfo]);
 	
 	if(crdnInfo.videoExist == "N"){
-		$("#cpatureTitleArea--${pageName}").hide();
-		$("#display2--${pageName}").hide();
+		$("#btnOpenVideoCapture--${pageName}").hide();
 	}
 	
 	if(crdnInfo.fileList){
@@ -520,10 +542,10 @@ $(document).ready(function(){
 			}
 		});
 		
-		$("#display3--${pageName}").append(editPhotoArea);
+		$("#display0--${pageName}").append(editPhotoArea);
 	} else {
 		
-		$("#display3--${pageName}").append("등록된 사진이 없습니다.");
+		$("#display0--${pageName}").append("등록된 사진이 없습니다.");
 		$("#btnEditPhoto--crdn01020-info").hide();
 		
 	}
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 bfa2cb12..13362d0e 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
@@ -236,19 +236,18 @@
 		</form>
 	</div>
 	<div class="card" style="width:400px;">
-		<form id="frmFile--${pageName}" class="dpv eca" method="post" enctype="multipart/form-data">
+		<form id="frmFile--${pageName}" method="post" enctype="multipart/form-data">
 			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple accept="image/*" hidden />
 		</form>
+		
+		<form id="frmUploadSet--${pageName}" method="post" enctype="multipart/form-data">
+			<input type="file" id="inputUploadSet--${pageName}" name="inputUploadSet" multiple accept="image/*" hidden />
+		</form>
 		<div class="col-md-12">
 			<button type="button" id="btnAddFile--${pageName}" class="btn btn-blue">이미지 추가</button>
-		</div>
-		<div id="display--${pageName}" style="overflow-y: scroll;height: 340px;border-style: solid;">
-			
-		</div>
-		<div class="col-md-12">
 			<button type="button" id="btnOpenVideoCapture--${pageName}" class="btn btn-blue">동영상 캡쳐</button>
 		</div>
-		<div id="display2--${pageName}" style="overflow-y: scroll;height: 340px;border-style: solid;">
+		<div id="display--${pageName}" style="overflow-y: scroll;height: 600px;border-style: solid;">
 			
 		</div>
 	</div>
@@ -267,13 +266,14 @@ $(document).ready(function(){
 	var $P = pageObject["${pageName}"];
 	
 	$P.captureFileArr = [];
+	$P.localUploadArr = [];
 	
 	/**************************************************************************
 	 * DatasetControl, Dataset, FormFields
 	 **************************************************************************/
 	$P.formFields = new FimsFormFields("#frmEdit--${pageName}");
 
-	$P.uploadSet = uploadSupport("#uploadFileList--${pageName}");
+	$P.uploadSet = uploadSupport("#inputUploadSet--${pageName}");
 
 	$P.crdnControl = new DatasetControl({
 	    urls : { load : "", create : wctx.url("/${taskSeCd}/crdn/crdn05/030/create.do") },
@@ -299,6 +299,11 @@ $(document).ready(function(){
 		if(formData.get("uploadFileList").size == 0){
 			formData.delete("uploadFileList");
 		}
+		
+		if($P.localUploadArr.length > 0){
+			$P.localUploadArr.forEach(item => formData.append("uploadFileList",item));
+		}
+		
 		if($P.captureFileArr.length > 0){
 			$P.captureFileArr.forEach(item => formData.append("uploadFileList",item));
 		}
@@ -313,8 +318,13 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * DatasetControl.on, Dataset.on
 	 **************************************************************************/
-	$P.uploadSet.onDatasetChange  = () => { $P.fnDisplay(); };
-	$P.uploadSet.onRemove = () => { $P.fnDisplay(); };
+	$P.uploadSet.onDatasetChange  = () => { 
+		var files = $P.uploadSet.getDataset();
+		files.forEach(item => $P.localUploadArr.push(item));
+
+		$P.fnDisplay(); 
+	};
+	$P.uploadSet.onRemove = () => { };
 
 	$P.crdnControl.onSave = (resp) => {
 		if (resp.saved) {
@@ -328,17 +338,21 @@ $(document).ready(function(){
 
 	$P.fnDisplay = () => {
 		var displayArea = document.querySelector("#display--${pageName}");
-		var imgTags = $P.uploadSet.inStrings("<img src='{url}' width='200' height='200' />").join("\n");
-		displayArea.innerHTML = imgTags;
 		
-		var display2Area = document.querySelector("#display2--${pageName}");
-		var imgTags2 = "";
+		var imgTagsFromUploadSet = $P.localUploadArr.map(function(item){
+			return "<img src='"+item.url+"' width='200' height='200' />";
+		}).join("\n");
+		
+
+		var imgTagsFromVideo = "";
 		if($P.captureFileArr.length > 0){
 			$P.captureFileArr.forEach(function(item, index){
-				imgTags2 += "<img src='" + item.url + "' width='200' height='200' />";
+				imgTagsFromVideo += "<img src='" + item.url + "' width='200' height='200' />";
 			});
 		}
-		display2Area.innerHTML = imgTags2;
+
+		displayArea.innerHTML = imgTagsFromUploadSet + imgTagsFromVideo;
+		
 	};
 
 	$P.fnSave = () => {
@@ -387,7 +401,9 @@ $(document).ready(function(){
 	 **************************************************************************/
 	 
 	$("#btnInst--${pageName}").on('click', () => $P.fnSave());
-	$("#btnAddFile--${pageName}").on('click', () => { $("#uploadFileList--${pageName}").trigger("click"); });
+	
+	$("#btnAddFile--${pageName}").on('click', () => { $("#inputUploadSet--${pageName}").trigger("click"); });
+	
 	$("#btnOpenVideoCapture--${pageName}").on('click', () => {
 		window.open(wctx.url("/sprt/sprt03/010/main.do?openerPageName=${pageName}")
 				,"newVideoCapture"
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
index 8cfe6537..4eaef27e 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
@@ -76,6 +76,7 @@
 
 
 <script>
+var openerPageName = "${openerPageName}";
 
     //FIXME: pw instance 변수명 변경시 paintweb.js의 imageSaveTo() 내의 2564 line if(pw.image.modified) 변경 필요
     var pw;
@@ -105,28 +106,11 @@
             if(!confirm('편집한 단속이미지를 저장하시겠습니까?'))  return;
         }
 
-        //
- 
-        // var param = originalInfomation 파일아이디,단속아이디,inpoType..
-
-        // 번호판일때
-        if(isNumberPlate){
-            
-
-            
-            return true;
-        } else {
-            // 저장일때
-            const formData = new FormData();
-            //formData.append('fileId', fileId);
-            //formData.append('file', file);
-            return true;
-        
-        }
+        window.opener.pageObject[openerPageName].editPhotoCallback(file, originalInfomation, isNumberPlate);
+        return true;
     };
 
     function fnAfterImageSave(){
-
         window.close();
     };
 
diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
index d25057c5..890371d0 100644
--- a/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
+++ b/src/main/webapp/resources/lib/fims/biz/paintweb/paintweb.js
@@ -2481,7 +2481,7 @@ function PaintWeb (win, doc) {
 
     // 이미지 삭제인 경우 img.width, img.height 가 0
     _self.config.imageSave(file, img.width, img.height, doc, _self);
-	//_self.config.afterImageSave();
+	_self.config.afterImageSave();
 
     return;
     //---------------------------------------------------------------------
@@ -2548,6 +2548,7 @@ function PaintWeb (win, doc) {
 
 	      _self.events.dispatch(new appEvent.canvasSizeChange(bufferCanvas.width * img.canvasScale, bufferCanvas.height * img.canvasScale, img.canvasScale));
 
+		  pw.image.modified = true;
 	      return true; 
 	  };
 
@@ -2588,6 +2589,7 @@ function PaintWeb (win, doc) {
     let jobCtx = _self.layer.context;
     jobCtx.putImageData(filteredData, 0 , 0);
 
+	pw.image.modified = true;
   }
 
   this.brightnessCalc = function(pixels, sliderValue) {

From 3bf9a3e13cc7f73ed792c32238ad0b7fdc9aba3a Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Mon, 31 Jul 2023 18:41:56 +0900
Subject: [PATCH 10/20] =?UTF-8?q?=EC=9D=98=EA=B2=AC=EC=A0=9C=EC=B6=9C=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=ED=99=94=EB=A9=B4=20=EC=B6=94=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/excl/Excl01Query.java  |  11 +
 .../java/cokr/xit/fims/excl/Excl02Query.java  |  12 +
 .../cokr/xit/fims/excl/dao/Excl01Mapper.java  |  28 +-
 .../cokr/xit/fims/excl/dao/Excl02Mapper.java  |  22 +-
 .../cokr/xit/fims/excl/dao/Excl03Mapper.java  |  10 -
 .../xit/fims/excl/service/Excl01Service.java  |   2 +-
 .../xit/fims/excl/service/Excl02Service.java  |   8 +-
 .../xit/fims/excl/service/Excl03Service.java  |   6 -
 .../fims/excl/service/bean/Excl01Bean.java    |  10 +-
 .../excl/service/bean/Excl01ServiceBean.java  |   6 +-
 .../fims/excl/service/bean/Excl02Bean.java    |  27 +-
 .../excl/service/bean/Excl02ServiceBean.java  |  16 +-
 .../fims/excl/service/bean/Excl03Bean.java    |  10 +-
 .../excl/service/bean/Excl03ServiceBean.java  |   5 -
 .../xit/fims/excl/web/Excl01Controller.java   |   4 +-
 .../xit/fims/excl/web/Excl02Controller.java   |  43 +--
 .../xit/fims/excl/web/Excl03Controller.java   |  22 --
 .../sql/mapper/fims/excl/excl01-mapper.xml    |  55 ++--
 .../sql/mapper/fims/excl/excl02-mapper.xml    |  61 +++-
 .../WEB-INF/jsp/fims/excl/excl01010-main.jsp  |   7 +-
 .../WEB-INF/jsp/fims/excl/excl01020-info.jsp  |   7 +-
 .../WEB-INF/jsp/fims/excl/excl02010-main.jsp  |  25 +-
 .../WEB-INF/jsp/fims/excl/excl02020-info.jsp  | 282 ++++++++++++++++++
 .../WEB-INF/jsp/fims/excl/excl03010-main.jsp  |  18 +-
 24 files changed, 506 insertions(+), 191 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp

diff --git a/src/main/java/cokr/xit/fims/excl/Excl01Query.java b/src/main/java/cokr/xit/fims/excl/Excl01Query.java
index b9b19614..04cf37f5 100644
--- a/src/main/java/cokr/xit/fims/excl/Excl01Query.java
+++ b/src/main/java/cokr/xit/fims/excl/Excl01Query.java
@@ -21,6 +21,7 @@ public class Excl01Query extends QueryRequest {
 	private String taskSeCd;													// 업무 구분 코드
 	private String delYn;														// 삭제 여부
 	// ID
+	private String levyExclIDs;													// 부과 제외 ID
 	private String levyExclId;													// 부과 제외 ID
 	private String crdnId;														// 단속 ID
 	// 공통 조건
@@ -79,6 +80,16 @@ public class Excl01Query extends QueryRequest {
 		return self();
 	}
 
+	public String getLevyExclIDs() {
+		return ifEmpty(levyExclIDs, () -> null);
+	}
+
+	public <T extends Excl01Query> T setLevyExclIDs(String levyExclIDs) {
+		this.levyExclIDs = levyExclIDs;
+
+		return self();
+	}
+
 	public String getLevyExclId() {
 		return ifEmpty(levyExclId, () -> null);
 	}
diff --git a/src/main/java/cokr/xit/fims/excl/Excl02Query.java b/src/main/java/cokr/xit/fims/excl/Excl02Query.java
index 6c2adf75..22ee2e66 100644
--- a/src/main/java/cokr/xit/fims/excl/Excl02Query.java
+++ b/src/main/java/cokr/xit/fims/excl/Excl02Query.java
@@ -21,6 +21,7 @@ public class Excl02Query extends QueryRequest {
 	private String taskSeCd;													// 업무 구분 코드
 	private String delYn;														// 삭제 여부
 	// ID
+	private String opnnIDs;														// 의견 제출 ID
 	private String opnnId;														// 의견 제출 ID
 	private String crdnId;														// 단속 ID
 	// 공통 조건
@@ -74,6 +75,17 @@ public class Excl02Query extends QueryRequest {
 		return self();
 	}
 
+	public String getOpnnIDs() {
+		return ifEmpty(opnnIDs, () -> null);
+	}
+
+	public <T extends Excl02Query> T setOpnnIDs(String opnnIDs) {
+		this.opnnIDs = opnnIDs;
+
+		return self();
+	}
+
+
 	public String getOpnnId() {
 		return ifEmpty(opnnId, () -> null);
 	}
diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java
index 1333983a..08b7bd9c 100644
--- a/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java
+++ b/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java
@@ -39,12 +39,24 @@ public interface Excl01Mapper extends AbstractMapper {
 	 * @param levyExclId 부과제외 ID
 	 * @return 부과제외 대장 객체
 	 */
-	default DataObject selectLevyExclInfo(String levyExclId) {
-		List<DataObject> levyExcl = selectLevyExcls(new Excl01Query().setLevyExclId(levyExclId).setOrderBy("LEVY_EXCL_ID"));
+	default DataObject selectInfo(String levyExclId) {
+		List<DataObject> levyExcl = selectLevyExcls(new Excl01Query().setLevyExclId(levyExclId));
 
 		return !levyExcl.isEmpty() ? levyExcl.get(0) : null;
 	}
 
+	/**지정한 단속 ID의 단속, 부과제외 정보를 반환한다.
+	 * @param crdnId 단속 ID
+	 * @return 단속, 부과제외 정보
+	 */
+	DataObject selectCrdn(Excl01Query req);
+
+	default DataObject selectCrdnInfo(String crdnId) {
+		DataObject crdnInfo = selectCrdn(new Excl01Query().setCrdnId(crdnId));
+
+		return crdnInfo;
+	}
+
 	/**부과제외 대장 정보를 등록한다.
 	 * @param params 파라미터
 	 * <ul><li>"excl01" - 부과 제외 대장</li>
@@ -88,18 +100,6 @@ public interface Excl01Mapper extends AbstractMapper {
 		return excl01 != null && deleteLevyExcl(params().set("excl01", excl01)) >= 1;
 	}
 
-	/**지정한 단속 ID의 단속, 부과제외 정보를 반환한다.
-	 * @param crdnId 단속 ID
-	 * @return 단속, 부과제외 정보
-	 */
-	DataObject selectCrdnLevyExcl(Excl01Query req);
-
-	default DataObject selectCrdnLevyExcl(String crdnId) {
-		DataObject crdnLevyExclInfo = selectCrdnLevyExcl(new Excl01Query().setCrdnId(crdnId));
-
-		return crdnLevyExclInfo;
-	}
-
 	/**단속(TB_CRDN) 대장의 단속 상태 코드를 수정한다.
 	 * @param params 파라미터
 	 * <ul><li>"excl01" - 부과 제외 대장</li>
diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java
index 72a90b09..37e57617 100644
--- a/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java
+++ b/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java
@@ -39,12 +39,24 @@ public interface Excl02Mapper extends AbstractMapper {
 	 * @param opnnId 의견제출 ID
 	 * @return 의견제출 대장 객체
 	 */
-	default DataObject selectOpnnSbmsnInfo(String opnnId) {
-		List<DataObject> opnnSbmsn = selectOpnnSbmsns(new Excl02Query().setOpnnId(opnnId).setOrderBy("OPNN_ID"));
+	default DataObject selectInfo(String opnnId) {
+		List<DataObject> opnnSbmsn = selectOpnnSbmsns(new Excl02Query().setOpnnId(opnnId));
 
 		return !opnnSbmsn.isEmpty() ? opnnSbmsn.get(0) : null;
 	}
 
+	/**지정한 단속 ID의 단속, 부과제외 정보를 반환한다.
+	 * @param crdnId 단속 ID
+	 * @return 단속, 부과제외 정보
+	 */
+	DataObject selectCrdn(Excl02Query req);
+
+	default DataObject selectCrdnInfo(String crdnId) {
+		DataObject crdnInfo = selectCrdn(new Excl02Query().setCrdnId(crdnId));
+
+		return crdnInfo;
+	}
+
 	/**의견제출 대장 정보를 등록한다.
 	 * @param params 파라미터
 	 * <ul><li>"opnnSbmsn" - 의견제출 대장</li>
@@ -61,7 +73,7 @@ public interface Excl02Mapper extends AbstractMapper {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	default boolean insertOpnnSbmsn(Excl02 excl02) {
+	default boolean insert(Excl02 excl02) {
 		return excl02 != null && insertOpnnSbmsn(params().set("excl02", excl02)) == 1;
 	}
 
@@ -81,7 +93,7 @@ public interface Excl02Mapper extends AbstractMapper {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	default boolean updateOpnnSbmsn(Excl02 excl02) {
+	default boolean update(Excl02 excl02) {
 		return excl02 != null && updateOpnnSbmsn(params().set("excl02", excl02)) == 1;
 	}
 
@@ -101,7 +113,7 @@ public interface Excl02Mapper extends AbstractMapper {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	default boolean deleteOpnnSbmsn(Excl02 excl02) {
+	default boolean delete(Excl02 excl02) {
 		return excl02 != null && deleteOpnnSbmsn(params().set("excl02", excl02)) == 1;
 	}
 
diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java
index 009e3f31..cb935b70 100644
--- a/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java
+++ b/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java
@@ -35,16 +35,6 @@ public interface Excl03Mapper extends AbstractMapper {
 	 */
 	List<DataObject> selectCrdnReRegs(Excl03Query req);
 
-	/**지정한 ID의 단속 재등록 정보를 반환한다.
-	 * @param levyExclId 단속 재등록 ID
-	 * @return 단속 재등록 정보
-	 */
-	default DataObject selectCrdnReRegInfo(String reRegId) {
-		List<DataObject> crdnReRegInfo = selectCrdnReRegs(new Excl03Query().setReRegId(reRegId).setOrderBy("RE_REG_ID"));
-
-		return !crdnReRegInfo.isEmpty() ? crdnReRegInfo.get(0) : null;
-	}
-
 	/**단속 재등록 정보를 등록한다.
 	 * @param params 파라미터
 	 * <ul><li>"crdnReReg" - 단속 재등록</li>
diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java b/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java
index 38c52f20..82e0e903 100644
--- a/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java
+++ b/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java
@@ -29,7 +29,7 @@ public interface Excl01Service {
 	 * @param levyExclId 부과 제외 ID
 	 * @return 부과제외 정보
 	 */
-	DataObject getLevyExclusionInfo(Excl01Query req);
+	DataObject getInfo(Excl01Query req);
 
 	/**부과제외 대장 정보를 등록한다.
 	 * @param excl 부과제외 대장
diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java b/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java
index a62e6214..a57b5c39 100644
--- a/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java
+++ b/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java
@@ -34,7 +34,7 @@ public interface Excl02Service {
 	 * @param opnnId 의견제출 ID
 	 * @return 의견제출 정보
 	 */
-	DataObject getOpinionSubmissionInfo(String opnnId);
+	DataObject getInfo(Excl02Query req);
 
 	/**의견제출 대장 정보를 등록한다.
 	 * @param opnnSbmsn 의견제출 대장
@@ -43,7 +43,7 @@ public interface Excl02Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	boolean createOpinionSubmission(Excl02 excl02);
+	boolean create(Excl02 excl02);
 
 	/**의견제출 대장 정보를 수정한다.
 	 * @param opnnSbmsn 의견제출 대장
@@ -52,7 +52,7 @@ public interface Excl02Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	boolean updateOpinionSubmission(Excl02 excl02);
+	boolean update(Excl02 excl02);
 
 	/**의견제출 대장 정보를 삭제한다.
 	 * @param opnnSbmsn 의견제출 대장
@@ -61,6 +61,6 @@ public interface Excl02Service {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	boolean removeOpinionSubmission(Excl02 excl02);
+	boolean remove(Excl02 excl02);
 
 }
diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java b/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java
index d8265472..0d4abb90 100644
--- a/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java
+++ b/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java
@@ -30,12 +30,6 @@ public interface Excl03Service {
 	 */
 	List<DataObject> getCrackdownReRegistrations(Excl03Query req);
 
-	/**지정한 ID의 단속 재등록 정보를 반환한다.<br />
-	 * @param reRegId 단속 재등록 ID
-	 * @return 단속 재등록 정보
-	 */
-	DataObject getCrackdownReRegistrationInfo(String reRegId);
-
 	/**단속 재등록 정보를 등록한다.
 	 * @param excl03 단속 재등록
 	 * @return 저장 여부
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java
index fd444141..2d1d772e 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java
@@ -34,6 +34,8 @@ public class Excl01Bean extends AbstractComponent {
 	 * @return 부과제외 대장 목록
 	 */
 	public List<DataObject> getLevyExclusionList(Excl01Query req) {
+		req.setOrderBy("LEVY_EXCL_ID");											// 정렬
+
 		return excl01Mapper.selectLevyExclList(req);
 	}
 
@@ -41,11 +43,11 @@ public class Excl01Bean extends AbstractComponent {
 	 * @param levyExclId 부과제외 ID
 	 * @return 부과제외 정보
 	 */
-	public DataObject getLevyExclusionInfo(Excl01Query req) {
+	public DataObject getInfo(Excl01Query req) {
 		if (req.getLevyExclId() != null) {
-			return excl01Mapper.selectLevyExclInfo(req.getLevyExclId());		// 수정(부과제외 조회)
+			return excl01Mapper.selectInfo(req.getLevyExclId());				// 수정(부과제외 조회)
 		} else {
-			DataObject dataCrdn = excl01Mapper.selectCrdnLevyExcl(req);			// 등록(단속 조회)
+			DataObject dataCrdn = excl01Mapper.selectCrdn(req);					// 등록(단속 조회)
 
 			// 초기 데이터 설정
 			dataCrdn.set("LEVY_EXCL_YMD", dataCrdn.get("TODAY"));				// 부과 제외 일자
@@ -93,7 +95,7 @@ public class Excl01Bean extends AbstractComponent {
 	 * @return 부과제외 대장 목록
 	 */
 	public DataObject getCrdnLevyExclusion(String crdnId) {
-		return excl01Mapper.selectCrdnLevyExcl(crdnId);
+		return excl01Mapper.selectCrdnInfo(crdnId);
 	}
 
 	/**단속 대장 정보를 수정한다.
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
index abf80fd5..c5be9402 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
@@ -43,8 +43,8 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 	}
 
 	@Override
-	public DataObject getLevyExclusionInfo(Excl01Query req) {
-		return excl01Bean.getLevyExclusionInfo(req);
+	public DataObject getInfo(Excl01Query req) {
+		return excl01Bean.getInfo(req);
 	}
 
 	@Override
@@ -171,7 +171,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 		CrdnSttsHstry deltCrdnSttsHstry = new CrdnSttsHstry();					// 단속상태이력(TB_CRDN_STTS_HSTRY) 삭제
 
 		// 부과제외(TB_LEVY_EXCL) + 단속(TB_CRDN) 자료 조회
-		infoCrdnSttsCd = excl01Bean.getLevyExclusionInfo(new Excl01Query().setLevyExclId(excl01.getLevyExclId()));
+		infoCrdnSttsCd = excl01Bean.getInfo(new Excl01Query().setLevyExclId(excl01.getLevyExclId()));
 
 		// 단속 상태 이력(TB_CRDN_STTS_HSTRY) 대장에서 부과제외 자료 조회
 		infoCrdnSttsHstry = crdnSttsHstryBean.getCrdnSttsHstryInfo(infoCrdnSttsCd.string("CRDN_ID"));
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java
index e55d4687..33072d47 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java
@@ -34,6 +34,8 @@ public class Excl02Bean extends AbstractComponent {
 	 * @return 의견제출 대장 목록
 	 */
 	public List<DataObject> getOpinionSubmissionList(Excl02Query req) {
+		req.setOrderBy("OPNN_ID");												// 정렬
+
 		return excl02Mapper.selectOpnnSbmsnList(req);
 	}
 
@@ -49,8 +51,17 @@ public class Excl02Bean extends AbstractComponent {
 	 * @param opnnId 의견제출 ID
 	 * @return 의견제출 정보
 	 */
-	public DataObject getOpinionSubmissionInfo(String opnnId) {
-		return excl02Mapper.selectOpnnSbmsnInfo(opnnId);
+	public DataObject getInfo(Excl02Query req) {
+		if (req.getOpnnId() != null) {
+			return excl02Mapper.selectInfo(req.getOpnnId());					// 수정(의견제출 조회)
+		} else {
+			DataObject dataCrdn = excl02Mapper.selectCrdn(req);					// 등록(단속 조회)
+
+			// 초기 데이터 설정
+			dataCrdn.set("RCPT_YMD", dataCrdn.get("TODAY"));					// 접수 일자
+
+			return dataCrdn;
+		}
 	}
 
 	/**의견제출 대장 정보를 등록한다.
@@ -60,8 +71,8 @@ public class Excl02Bean extends AbstractComponent {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	public boolean createOpinionSubmission(Excl02 excl02) {
-		return excl02Mapper.insertOpnnSbmsn(excl02);
+	public boolean create(Excl02 excl02) {
+		return excl02Mapper.insert(excl02);
 	}
 
 	/**의견제출 대장 정보를 수정한다.
@@ -71,8 +82,8 @@ public class Excl02Bean extends AbstractComponent {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	public boolean updateOpinionSubmission(Excl02 excl02) {
-		return excl02Mapper.updateOpnnSbmsn(excl02);
+	public boolean update(Excl02 excl02) {
+		return excl02Mapper.update(excl02);
 	}
 
 	/**의견제출 대장 정보를 삭제한다.
@@ -82,8 +93,8 @@ public class Excl02Bean extends AbstractComponent {
 	 *     <li>그렇지 않으면 false</li>
 	 * </ul>
 	 */
-	public boolean removeOpinionSubmission(Excl02 excl02) {
-		return excl02Mapper.deleteOpnnSbmsn(excl02);
+	public boolean remove(Excl02 excl02) {
+		return excl02Mapper.delete(excl02);
 	}
 
 }
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java
index 990770bc..1038221d 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java
@@ -40,23 +40,23 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv
 	}
 
 	@Override
-	public DataObject getOpinionSubmissionInfo(String opnnId) {
-		return excl02Bean.getOpinionSubmissionInfo(opnnId);
+	public DataObject getInfo(Excl02Query req) {
+		return excl02Bean.getInfo(req);
 	}
 
 	@Override
-	public boolean createOpinionSubmission(Excl02 excl02) {
-		return excl02Bean.createOpinionSubmission(excl02);
+	public boolean create(Excl02 excl02) {
+		return excl02Bean.create(excl02);
 	}
 
 	@Override
-	public boolean updateOpinionSubmission(Excl02 excl02) {
-		return excl02Bean.updateOpinionSubmission(excl02);
+	public boolean update(Excl02 excl02) {
+		return excl02Bean.update(excl02);
 	}
 
 	@Override
-	public boolean removeOpinionSubmission(Excl02 excl02) {
-		return excl02Bean.removeOpinionSubmission(excl02);
+	public boolean remove(Excl02 excl02) {
+		return excl02Bean.remove(excl02);
 	}
 
 }
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java
index f861ae08..496ba0d9 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java
@@ -34,6 +34,8 @@ public class Excl03Bean extends AbstractComponent {
 	 * @return 단속 재등록 목록
 	 */
 	public List<DataObject> getCrackdownReRegistrationList(Excl03Query req) {
+		req.setOrderBy("RE_REG_ID");											// 정렬
+
 		return excl03Mapper.selectCrdnReRegList(req);
 	}
 
@@ -45,14 +47,6 @@ public class Excl03Bean extends AbstractComponent {
 		return excl03Mapper.selectCrdnReRegs(req);
 	}
 
-	/**지정한 ID의 단속 재등록 정보를 반환한다.<br />
-	 * @param opnnId 단속 재등록 ID
-	 * @return 단속 재등록 정보
-	 */
-	public DataObject getCrackdownReRegistrationInfo(String opnnId) {
-		return excl03Mapper.selectCrdnReRegInfo(opnnId);
-	}
-
 	/**단속 재등록 정보를 등록한다.
 	 * @param excl03 단속 재등록
 	 * @return 저장 여부
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java
index 869593e4..ca3bbcad 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java
@@ -44,11 +44,6 @@ public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Serv
 		return excl03Bean.getCrackdownReRegistrations(req);
 	}
 
-	@Override
-	public DataObject getCrackdownReRegistrationInfo(String reRegId) {
-		return excl03Bean.getCrackdownReRegistrationInfo(reRegId);
-	}
-
 	@Override
 	public boolean create(Excl03 excl03) {
 		// 변수 선언
diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
index d19d3a67..6c091b16 100644
--- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
+++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
@@ -78,8 +78,8 @@ public class Excl01Controller extends ApplicationController {
 	 * }</pre>
 	 */
 	@RequestMapping(name = "부과제외 정보 조회", value = "/020/info.do")
-	public ModelAndView getLevyExclusioninfo(Excl01Query req) {
-		DataObject levyExclusionInfo = excl01Service.getLevyExclusionInfo(req);
+	public ModelAndView getInfo(Excl01Query req) {
+		DataObject levyExclusionInfo = excl01Service.getInfo(req);
 
 		boolean json = jsonResponse();
 
diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java
index 9201910d..13acb1f1 100644
--- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java
+++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java
@@ -7,6 +7,7 @@ import javax.annotation.Resource;
 
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.code.CommonCode;
@@ -78,17 +79,25 @@ public class Excl02Controller extends ApplicationController {
 	 * }</pre>
 	 */
 	@RequestMapping(name = "의견제출 정보 조회", value = "/020/info.do")
-	public ModelAndView getOpinionSubmissionInfo(String opnnId) {
-		if (!isEmpty(opnnId)) {
-			DataObject opinionSubmissionInfo = excl02Service.getOpinionSubmissionInfo(opnnId);
+	public ModelAndView getInfo(Excl02Query req) {
+		DataObject opnnSbmsnInfo = excl02Service.getInfo(req);
 
-			boolean json = jsonResponse();
+		boolean json = jsonResponse();
 
-			return new ModelAndView(json ? "jsonView" : "fims/excl/excl02020-info")
-				.addObject("opinionSubmissionInfo", json ? opinionSubmissionInfo : toJson(opinionSubmissionInfo));
-		} else {
-			return new ModelAndView("fims/excl/excl02020-info");
-		}
+		ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl02020-info");
+
+		// View(jsp)에서 사용할 공통코드를 조회
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM029", "FIM030", "FIM031", "FIM032", "FIM033", "FIM054");
+
+		return mav
+				.addObject("pageName", "excl02020")
+				.addObject("FIM029List", commonCodes.get("FIM029"))				// 접수 구분 코드(RCPT_SE_CD)
+				.addObject("FIM030List", commonCodes.get("FIM030"))				// 통보 구분 코드(NTFCTN_SE_CD)
+				.addObject("FIM032List", commonCodes.get("FIM032"))				// 소유주 관계 구분 코드(OWNR_REL_CD)
+				.addObject("FIM033List", commonCodes.get("FIM033"))				// 의견 제출 구분 코드(OPNN_SBMSN_SE_CD)
+				.addObject("FIM054List", commonCodes.get("FIM054"))				// 업무 구분 코드(TASK_SE_CD)
+				.addObject("opnnSbmsnInfo", json ? opnnSbmsnInfo : toJson(opnnSbmsnInfo))
+		;
 	}
 
 	/**의견제출 대장를 등록한다.
@@ -98,9 +107,9 @@ public class Excl02Controller extends ApplicationController {
 	 *     "saved": 등록되었으면 true, 그렇지 않으면 false
 	 * }</code></pre>
 	 */
-	@PostMapping(name="의견제출 대장 등록", value="/010/create.do")
-	public ModelAndView createOpinionSubmission(Excl02 excl02) {
-		boolean saved = excl02Service.createOpinionSubmission(excl02);
+	@PostMapping(name="의견제출 대장 등록", value="/020/create.do")
+	public ModelAndView create(Excl02 excl02) {
+		boolean saved = excl02Service.create(excl02);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
@@ -113,9 +122,9 @@ public class Excl02Controller extends ApplicationController {
 	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
 	 * }</code></pre>
 	 */
-	@PostMapping(name="의견제출 대장 수정", value="/010/update.do")
-	public ModelAndView updateOpinionSubmission(Excl02 excl02) {
-		boolean saved = excl02Service.updateOpinionSubmission(excl02);
+	@PostMapping(name="의견제출 대장 수정", value="/020/update.do")
+	public ModelAndView update(Excl02 excl02, MultipartFile[] uploadFileList) {
+		boolean saved = excl02Service.update(excl02);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
@@ -130,8 +139,8 @@ public class Excl02Controller extends ApplicationController {
 	 * }</code></pre>
 	 */
 	@PostMapping(name="의견제출 대장 제거", value="/010/remove.do")
-	public ModelAndView removeOpinionSubmission(Excl02 excl02) {
-		boolean saved = excl02Service.removeOpinionSubmission(excl02);
+	public ModelAndView remove(Excl02 excl02) {
+		boolean saved = excl02Service.remove(excl02);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java
index d82dc8a9..a46f38b0 100644
--- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java
+++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java
@@ -14,7 +14,6 @@ import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.excl.Excl03;
 import cokr.xit.fims.excl.Excl03Query;
 import cokr.xit.fims.excl.service.Excl03Service;
-import cokr.xit.foundation.data.DataObject;
 
 /**단속 재등록 서비스의 웹 컨트롤러
  *
@@ -68,27 +67,6 @@ public class Excl03Controller extends ApplicationController {
 		return setCollectionInfo(new ModelAndView("jsonView"), result, "crdnReReg");
 	}
 
-	/**지정한 ID의 단속 재등록 정보를 반환한다.
-	 * @param reRegId 단속 재등록 ID
-	 * @return fims/excl/excl03020-info 또는 jsonView
-	 * <pre>{
-	 *     "opnnSbmsnInfo": 단속 재등록 정보
-	 * }</pre>
-	 */
-	@RequestMapping(name="단속 재등록 정보 조회", value="/020/info.do")
-	public ModelAndView getCrackdownReRegistrationInfo(String reRegId) {
-		if (!isEmpty(reRegId)) {
-			DataObject crackdownReRegistrationInfo = excl03Service.getCrackdownReRegistrationInfo(reRegId);
-
-			boolean json = jsonResponse();
-
-			return new ModelAndView(json ? "jsonView" : "fims/excl/excl03020-info")
-				.addObject("crackdownReRegistrationInfo", json ? crackdownReRegistrationInfo : toJson(crackdownReRegistrationInfo));
-		} else {
-			return new ModelAndView("fims/excl/excl03020-info");
-		}
-	}
-
 	/**단속 재등록를 등록한다.
 	 * @param excl03 단속 재등록 정보
 	 * @return jsonView
diff --git a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
index 72036d62..4282fbac 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
@@ -83,9 +83,9 @@
              , E.CVLCPT_APLCNT_NM                                                                               /* 민원 신청인 명 */
              , E.CVLCPT_PRCS_PIC_NM                                                                             /* 민원 처리 담당자 명 */
           FROM TB_LEVY_EXCL A
-         INNER JOIN TB_CRDN C           ON (A.CRDN_ID   = C.CRDN_ID)
-    LEFT OUTER JOIN TB_PAYER D          ON (C.RTPYR_ID  = D.RTPYR_ID)
-    LEFT OUTER JOIN TB_CRDN_CVLCPT E    ON (C.CRDN_ID   = E.CRDN_ID AND E.DEL_YN = 'N')
+         INNER JOIN TB_CRDN C           ON (A.CRDN_ID = C.CRDN_ID)
+    LEFT OUTER JOIN TB_PAYER D          ON (C.RTPYR_ID = D.RTPYR_ID)
+    LEFT OUTER JOIN TB_CRDN_CVLCPT E    ON (C.CRDN_ID = E.CRDN_ID AND E.DEL_YN = 'N')
 	</sql>
 
 	<select id="selectLevyExclList" parameterType="map" resultType="dataobject">/* 부과제외 대장 목록 조회(excl01Mapper.selectLevyExclList) */
@@ -214,8 +214,10 @@
              , C.VHRNO                                                                                          /* 차량번호 */
              , C.CRDN_STTS_CD                                                                                   /* 단속 상태 코드 */
              , (SELECT FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL)              AS CRDN_STTS_NM         /* 단속 상태 명 */
+             , D.RTPYR_NM                                                                                       /* 납부자 명 */
           FROM TB_LEVY_EXCL A
          INNER JOIN TB_CRDN C           ON (A.CRDN_ID = C.CRDN_ID)
+    LEFT OUTER JOIN TB_PAYER D          ON (C.RTPYR_ID = D.RTPYR_ID)
 	</sql>
 
 	<select id="selectLevyExcls" parameterType="map" resultType="dataobject">/* 부과제외 대장 객체 가져오기(excl01Mapper.selectLevyExcl) */
@@ -231,7 +233,28 @@
            AND A.DEL_YN                 =  #{delYn}                                                             /* 삭제 여부 */
             </if>
         </where>
-        <include refid="utility.sortBy" /> DESC
+        <include refid="utility.orderBy" />
+	</select>
+
+	<select id="selectCrdn" parameterType="map" resultType="dataobject">/* 단속 대장 객체 가져오기(excl01Mapper.selectCrdn) */
+        SELECT A.CRDN_ID                                                                                        /* 단속 ID */
+             , A.SGG_CD                                                                                         /* 시군구 코드 */
+             , A.TASK_SE_CD                                                                                     /* 업무 구분 코드 */
+             , A.CRDN_REG_SE_CD                                                                                 /* 단속 등록 구분 코드 */
+             , A.CRDN_YMD                                                                                       /* 단속 일자 */
+             , A.CRDN_TM                                                                                        /* 단속 시각 */
+             , A.VHRNO                                                                                          /* 차량번호 */
+             , A.CRDN_STTS_CD                                                                                   /* 단속 상태 코드 */
+             , (SELECT FN_GET_CODE_NM('FIM010', A.CRDN_STTS_CD) FROM DUAL)              AS CRDN_STTS_NM         /* 단속 상태 명 */
+             , A.CRDN_STTS_CHG_DT                                                                               /* 단속 상태 변경 일시 */
+             , B.RTPYR_ID                                                                                       /* 납부자 ID */
+             , B.RTPYR_NM                                                                                       /* 납부자 명 */
+             , C.LEVY_EXCL_ID                                                                                   /* 부과 제외 ID */
+             , <include refid="utility.today" />                                        AS TODAY                /* 오늘 일자 */
+          FROM TB_CRDN A
+    LEFT OUTER JOIN TB_PAYER     B      ON (A.RTPYR_ID = B.RTPYR_ID)
+    LEFT OUTER JOIN TB_LEVY_EXCL C      ON (A.CRDN_ID = C.CRDN_ID AND C.DEL_YN = 'N')
+         WHERE A.CRDN_ID                =  #{crdnId}                                                            /* 단속 ID */
 	</select>
 
 	<insert id="insertLevyExcl" parameterType="map">/* 부과제외 대장 등록(excl01Mapper.insertLevyExcl) */
@@ -302,30 +325,6 @@
         </choose>
 	</update>
 
-	<select id="selectCrdnLevyExcl" parameterType="map" resultType="dataobject">/* 단속 대장 객체 가져오기(excl01Mapper.selectCrdnLevyExcl) */
-        SELECT A.CRDN_ID                                                                                        /* 단속 ID */
-             , A.SGG_CD                                                                                         /* 시군구 코드 */
-             , A.TASK_SE_CD                                                                                     /* 업무 구분 코드 */
-             , A.CRDN_REG_SE_CD                                                                                 /* 단속 등록 구분 코드 */
-             , A.CRDN_YMD                                                                                       /* 단속 일자 */
-             , A.CRDN_TM                                                                                        /* 단속 시각 */
-             , A.VHRNO                                                                                          /* 차량번호 */
-             , A.CRDN_STTS_CD                                                                                   /* 단속 상태 코드 */
-             , (SELECT FN_GET_CODE_NM('FIM010', A.CRDN_STTS_CD) FROM DUAL)              AS CRDN_STTS_NM         /* 단속 상태 명 */
-             , A.CRDN_STTS_CHG_DT                                                                               /* 단속 상태 변경 일시 */
-             , B.LEVY_EXCL_ID                                                                                   /* 부과 제외 ID */
-             , B.LEVY_EXCL_YMD                                                                                  /* 부과제외 일자 */
-             , B.LEVY_EXCL_SE_CD                                                                                /* 부과제외 구분 코드 */
-             , (SELECT FN_GET_CODE_NM('FIM021', B.LEVY_EXCL_SE_CD) FROM DUAL)           AS LEVY_EXCL_SE_NM      /* 부과 제외 구분 명 */
-             , B.LEVY_EXCL_RSN_CD                                                                               /* 부과제외 사유 코드 */
-             , (SELECT FN_GET_CODE_NM('FIM022', B.LEVY_EXCL_RSN_CD) FROM DUAL)          AS LEVY_EXCL_RSN_NM     /* 부과 제외 사유 명 */
-             , B.ETC_CN                                                                                         /* 기타 내용 */
-             , <include refid="utility.today" />                                        AS TODAY                /* 오늘 일자 */
-          FROM TB_CRDN A
-    LEFT OUTER JOIN TB_LEVY_EXCL B      ON (A.CRDN_ID = B.CRDN_ID AND B.DEL_YN = 'N')
-         WHERE A.CRDN_ID                =  #{crdnId}                                                            /* 단속 ID */
-	</select>
-
 	<update id="updateCrdnSttsCd" parameterType="map">/* 단속 대장 수정(excl01Mapper.updateCrdnSttsCd) */
         UPDATE TB_CRDN
            SET CRDN_STTS_CD             =  #{excl01.crdnSttsCd}                                                 /* 단속 상태 코드 */
diff --git a/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml
index 16c284ca..96b6f8e0 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml
@@ -119,8 +119,8 @@
              , D.ADDR                                                                                           /* 주소 */
              , D.DTL_ADDR                                                                                       /* 상세 주소 */
           FROM TB_OPNN_SBMSN A
-         INNER JOIN TB_CRDN C           ON (A.CRDN_ID   = C.CRDN_ID)
-          LEFT OUTER JOIN TB_PAYER D    ON (C.RTPYR_ID  = D.RTPYR_ID)
+         INNER JOIN TB_CRDN C           ON (A.CRDN_ID = C.CRDN_ID)
+    LEFT OUTER JOIN TB_PAYER D          ON (C.RTPYR_ID = D.RTPYR_ID)
 	</sql>
 
 	<select id="selectOpnnSbmsnList" parameterType="map" resultType="dataobject">/* 의견제출 대장 목록 조회(excl02Mapper.selectOpnnSbmsnList) */
@@ -275,26 +275,59 @@
              , A.DEL_DT                                                                                         /* 삭제 일시 */
              , A.DLTR                                                                                           /* 삭제자 */
              , A.DEL_RSN                                                                                        /* 삭제 사유 */
+             , C.CRDN_YMD                                                                                       /* 단속 일자 */
+             , C.CRDN_TM                                                                                        /* 단속 시각 */
+             , C.VHRNO                                                                                          /* 차량번호 */
+             , C.CRDN_STTS_CD                                                                                   /* 단속 상태 코드 */
+             , (SELECT FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL)              AS CRDN_STTS_NM         /* 단속 상태 명 */
+             , D.RTPYR_NM                                                                                       /* 납부자 명 */
           FROM TB_OPNN_SBMSN A
+         INNER JOIN TB_CRDN C           ON (A.CRDN_ID = C.CRDN_ID)
+    LEFT OUTER JOIN TB_PAYER D          ON (C.RTPYR_ID = D.RTPYR_ID)
 	</sql>
 
-	<select id="selectOpnnSbmsnInfo" parameterType="map" resultMap="excl02Row">/* 의견제출 대장 객체 가져오기(excl02Mapper.selectOpnnSbmsnInfo) */
-        <include refid="select" />
-         WHERE A.OPNN_ID                = #{opnnId}                             /* 부과 제외 ID */
-        <include refid="utility.orderBy" />
-	</select>
-
-	<select id="selectOpnnSbmsns" parameterType="map" resultMap="excl02Row">/* 의견제출 대장 객체 가져오기(excl02Mapper.selectOpnnSbmsns) */
+	<select id="selectOpnnSbmsns" parameterType="map" resultType="dataobject">/* 의견제출 대장 객체 가져오기(excl02Mapper.selectOpnnSbmsns) */
         <include refid="select" />
-         WHERE A.DEL_YN                 = 'N'                                   /* 삭제 여부 */
-        <if test="opnnIds != null">
+        <where>
+            <if test="opnnIDs != null">
            AND A.OPNN_ID IN (
-            <foreach collection="opnnIds" item="opnnId" separator=","> #{opnnId} </foreach>
+            <foreach collection="opnnIDs" item="opnnId" separator=","> #{opnnId} </foreach>
                )
-        </if>
+            </if>
+            <if test="opnnId != null">
+           AND A.OPNN_ID                =  #{opnnId}                                                            /* 의견제출 ID */
+            </if>
+            <if test="crdnId != null">
+           AND A.CRDN_ID                =  #{crdnId}                                                            /* 단속 ID */
+            </if>
+            <if test="delYn != null">
+           AND A.DEL_YN                 =  #{delYn}                                                             /* 삭제 여부 */
+            </if>
+        </where>
         <include refid="utility.orderBy" />
 	</select>
 
+	<select id="selectCrdn" parameterType="map" resultType="dataobject">/* 단속 대장 객체 가져오기(excl02Mapper.selectCrdn) */
+        SELECT A.CRDN_ID                                                                                        /* 단속 ID */
+             , A.SGG_CD                                                                                         /* 시군구 코드 */
+             , A.TASK_SE_CD                                                                                     /* 업무 구분 코드 */
+             , A.CRDN_REG_SE_CD                                                                                 /* 단속 등록 구분 코드 */
+             , A.CRDN_YMD                                                                                       /* 단속 일자 */
+             , A.CRDN_TM                                                                                        /* 단속 시각 */
+             , A.VHRNO                                                                                          /* 차량번호 */
+             , A.CRDN_STTS_CD                                                                                   /* 단속 상태 코드 */
+             , (SELECT FN_GET_CODE_NM('FIM010', A.CRDN_STTS_CD) FROM DUAL)              AS CRDN_STTS_NM         /* 단속 상태 명 */
+             , A.CRDN_STTS_CHG_DT                                                                               /* 단속 상태 변경 일시 */
+             , B.RTPYR_ID                                                                                       /* 납부자 ID */
+             , B.RTPYR_NM                                                                                       /* 납부자 명 */
+             , C.OPNN_ID                                                                                        /* 의견 ID */
+             , <include refid="utility.today" />                                        AS TODAY                /* 오늘 일자 */
+          FROM TB_CRDN A
+    LEFT OUTER JOIN TB_PAYER      B     ON (A.RTPYR_ID = B.RTPYR_ID)
+    LEFT OUTER JOIN TB_OPNN_SBMSN C     ON (A.CRDN_ID = C.CRDN_ID AND C.DEL_YN = 'N')
+         WHERE A.CRDN_ID                =  #{crdnId}                                                            /* 단속 ID */
+	</select>
+
 	<insert id="insertOpnnSbmsn" parameterType="map">/* 의견제출 대장 등록(excl02Mapper.insertOpnnSbmsn) */
         INSERT
           INTO TB_OPNN_SBMSN (
@@ -403,7 +436,7 @@
          WHERE OPNN_ID                  = #{opnnSbmsn.opnnId}                   /* 의견 ID */
 	</update>
 
-	<update id="deleteOpnnSbmsn" parameterType="map">/* 의견제출 대장 삭제(excl02Mapper.deleteOpnnSbmsn) */
+	<update id="delete" parameterType="map">/* 의견제출 대장 삭제(excl02Mapper.deleteOpnnSbmsn) */
         UPDATE TB_OPNN_SBMSN
            SET DEL_YN                   = 'Y'
              , DEL_DT                   = <include refid="utility.now" />       /* 삭제 일시 */
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
index 8b25781b..1351d64f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
@@ -350,7 +350,7 @@
 					  id : ${pageName}Control.prefixed("dialog")
 					, title : "개별총정보"
 					, content : resp
-					, size : "xl"
+					, size : "xxl"
 //					, init : () => ${pageName}Control.setInfo(info)				// 개별총정보 다이얼로그에서 실행할 함수
 				});
 			}
@@ -409,9 +409,9 @@
 */
 
 	/**************************************************************************
-	 *
+	 * 초기 셋팅
 	 **************************************************************************/
-	// 초기 설정
+	// 화면 초기값 셋팅
 	function initForm${pageName}() {
 		// 달력 초기화
 		initDatepicker("frmSearch--${pageName}");
@@ -497,7 +497,6 @@
 		if (!pageNumber) pageNumber = 1;
 
 		${pageName}Control.query = fnGetParams${pageName}();					// 검색조건
-		${pageName}Control.query.orderBy = "LEVY_EXCL_ID";						// 정렬
 
 		${pageName}Control.load(pageNumber);
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
index ce247668..3657fed6 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
@@ -70,7 +70,6 @@
 	var prefixUrl = "/excl/excl01";
 	//
  	var ${pageName}Fields = new FormFields("#frmEdit--${pageName}");
- 	var ${pageName}Mode = "${pageMode}";
  	// 공통 코드
 	var FIM021 = new CommonCodes(${FIM021}, true);
 	var FIM022 = new CommonCodes(${FIM022}, true);
@@ -84,11 +83,11 @@
 		, keymapper : info => info ? info.LEVY_EXCL_ID : ""
 		, dataGetter : obj => obj.levyExclInfo
 		, urls : {
-			  create : wctx.url(prefixUrl + "/020/create.do")			// 등록
-			, update : wctx.url(prefixUrl + "/020/update.do")			// 수정
+			  create : wctx.url(prefixUrl + "/020/create.do")					// 등록
+			, update : wctx.url(prefixUrl + "/020/update.do")					// 수정
 		}
 		, formats : {
-	    	  LEVY_EXCL_YMD : dateFormat
+	    	LEVY_EXCL_YMD : dateFormat
 		}
 	});
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
index 5c2a812d..9e683c4f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp
@@ -282,7 +282,7 @@
 	var ${pageName}Control = new DatasetControl({
 		  prefix : "opnnSbmsn"
 		, prefixName : "의견제출"
-		, infoSize : "lg"
+		, infoSize : "xl"
 		, keymapper : info => info ? info.OPNN_ID : ""
 		, dataGetter : obj => obj.opnnSbmsnList
 		, appendData : true
@@ -360,17 +360,16 @@
 					  id : ${pageName}Control.prefixed("dialog")
 					, title : "개별총정보"
 					, content : resp
-					, size : "xl"
-//					, init : () => ${pageName}Control.setInfo(info)				// 개별총정보 다이얼로그에서 실행할 함수
+					, size : "xxl"
 				});
 			}
 		});
 	}
 
 	/**************************************************************************
-	 *
+	 * 초기 셋팅
 	 **************************************************************************/
-	// 초기 설정
+	// 화면 초기값 셋팅
 	function initForm${pageName}() {
 		// 달력 초기화
 		initDatepicker("frmSearch--${pageName}");
@@ -382,6 +381,19 @@
 
 	// 이벤트
 	function setEvent${pageName}() {
+		// form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용
+		$("#frmSearch--${pageName}").find(".form-date").each(function() {
+			$(this).on("input",function() {
+				let value = this.value.replaceAll("-", "");
+
+				if (value.length > 7) {
+					this.value = value.substring(0,4) + "-" + value.substring(4,6) + "-" + value.substring(6);
+				} else if(value.length > 5) {
+					this.value = value.substring(0,4) + "-" + value.substring(4);
+				}
+			});
+		});
+
 		// DataTables 스크롤 이벤트
 		$("#table-responsive--${pageName}").scroll(function() {
 			let el = $(this);
@@ -442,7 +454,6 @@
 		if (!pageNumber) pageNumber = 1;
 
 		${pageName}Control.query = fnGetParams${pageName}();					// 검색조건
-		${pageName}Control.query.orderBy = "OPNN_ID";							// 정렬
 
 		${pageName}Control.load(pageNumber);
 	}
@@ -461,7 +472,7 @@
 	function fnModify${pageName}() {
 		let opnnId = ${pageName}Control.dataset.getValue("OPNN_ID");
 
-		// 부과 제외 ID 가 없다면.. return
+		// 의견제출 ID 가 없다면.. return
 		if (opnnId == undefined || opnnId == "") {
 			return;
 		}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp
new file mode 100644
index 00000000..15fe6fd1
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp
@@ -0,0 +1,282 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
+<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
+
+<!-- Page Body -->
+<div class="card">
+	<!-- 입력 영역 -->
+	<form id="frmEdit--${pageName}" name="frmEdit">
+		<!-- hidden -->
+		<input type="hidden" id="crdnId--${pageName}" name="crdnId" data-map="CRDN_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" />
+		<input type="hidden" id="opnnId--${pageName}" name="opnnId" data-map="OPNN_ID" />
+
+		<div class="row g-1">
+			<!-- 차량번호 -->
+			<div class="col-md-6">
+				<label for="vhrno--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">차량번호</label>
+				<input type="text" class="form-control w-25" id="vhrno--${pageName}" name="vhrno" data-map="VHRNO" readonly />
+			</div>
+			<!-- 납부자 명 -->
+			<div class="col-md-6">
+				<label for="rtpyrNm--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">납부자</label>
+				<input type="text" class="form-control w-45" id="rtpyrNm--${pageName}" name="rtpyrNm" data-map="RTPYR_NM" readonly />
+			</div>
+			<!-- 접수 번호 -->
+			<div class="col-md-6">
+				<label for="rcptNo--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">접수 번호</label>
+				<input type="text" class="form-control w-25" id="rcptNo--${pageName}" name="rcptNo" data-map="RCPT_NO" required />
+			</div>
+			<!-- 접수 일자 -->
+			<div class="col-md-6">
+				<label for="rcptYmd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">접수 일자</label>
+				<input type="text" class="form-control form-date" id="rcptYmd--${pageName}" name="rcptYmd" data-map="RCPT_YMD"
+					data-fmt-type="day" title="날짜 선택" maxlength="10" required />
+				<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+			</div>
+			<!-- 접수 구분 -->
+			<div class="col-md-6">
+				<label for="rcptSeCd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">접수 구분</label>
+				<select class="form-select" id="rcptSeCd--${pageName}" name="rcptSeCd" data-map="RCPT_SE_CD" required>
+					<option value="">선택하세요</option>
+					<c:forEach items="${FIM029List}" var="item">
+						<option value="${item.code}">${item.value}</option>
+					</c:forEach>
+				</select>
+			</div>
+			<!-- 통보 구분 코드 -->
+			<div class="col-md-6">
+				<label for="ntfctnSeCd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">통보 구분</label>
+				<select class="form-select" id="ntfctnSeCd--${pageName}" name="ntfctnSeCd" data-map="NTFCTN_SE_CD" required>
+					<option value="">선택하세요</option>
+					<c:forEach items="${FIM030List}" var="item">
+						<option value="${item.code}">${item.value}</option>
+					</c:forEach>
+				</select>
+			</div>
+			<!-- 소유주 관계 구분 코드 -->
+			<div class="col-md-12">
+				<label for="ownrRelCd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">소유주 관계 구분</label>
+				<select class="form-select" id="ownrRelCd--${pageName}" name="ownrRelCd" data-map="OWNR_REL_CD">
+					<option value="">선택하세요</option>
+					<c:forEach items="${FIM032List}" var="item">
+						<option value="${item.code}">${item.value}</option>
+					</c:forEach>
+				</select>
+			</div>
+			<!-- 진술자 이름 -->
+			<div class="col-md-6">
+				<label for="sttrNm--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">성명</label>
+				<input type="text" class="form-control w-25" id="sttrNm--${pageName}" name="sttrNm" data-map="STTR_NM" required />
+			</div>
+			<!-- 진술자 생년월일 -->
+			<div class="col-md-6">
+				<label for="sttrBrdt--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">생년월일</label>
+				<input type="text" class="form-control w-25" id="sttrBrdt--${pageName}" name="sttrBrdt" data-map="STTR_BRDT" placeholder="YY-MM-DD" />
+			</div>
+			<!-- 진술자 주소 --><!-- 진술자 우편번호 -->
+			<div class="col-md-12">
+				<label for="sttrAddr--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">주소</label>
+				<input type="text" class="form-control w-75" id="sttrAddr--${pageName}" name="sttrAddr" data-map="STTR_ADDR" />
+				<input type="text" class="form-control w-px-75" id="sttrZip--${pageName}" name="sttrZip" data-map="STTR_ZIP" />
+				<button type="button" class="btn btn-sm btn-outline-dark" onclick="">검색</button>
+			</div>
+			<!-- 진술자 상세주소 -->
+			<div class="col-md-12">
+				<label for="sttrDaddr--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">상세 주소</label>
+				<input type="text" class="form-control w-85" id="sttrDaddr--${pageName}" name="sttrDaddr" data-map="STTR_DADDR" />
+			</div>
+			<!-- 진술자 연락처 -->
+			<div class="col-md-6">
+				<label for="sttrCttpc--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">연락처</label>
+				<input type="text" class="form-control w-25" id="sttrCttpc--${pageName}" name="sttrCttpc" data-map="STTR_CTTPC" />
+			</div>
+			<!-- 진술자 이메일 -->
+			<div class="col-md-6">
+				<label for="sttrEml--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">이메일</label>
+				<input type="text" class="form-control w-45" id="sttrEml--${pageName}" name="sttrEml" data-map="STTR_EML" />
+			</div>
+			<!-- 의견 제출 내용 -->
+			<div class="col-md-12">
+				<label for="opnnSbmsnCn--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">의견제출 내용</label>
+				<textarea class="form-control w-85" id="opnnSbmsnCn--${pageName}" name="opnnSbmsnCn" data-map="OPNN_SBMSN_CN" rows="5" data-maxlengthb="4000">
+				</textarea>
+			</div>
+			<!-- 의견 제출 구분 코드 -->
+			<div class="col-md-12">
+				<label for="opnnSbmsnSeCd--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">의견제출 구분</label>
+				<select class="form-select" id="opnnSbmsnSeCd--${pageName}" name="opnnSbmsnSeCd" data-map="OPNN_SBMSN_SE_CD" required>
+					<option value="">선택하세요</option>
+					<c:forEach items="${FIM033List}" var="item">
+						<option value="${item.code}">${item.value}</option>
+					</c:forEach>
+				</select>
+			</div>
+			<!-- 의견 제출 요지 -->
+			<div class="col-md-12">
+				<label for="opnnSbmsnGist--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">의견제출 요지</label>
+				<input type="text" class="form-control w-85" id="opnnSbmsnGist--${pageName}" name="opnnSbmsnGist" data-map="OPNN_SBMSN_GIST" data-maxlengthb="300" />
+			</div>
+			<!-- 담당자 검토 의견 -->
+			<div class="col-md-12">
+				<label for="picRvwOpnn--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">검토 의견</label>
+				<textarea class="form-control w-85" id="picRvwOpnn--${pageName}" name="picRvwOpnn" data-map="PIC_RVW_OPNN" rows="3" data-maxlengthb="1000">
+				</textarea>
+			</div>
+		</div>
+	</form>
+	<!-- /입력 영역 -->
+
+	<!-- 첨부 파일 등록 -->
+	<div class="card">
+		<form id="frmFile--${pageName}" class="dpv eca" method="post" enctype="multipart/form-data">
+			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple='multiple' hidden />
+		</form>
+		<div class="col-md-12">
+			<button class="btn btn-blue" id="btnAddFile--${pageName}" title="첨부파일추가">파일 추가</button>
+			<button class="btn btn-blue" id="btnDelFile--${pageName}" title="첨부파일삭제">파일 삭제</button>
+		</div>
+	</div>
+	<!-- /첨부 파일 등록 -->
+</div>
+<!-- <div class="card"> -->
+
+<!-- 업무 버튼 표시 -->
+<div>
+	<span class="container-page-btn">
+		<span class="container-window-btn-right">
+			<!-- 업무 버튼 -->
+			<button class="btn btn-primary" id="btnSave--${pageName}" title="저장" onclick="fnSave${pageName}()">저장</button>
+		</span>
+	</span>
+</div>
+<!-- / 업무 버튼 표시 -->
+
+<script>
+	/**************************************************************************
+	 * Global Variable
+	 **************************************************************************/
+	// URL
+	var prefixUrl = "/excl/excl02";
+	//
+ 	var ${pageName}Fields = new FormFields("#frmEdit--${pageName}");
+	// 파일 업로드
+	var ${pageName}UploadFile = uploadSupport("#uploadFileList--${pageName}");
+
+	/**************************************************************************
+	 * DatasetControl
+	 **************************************************************************/
+	var ${pageName}Control = new DatasetControl({
+		  prefix : "opnnSbmsn"
+		, prefixName : "의견제출"
+		, keymapper : info => info ? info.OPNN_ID : ""
+		, dataGetter : obj => obj.opnnSbmsnInfo
+		, urls : {
+			  create : wctx.url(prefixUrl + "/020/create.do")					// 등록
+			, update : wctx.url(prefixUrl + "/020/update.do")					// 수정
+		}
+		, formats : {
+			RCPT_YMD : dateFormat
+		}
+	});
+
+	${pageName}Control.onCurrentChange = item => {
+		${pageName}Fields.set(item);
+	}
+
+	/**************************************************************************
+	 *
+	 **************************************************************************/
+	// 저장 callback
+	${pageName}Control.onSave = (resp) => {
+		if (resp.retSaved == "true") {
+			dialog.alert(resp.retMessage);
+			dialog.close(${pageName}Control.prefix + "dialog");
+		}
+	}
+
+	// 저장
+	${pageName}Control.save = (info) => {
+		if (!info) return;
+
+		let item = ${pageName}Control.getCurrent("item");
+  		let create = isEmpty(info.opnnId);
+
+		let formData = new FormData(document.getElementById("frmFile--${pageName}"));
+		for(let key in info) {
+			let value = info[key];
+
+		    formData.append(key, value);
+		}
+
+		if (formData.get("uploadFileList").size == 0) {
+			formData.delete("uploadFileList");
+		}
+
+		ajax.post({
+			  url : !create ? ${pageName}Control.urls.update : ${pageName}Control.urls.create
+			, data: formData, contentType : false, processData : false
+			, success : resp => ${pageName}Control.onSave(resp)
+		});
+	}
+
+	/**************************************************************************
+	 * 초기 셋팅
+	 **************************************************************************/
+	// 검색조건 초기값 셋팅
+	function initForm${pageName}() {
+		// 달력 초기화
+	    initDatepicker("frmEdit--${pageName}");
+	    $("#rcptYmd--${pageName}").datepicker("setDate", new Date());
+	}
+
+	// 이벤트 설정
+	function setEvent${pageName}() {
+		// form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용
+		$("#frmEdit--${pageName}").find(".form-date").each(function() {
+			$(this).on("input",function() {
+				let value = this.value.replaceAll("-", "");
+
+				if (value.length > 7) {
+					this.value = value.substring(0,4) + "-" + value.substring(4,6) + "-" + value.substring(6);
+				} else if(value.length > 5) {
+					this.value = value.substring(0,4) + "-" + value.substring(4);
+				}
+			});
+		});
+
+		$("#btnAddFile--${pageName}").on('click', () => { $("#uploadFileList--${pageName}").trigger("click"); });
+	}
+
+	/**************************************************************************
+	 * function
+	 **************************************************************************/
+	// 저장
+	function fnSave${pageName}() {
+ 		let formFields = new FimsFormFields("#frmEdit--${pageName}");
+ 		let data = formFields.get();
+
+ 		dialog.alert({
+			  content : "현재 prefixName 정보를 저장하시겠습니까?"
+			, onOK : () => {
+				${pageName}Control.save(formFields.get());
+			}
+		});
+	}
+
+	/**************************************************************************
+	 * script 진입
+	 **************************************************************************/
+	$(document).ready(function() {
+		// 이벤트 설정
+		setEvent${pageName}();
+
+		// 화면 초기 설정
+		initForm${pageName}();
+
+		// Dataset 셋팅 - 단건일 경우 setData
+		${pageName}Control.setData([${opnnSbmsnInfo}]);
+	});
+
+// #sourceURL=excl01020-info.jsp
+</script>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
index d0c10959..cdf15d9d 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp
@@ -147,9 +147,6 @@
 								<button class="btn btn-primary" id="btnCreate--${pageName}" title="등록" onclick="fnSave${pageName}();">
 									등록
 								</button>
-								<button class="btn btn-primary" id="btnRemove--${pageName}" title="삭제" onclick="fnRemove${pageName}();">
-									삭제
-								</button>
 								<button class="btn btn-primary" id="btnBfrCrdnTotalInfo--${pageName}" title="이전 단속정보 보기" onclick="fnBfrCrdnTotalInfo${pageName}();">
 									이전 단속정보 보기
 								</button>
@@ -250,7 +247,6 @@
 		, urls : {
 			  load : wctx.url(prefixUrl + "/010/list.do")				// 검색
 			, create : wctx.url(prefixUrl + "/010/create.do")			// 신규 등록
-			, remove : wctx.url(prefixUrl + "/010/remove.do")			// 자료 삭제
 		}
 		, formats : {
 			  RE_REG_YMD : dateFormat
@@ -317,8 +313,7 @@
 					  id : ${pageName}Control.prefixed("dialog")
 					, title : "개별총정보"
 					, content : resp
-					, size : "xl"
-//					, init : () => ${pageName}Control.setInfo(info)				// 개별총정보 다이얼로그에서 실행할 함수
+					, size : "xxl"
 				});
 			}
 		});
@@ -432,7 +427,6 @@
 		if (!pageNumber) pageNumber = 1;
 
 		${pageName}Control.query = fnGetParams${pageName}();					// 검색조건
-		${pageName}Control.query.orderBy = "RE_REG_ID";							// 정렬
 
 		${pageName}Control.load(pageNumber);
 	}
@@ -463,16 +457,6 @@
 		});
 	}
 
-	// 삭제
-	function fnRemove${pageName}() {
-		dialog.alert({
-			  content : "선택한 ${prefixName} 정보를 삭제하시겠습니까?"
-			, onOK : () => {
-				${pageName}Control.remove();
-			}
-		});
-	}
-
 	// 이전 단속정보 보기
 	function fnBfrCrdnTotalInfo${pageName}() {
 		let bfrCrdnId = ${pageName}Control.dataset.getValue("BFR_CRDN_ID");

From b8a163ec7412ca890731e013233a7a04bb245dc1 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 1 Aug 2023 11:01:08 +0900
Subject: [PATCH 11/20] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/crdn/crdn01020-info.jsp  | 138 ++++++++++++------
 .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  |  54 +++++--
 2 files changed, 136 insertions(+), 56 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
index 8d757f06..6511f94f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
@@ -269,8 +269,8 @@
 		<div class="col-md-12 d-flex justify-content-between">
 			<div class="fs-4 fw-bold">등록된 사진</div>
 			<div>
-				<button type="button" id="btnDeleteExistPhoto--${pageName}" class="btn btn-blue">선택 사진 삭제</button>
 				<button type="button" id="btnEditPhoto--${pageName}" class="btn btn-blue">선택 사진 편집</button>
+				<button type="button" id="btnDeleteExistPhoto--${pageName}" class="btn btn-blue">선택 사진 삭제</button>
 			</div>
 		</div>
 		<div id="display0--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
@@ -281,8 +281,11 @@
 		</form>		
 		<div class="col-md-12 d-flex justify-content-between">
 			<div class="fs-4 fw-bold">추가한 사진</div>
-			<button type="button" id="btnOpenVideoCapture--${pageName}" class="btn btn-blue">동영상 캡쳐</button>
-			<button type="button" id="btnAddFile--${pageName}" class="btn btn-blue">사진 추가</button>
+			<div>
+				<button type="button" id="btnAddFile--${pageName}" class="btn btn-blue">사진 추가</button>
+				<button type="button" id="btnOpenVideoCapture--${pageName}" class="btn btn-blue">동영상 캡쳐</button>
+				<button type="button" id="btnCancelAddFile--${pageName}" class="btn btn-blue">선택 사진 삭제</button>
+			</div>
 		</div>
 		<div id="display--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
 		</div>
@@ -348,6 +351,8 @@ $(document).ready(function(){
 			$P.captureFileArr.forEach(item => formData.append("uploadFileList",item));
 		}
 		
+		//TODO : 편집된 파일, 삭제 사진 키값
+		
 		ajax.post({
 			url:!create ? $P.crdnControl.urls.update : $P.crdnControl.urls.create,
 			data: formData, contentType : false, processData : false,
@@ -379,29 +384,56 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * pageObject.function
 	 **************************************************************************/
-
-	$P.fnDisplay = () => {
-		var displayArea = document.querySelector("#display--${pageName}");
-		
-		var imgTagsFromUploadSet = $P.localUploadArr.map(function(item){
-			return "<img src='"+item.url+"' width='200' height='200' />";
-		}).join("\n");
+	$P.fnMakeImgForExistFile = (fileArr) => {
+		var tagsText = "";
 		
-		var imgTagsFromNumberPlate = "";
-		if($P.numberPlateArr.length > 0){
-			$P.numberPlateArr.forEach(function(item, index){
-				imgTagsFromNumberPlate += "<img src='" + item.url + "' width='200' height='200' />";
-			});
+		for(var index = 0; index < fileArr.length; index++){
+			var item = fileArr[index];
+			
+			tagsText += "<label class='mx-2'>";
+			tagsText += "<input type='radio' name='existPhoto' class='form-check-input' value='"+item.FILE_ID +"' ";
+			if(index == 0){
+				tagsText += " checked='checked' ";
+			}
+			tagsText += " />";
+			tagsText += "<img src='"+ item.URL +"' width='200' height='200' />";
+			tagsText += "</label>";
+				
+			if(index % 2 == 1){
+				tagsText += "<br />"
+			}
 		}
+
+		return tagsText;
+	}
+	
+	
+	$P.fnMakeImgForNewFile = (fileArr) => {
+		var tagsText = "";
 		
-		var imgTagsFromVideo = "";
-		if($P.captureFileArr.length > 0){
-			$P.captureFileArr.forEach(function(item, index){
-				imgTagsFromVideo += "<img src='" + item.url + "' width='200' height='200' />";
-			});
+		for(var index = 0; index < fileArr.length; index++){
+			var item = fileArr[index];
+			
+			tagsText += "<label class='mx-2'>";
+			tagsText += "<input type='checkbox' name='newPhoto' class='form-check-input' value='"+item.id +"' ";
+			tagsText += " />";
+			tagsText += "<img src='"+ item.url +"' width='200' height='200' />";
+			tagsText += "</label>";
+				
+			if(index % 2 == 1){
+				tagsText += "<br />"
+			}
 		}
 
-		displayArea.innerHTML = imgTagsFromUploadSet + imgTagsFromNumberPlate + imgTagsFromVideo;
+		return tagsText;
+	}
+	 
+	$P.fnDisplay = () => {
+		var displayArea = document.querySelector("#display--${pageName}");
+				
+		var concatArr = $P.localUploadArr.concat($P.numberPlateArr).concat($P.captureFileArr);
+		var tagsText = $P.fnMakeImgForNewFile(concatArr);
+		displayArea.innerHTML = tagsText;
 	};
 
 	$P.fnSave = () => {
@@ -447,9 +479,19 @@ $(document).ready(function(){
 	}
 	
 	$P.editPhotoCallback = (modifiedFile, originalFileInfo, isNumberPlate) => {
-		console.log(modifiedFile);
+		
+		modifiedFile.id = "file-" + new Date().getTime() + "-" + "0";
+		modifiedFile.url = (window.URL || window.webkitURL).createObjectURL(modifiedFile);
+		
+		if(isNumberPlate){
+			$P.numberPlateArr.push(modifiedFile);
+			$P.fnDisplay();
+		} else {
+			// TODO : 편집된사진 표시
+		}
+
 		console.log(originalFileInfo);
-		console.log(isNumberPlate);
+
 		
 	}
 	/**************************************************************************
@@ -469,14 +511,42 @@ $(document).ready(function(){
 		);
 	});
 	$("#btnEditPhoto--${pageName}").on('click', () => {
-		var fileId = $("#display0--${pageName}").find("[name='editTarget']:checked").val();
+		var checked = $("#display0--${pageName}").find("[name='existPhoto']:checked");
+		if(checked.length < 1){
+			alert("선택된 사진이 없습니다.");
+			return;
+		}
+		
+		var fileId = checked.val();
 		
 		window.open(wctx.url("/sprt/sprt03/020/main.do?openerPageName=${pageName}&fileId="+fileId)
 				,"editPhoto"
 				,"width=1400,height=750"
 		);
 	});
+
+	$("#btnDeleteExistPhoto--${pageName}").on('click', () => {
+		//기 등록 사진 삭제
+	});
 	
+	$("#btnCancelAddFile--${pageName}").on('click', () => {
+		var checked = $("#display--${pageName}").find("[name='newPhoto']:checked");
+		if(checked.length < 1){
+			alert("선택된 사진이 없습니다.");
+			return;
+		}
+		
+		var checkedArr = [];
+		for(var i=0; i < checked.length; i++){
+			checkedArr.push(checked[i].value);
+		}
+		
+		$P.captureFileArr = $P.captureFileArr.filter(item => checkedArr.indexOf(item.id) == -1);
+		$P.localUploadArr = $P.localUploadArr.filter(item => checkedArr.indexOf(item.id) == -1);
+		$P.numberPlateArr = $P.numberPlateArr.filter(item => checkedArr.indexOf(item.id) == -1);
+
+		$P.fnDisplay();
+	});
 	
 	/**************************************************************************
 	 * 초기화
@@ -525,24 +595,8 @@ $(document).ready(function(){
 	}
 	
 	if(crdnInfo.fileList){
-		var editPhotoArea = "";
-		
-		crdnInfo.fileList.forEach(function(item, index){
-			editPhotoArea += "<label class='mx-2'>"
-			editPhotoArea += "<input type='radio' name='editTarget' class='form-check-input' value='"+item.FILE_ID +"' ";
-			if(index == 0){
-				editPhotoArea += " checked='checked' ";
-			}
-			editPhotoArea += " />";
-			editPhotoArea += "<img src='"+ item.URL +"' width='200' height='200' />";
-			editPhotoArea += "</label>";
-			
-			if(index % 2 == 1){
-				editPhotoArea += "<br />"
-			}
-		});
-		
-		$("#display0--${pageName}").append(editPhotoArea);
+		var tagsText = $P.fnMakeImgForExistFile(crdnInfo.fileList);
+		$("#display0--${pageName}").append(tagsText);
 	} else {
 		
 		$("#display0--${pageName}").append("등록된 사진이 없습니다.");
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 13362d0e..aa641cae 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
@@ -246,6 +246,7 @@
 		<div class="col-md-12">
 			<button type="button" id="btnAddFile--${pageName}" class="btn btn-blue">이미지 추가</button>
 			<button type="button" id="btnOpenVideoCapture--${pageName}" class="btn btn-blue">동영상 캡쳐</button>
+			<button type="button" id="btnCancelAddFile--${pageName}" class="btn btn-blue">선택 사진 삭제</button>
 		</div>
 		<div id="display--${pageName}" style="overflow-y: scroll;height: 600px;border-style: solid;">
 			
@@ -335,24 +336,32 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * pageObject.function
 	 **************************************************************************/
+	$P.fnMakeImgForNewFile = (fileArr) => {
+		var tagsText = "";
+		
+		for(var index = 0; index < fileArr.length; index++){
+			var item = fileArr[index];
+			
+			tagsText += "<label class='mx-2'>";
+			tagsText += "<input type='checkbox' name='newPhoto' class='form-check-input' value='"+item.id +"' ";
+			tagsText += " />";
+			tagsText += "<img src='"+ item.url +"' width='200' height='200' />";
+			tagsText += "</label>";
+				
+			if(index % 2 == 1){
+				tagsText += "<br />"
+			}
+		}
 
+		return tagsText;
+	}
+	 
 	$P.fnDisplay = () => {
 		var displayArea = document.querySelector("#display--${pageName}");
-		
-		var imgTagsFromUploadSet = $P.localUploadArr.map(function(item){
-			return "<img src='"+item.url+"' width='200' height='200' />";
-		}).join("\n");
-		
 
-		var imgTagsFromVideo = "";
-		if($P.captureFileArr.length > 0){
-			$P.captureFileArr.forEach(function(item, index){
-				imgTagsFromVideo += "<img src='" + item.url + "' width='200' height='200' />";
-			});
-		}
-
-		displayArea.innerHTML = imgTagsFromUploadSet + imgTagsFromVideo;
-		
+		var concatArr = $P.localUploadArr.concat($P.captureFileArr);
+		var tagsText = $P.fnMakeImgForNewFile(concatArr);
+		displayArea.innerHTML = tagsText;
 	};
 
 	$P.fnSave = () => {
@@ -411,6 +420,23 @@ $(document).ready(function(){
 		);
 	});
 	
+	$("#btnCancelAddFile--${pageName}").on('click', () => {
+		var checked = $("#display--${pageName}").find("[name='newPhoto']:checked");
+		if(checked.length < 1){
+			alert("선택된 사진이 없습니다.");
+			return;
+		}
+		
+		var checkedArr = [];
+		for(var i=0; i < checked.length; i++){
+			checkedArr.push(checked[i].value);
+		}
+		
+		$P.captureFileArr = $P.captureFileArr.filter(item => checkedArr.indexOf(item.id) == -1);
+		$P.localUploadArr = $P.localUploadArr.filter(item => checkedArr.indexOf(item.id) == -1);
+
+		$P.fnDisplay();
+	});
 	
 	/**************************************************************************
 	 * 초기화

From f2c7c53e21a861149ad397c8b3705b04593609e6 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Tue, 1 Aug 2023 14:27:01 +0900
Subject: [PATCH 12/20] =?UTF-8?q?=EC=9E=90=EB=A7=9D,=20=EA=B5=AD=EB=AF=BC?=
 =?UTF-8?q?=EC=8B=A0=EB=AC=B8=EA=B3=A0,=20epost=20=EC=97=B0=EA=B3=84=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  17 +
 .../java/cokr/xit/fims/FimsApplication.java   |   6 +-
 src/main/resources/application.yml            |   9 +-
 src/main/resources/intf-conf/file-job.conf    |  54 ++
 .../resources/intf-conf/xit-lvis.properties   |  34 +
 .../resources/spring/context-scheduler.xml    |  78 ++
 .../mapper/interfaces/emailRequest-mapper.xml | 835 ++++++++++++++++++
 .../mapper/interfaces/emailResult-mapper.xml  | 216 +++++
 .../sql/mapper/interfaces/smg-mapper.xml      | 386 ++++++++
 .../mapper/interfaces/vehicleInfo-mapper.xml  | 186 ++++
 10 files changed, 1813 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/intf-conf/file-job.conf
 create mode 100644 src/main/resources/intf-conf/xit-lvis.properties
 create mode 100644 src/main/resources/spring/context-scheduler.xml
 create mode 100644 src/main/resources/sql/mapper/interfaces/emailRequest-mapper.xml
 create mode 100644 src/main/resources/sql/mapper/interfaces/emailResult-mapper.xml
 create mode 100644 src/main/resources/sql/mapper/interfaces/smg-mapper.xml
 create mode 100644 src/main/resources/sql/mapper/interfaces/vehicleInfo-mapper.xml

diff --git a/pom.xml b/pom.xml
index ffa7faff..4d3f6447 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,23 @@
 			<artifactId>xit-base-starter</artifactId>
 			<version>23.04.01-SNAPSHOT</version>
 		</dependency>
+
+		<dependency> <!-- 자망연계 -->
+			<groupId>cokr.xit.interfaces</groupId>
+			<artifactId>xit-lvis</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency> <!-- 국민신문고 -->
+			<groupId>cokr.xit.interfaces</groupId>
+			<artifactId>xit-smg</artifactId>
+			<version>23.04.01-SNAPSHOT</version>
+		</dependency>
+		<dependency> <!-- epost -->
+			<groupId>cokr.xit.interfaces</groupId>
+			<artifactId>xit-epost</artifactId>
+			<version>23.04.01-SNAPSHOT</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
diff --git a/src/main/java/cokr/xit/fims/FimsApplication.java b/src/main/java/cokr/xit/fims/FimsApplication.java
index c40490a3..76fc4ada 100644
--- a/src/main/java/cokr/xit/fims/FimsApplication.java
+++ b/src/main/java/cokr/xit/fims/FimsApplication.java
@@ -1,12 +1,14 @@
 package cokr.xit.fims;
 
 import org.springframework.boot.SpringApplication;
+
 import cokr.xit.base.boot.XitBaseApplication;
 
+//@ImportResource("classpath:spring/context-*.xml")
 public class FimsApplication extends XitBaseApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(FimsApplication.class, args);
 	}
-	
-}
+
+}
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6bc8059e..14357d1f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,9 +38,6 @@ propertyService:
     - tempDir: C:\temp
     - pageUnit: 10
     - pageSize: 10
-#  extFileName:
-#    - encoding: UTF-8
-#      filename: classpath*:properties/your-file-01.properties
-#    - encoding: UTF-8
-#      filename: classpath*:properties/your-file-02.properties
-
+  extFileName:
+    - encoding: UTF-8
+      filename: classpath*:intf-conf/xit-lvis.properties
diff --git a/src/main/resources/intf-conf/file-job.conf b/src/main/resources/intf-conf/file-job.conf
new file mode 100644
index 00000000..74d978c2
--- /dev/null
+++ b/src/main/resources/intf-conf/file-job.conf
@@ -0,0 +1,54 @@
+{
+	"dirs": {
+		"receive": "C:\\workspace\\ESB_AGENT\\RCV",         /* 수신 파일 최상위 디렉토리 */
+		"send": "C:\\workspace\\ESB_AGENT\\SND",            /* 전송 파일 최상위 디렉토리 */
+
+		"working": "C:\\workspace\\xit\\filesite\\work",    /* 파일 작업 최상위 디렉토리 */
+		"success": "C:\\workspace\\xit\\filesite\\success", /* 작업 완료한 파일의 최상위 디렉토리 */
+		"fail": "C:\\workspace\\xit\\filesite\\fail"        /* 작업 실패한 파일의 최상위 디렉토리 */
+	},
+
+	"dirCodes": {
+		"smg": "CG131000000768",                            /* 국민신문고 기관코드 */
+		"epost": "CG144523401150"                           /* epost 기관코드 */
+	},
+
+	"defaults": {
+		"charset": "euc-kr",
+		"fetchSize": 100,
+		"workSize": 100
+	},
+
+	"jobs": [
+		{	/* 국민신문고 수신 */
+			"name": "smg-receive",
+			"dirCode": "smg", /* <-- dirCodes */
+			"infoType": "010",
+			"alert": "http://localhost:8080/fims/api/smg/petition/receive.do" /* 업무 통보 url */
+		},
+		{	/* 국민신문고 전송 */
+			"name": "smg-send",
+			"dirCode": "smg", /* <-- dirCodes */
+			"alert": "http://localhost:8080/fims/api/smg/petition/reply.do"   /* 업무 통보 url */
+		},
+
+		{   /* epost 전자우편 신청 전송 */
+			"name": "epost-send-request",
+			"dirCode": "epost", /* <-- dirCodes */
+			
+			"conOrg": "YICT",    /* 외부기관 구분코드 */
+			"rceptId": "40219",  /* 접수우체국 국기호 */
+			"expiryDays": 10,    /* 배달 만료 일수 */
+			
+			"attachmentDir": "C:\\workspace\\xit\\filesite\\attachment\\epost", /* 원본 첨부파일 디렉토리 경로 */
+			"txtFilename": "POSDF5$send_{yyyyMMddHHmmssSSS}.txt",
+			"zipFilename": "POSDF5${conKey}.zip"
+		},
+
+		{   /* epost 전자우편 신청 수신 결과 */
+			"name": "epost-receive-result",
+			"dirCode": "epost",              /* <-- dirCodes */
+			"alert": "http://localhost:8080/fims/api/epost/result/receive.do" /* 업무 통보 url */
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/intf-conf/xit-lvis.properties b/src/main/resources/intf-conf/xit-lvis.properties
new file mode 100644
index 00000000..3e6ae533
--- /dev/null
+++ b/src/main/resources/intf-conf/xit-lvis.properties
@@ -0,0 +1,34 @@
+#\uc2dc\uad70\uad6c\ucf54\ub4dc(\ud544\uc218)
+lvis.sigungu.code=28000
+#\ub2f4\ub2f9\uc790 \uc8fc\ubbfc\ub4f1\ub85d\ubc88\ud638
+lvis.charger.ihinum=
+#\ub2f4\ub2f9\uc790 IP \uc5b4\ub4dc\ub808\uc2a4
+lvis.charger.ip_adres=
+#\ub2f4\ub2f9\uc790\uba85
+lvis.charger.nm=\uc774\uad11\uc9c4
+#\ub2f4\ub2f9\uc790 \uc5f0\ub77d\ucc98
+lvis.charger.wrc_telno=032-440-3963
+
+#\uc815\ubcf4\uc2dc\uc2a4\ud15c ID(\ud544\uc218)
+lvis.info_sys.id=28-230
+#\uc815\ubcf4\uc2dc\uc2a4\ud15c IP(\ud544\uc218)
+lvis.info_sys.ip=101.0.115.13
+#\uc815\ubcf4\uc2dc\uc2a4\ud15c MAC \uc5b4\ub4dc\ub808\uc2a4
+lvis.info_sys.macaddress=EC:EB:B8:97:F2:14
+
+#\uc554\ud638\ud654\ud0a4
+lvis.enc.key=0BCE7F19897CEA91
+#\uc554\ud638\ud654\ud0a4 \uadf8\ub8f9
+lvis.enc.key_group=1
+#\uc554\ud638\ud654\ud0a4 \ubc88\ud638
+lvis.enc.key_no=1
+
+#lvis \uc0ac\uc6a9 \uc11c\ube44\uc2a4 (production || test)
+lvis.host.active=test
+#lvis \uc6b4\uc601 \uc11c\ube44\uc2a4 \uc8fc\uc18c
+lvis.host.production=http://auto.car.go.kr:39700/lvis/services/WsFrontController
+#lvis \ud14c\uc2a4\ud2b8 \uc11c\ube44\uc2a4 \uc8fc\uc18c
+lvis.host.test=http://10.98.198.199:9700/lvis/services/WsFrontController
+
+#\uc790\ub3d9\ucc28 \uae30\ubcf8\uc0ac\ud56d \uc870\ud68c \ub85c\uadf8 \uc800\uc7a5 \uc5ec\ubd80(true || false)
+lvis.log.basicInfo=true
\ No newline at end of file
diff --git a/src/main/resources/spring/context-scheduler.xml b/src/main/resources/spring/context-scheduler.xml
new file mode 100644
index 00000000..957d39da
--- /dev/null
+++ b/src/main/resources/spring/context-scheduler.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:beans="http://www.springframework.org/schema/beans"
+   	   xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" >
+
+	<!-- 국민신문고 민원 수신 -->
+	<bean id="smgReceiver" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject" ref="smgService"/>
+		<property name="targetMethod" value="receivePetitions"/>
+	</bean>
+	<bean id="smgReceiverTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail" ref="smgReceiver" />
+		<property name="cronExpression" value="0 0/1 * * * ?" /> <!-- 10분마다 -->
+	</bean>
+
+	<!-- 국민신문고 민원답변 전송 -->
+	<bean id="smgSender" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject" ref="smgService"/>
+		<property name="targetMethod" value="sendReplies"/>
+	</bean>
+	<bean id="smgSenderTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail" ref="smgSender" />
+		<property name="cronExpression" value="0 0/1 * * * ?" /> <!-- 10분마다 -->
+	</bean>
+
+	<!-- epost 전자우편 신청 전송 -->
+	<bean id="epostSender" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject" ref="emailRequestService"/>
+		<property name="targetMethod" value="sendRequests"/>
+	</bean>
+	<bean id="epostSenderTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail" ref="epostSender" />
+		<property name="cronExpression" value="0 0/1 0 * * ?" /> <!-- 10분마다 -->
+	</bean>
+
+	<!-- epost 전자우편 결과 수신 -->
+	<bean id="epostReceiver" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject" ref="emailResultService"/>
+		<property name="targetMethod" value="receiveResults"/>
+	</bean>
+	<bean id="epostReceiverTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail" ref="epostReceiver" />
+		<!--property name="cronExpression" value="0 30 0 * * ?" /> < 매일 00:30 -->
+		<property name="cronExpression" value="0 0/1 0 * * ?" /> <!-- 1분마다 -->
+	</bean>
+
+	<bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
+		<property name="jobDetails">
+			<list>
+				<ref bean="smgReceiver" />
+				<ref bean="smgSender" />
+				
+				<ref bean="epostSender" />
+				<ref bean="epostReceiver" />
+			</list>
+		</property>
+		
+		<property name="triggers">
+			<list>
+				<ref bean="smgReceiverTrigger" />
+				<ref bean="smgSenderTrigger" />
+
+				<ref bean="epostSenderTrigger" />
+				<ref bean="epostReceiverTrigger" />
+			</list>
+		</property>
+	</bean>
+
+<!-- 
+
+실행 스케쥴 설정 참고 -> https://fmd1225.tistory.com/60
+ -->
+</beans>
\ No newline at end of file
diff --git a/src/main/resources/sql/mapper/interfaces/emailRequest-mapper.xml b/src/main/resources/sql/mapper/interfaces/emailRequest-mapper.xml
new file mode 100644
index 00000000..2e71394c
--- /dev/null
+++ b/src/main/resources/sql/mapper/interfaces/emailRequest-mapper.xml
@@ -0,0 +1,835 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cokr.xit.interfaces.epost.dao.EmailRequestMapper">
+
+<!-- 전자우편 신청 정보 매퍼
+ ========== 변경 이력 ==========
+ 2023-07-03	mjkhan 최초 작성
+ ============================ -->
+
+<select id="selectSendingRequestList" parameterType="map" resultType="dataobject">/* 전자우편 접수 전송 대상 조회(emailRequestMapper.selectSendingRequestList) */
+SELECT CON_ORG                                     <!-- 외부기관구분코드 -->
+     , RCEPT_ID                                    <!-- 접수우체국국기호 -->
+     , DATA_CD                                     <!-- 접수코드 -->
+     , DIV_KB                                      <!-- 취급구분 -->
+     , DFPAYYN                                     <!-- 결재방법 -->
+     , RCPT_KB                                     <!-- 내용문 유형 -->
+     , SEAL_CD                                     <!-- 내용문 상세 종류 -->
+     , WORD_KB                                     <!-- 내용문 종류 -->
+     , MAIL_CNT                                    <!-- 내용문 매수 -->
+     , RECEV_CNT                                   <!-- 수취인 수 -->
+     , ENV_CD                                      <!-- 봉투 종류 -->
+     , COLOR_YN                                    <!-- 칼라우편물/흑백우편물  -->
+     , MM_YN                                       <!-- 메일머지 플래그 -->
+     , FLEX_CD                                     <!-- 이면구분 -->
+     , DM_CNT                                      <!-- 동봉물 개수, 없다면 '0' -->
+     , SB_FG                                       <!-- 반송불필요여부 -->
+     , APVL_NB                                     <!-- 승인번호 -->
+     , SEND_DATE                                   <!-- 신청일자 -->
+     , SEND_TIME                                   <!-- 전송시간 -->
+     , A.CON_KEY                                   <!-- 외부 연계 식별키 -->
+     , RELORSECT_CD                                <!-- 연계기관결제부서코드 -->
+     , RGST_NMBR CON_DATA                          <!-- 외부 연계 추가 데이터 -->
+     , RECEV_SENDER_NM SENDER_NM                   <!-- 발송인명 -->
+     , RECEV_SENDER_ZIPCODE SENDER_ZIPCODE         <!-- 우편번호 -->
+     , RECEV_SENDER_ADDR SENDER_ADDR               <!-- 주소(시, 구) -->
+     , RECEV_SENDER_DETAILADDR SENDER_DTAILADDR    <!-- 상세주소 -->
+     , A.CON_KEY SENDER_DATA                       <!-- 발송인별 추가 데이터 -->
+     , @row_no := CASE WHEN @con_key = A.CON_KEY THEN @row_no + 1
+                       ELSE 1
+	              END SQL_CNT                      <!-- 수취인순번 -->
+     , @con_key := A.CON_KEY _PREV_CON
+     , RECEV_CAR_OWNER_NM RECEV_NM                 <!-- 수취인명 -->
+     , RECEV_CAR_OWNER_ZIPCODE RECEV_ZIPCODE       <!-- 우편번호 -->
+     , RECEV_CAR_OWNER_ADDR RECEV_ADDR             <!-- 주소(시, 구) -->
+     , RECEV_CAR_OWNER_DETAILADDR RECEV_DTAILADDR  <!-- 상세주소 -->
+     , RGST_NMBR                                   <!-- 등기번호 -->
+     , 'NULL' RECEV_DATA                           <!-- 수취인별 추가 데이터 -->
+     , 'NULL' TEL_NUMBER1                          <!-- 수취인별 전화번호(앞) -->
+     , 'NULL' TEL_NUMBER2                          <!-- 수취인별 전화번호(중간) -->
+     , 'NULL' TEL_NUMBER3                          <!-- 수취인별 전화번호(끝) -->
+     , 'NULL' PHONE_NUMBER1                        <!-- 수취인별핸드폰번호(앞) -->
+     , 'NULL' PHONE_NUMBER2                        <!-- 수취인별핸드폰번호(중간) -->
+     , 'NULL' PHONE_NUMBER3                        <!-- 수취인별핸드폰번호(끝) -->
+     , 'NULL' RETURN_NM                            <!-- 회송처 -->
+     , 'NULL' RETURN_ZIPCODE                       <!-- 회송처 우편번호 -->
+     , 'NULL' RETURN_ADDR                          <!-- 회송처 주소 -->
+     , 'NULL' RETURN_DTAILADDR                     <!-- 회송처 상세주소 -->
+     , NULL ATTACH_NM	                           <!-- 첨부파일 -->
+     , RECEV_SENDER_ORG_CODE                       <!-- 발송기관코드 -->
+     , RECEV_SENDER_NM                             <!-- 발송인명 -->
+     , RECEV_SENDER_ZIPCODE                        <!-- 발송인 우편번호 -->
+     , RECEV_SENDER_ADDR                           <!-- 주소(시, 구) -->
+     , RECEV_SENDER_DETAILADDR                     <!-- 상세주소 -->
+     , RECEV_SENDER_DEPART_TEL                     <!-- 부과부서 전화번호 -->
+     , RECEV_SENDER_DEPART_NM                      <!-- 부과부서 -->
+     , RECEV_DIV_CD                                <!-- 등기구분 -->
+     , RECEV_SEQ                                   <!-- 일련번호 -->
+     , RECEV_CODE                                  <!-- 발송코드 -->
+     , RECEV_BAR1D                                 <!-- 바코드 -->
+     , RECEV_BAR2D                                 <!-- 이차원바코드 -->
+     , RECEV_BILL_NUNBER                           <!-- 고지번호 -->
+     , RECEV_DOC_CD1                               <!-- 문서종류1 -->
+     , RECEV_DOC_CD2                               <!-- 문서종류2 -->
+     , RECEV_DOC_CD3                               <!-- 문서종류3 -->
+     , RECEV_DOC_CD4                               <!-- 문서종류4 -->
+     , RECEV_DOC_CD5                               <!-- 문서종류5 -->
+     , RECEV_SUBJ1                                 <!-- 과목명1 -->
+     , RECEV_SUBJ2                                 <!-- 과목명2 -->
+     , RECEV_SUBJ3                                 <!-- 과목명3 -->
+     , RECEV_VIOLATE_DT                            <!-- 위반일시 -->
+     , RECEV_VIOLATE_DONG                          <!-- 위반동 -->
+     , RECEV_VIOLATE_PLACE                         <!-- 위반장소 -->
+     , RECEV_LAWS                                  <!-- 법조항 -->
+     , RECEV_PAY_NUMBER1                           <!-- 납부번호1 -->
+     , RECEV_PAY_NUMBER2                           <!-- 납부번호2 -->
+     , RECEV_OCR0                                  <!-- OCR0 -->
+     , RECEV_OCR1                                  <!-- OCR1 -->
+     , RECEV_OCR2                                  <!-- OCR2 -->
+     , RECEV_ONLINE_PAY_NUMBER                     <!-- 전자납부번호 -->
+     , VRACTNO RECEV_VACCOUNT_NUMBER               <!-- 가상계좌번호 -->
+     , RECEV_FINE_PRICE                            <!-- 과태료 -->
+     , RECEV_PAY_PRICE                             <!-- 납부금액 -->
+     , RECEV_PAY_DT                                <!-- 납부기한 -->
+     , RECEV_PAY_IN_DATE                           <!-- 납기내기한 -->
+     , RECEV_PAY_IN_PRICE                          <!-- 납기내금액 -->
+     , RECEV_PAY_IN_ADD_PRICE                      <!-- 납기내가산금 -->
+     , RECEV_PAY_IN_DEFAULT_PRICE                  <!-- 납기내합계금액 -->
+     , RECEV_PAY_OUT_DATE                          <!-- 납기후기한 -->
+     , RECEV_PAY_OUT_PRICE                         <!-- 납기후금액 -->
+     , RECEV_PAY_OUT_ADD_PRICE                     <!-- 납기후가산금 -->
+     , RECEV_PAY_OUT_DEFAULT_PRICE                 <!-- 납기후합계금액 -->
+     , RECEV_CAR_NUMBER                            <!-- 차량번호 -->
+     , RECEV_CAR_OWNER_ZIPCODE                     <!-- 우편번호 -->
+     , RECEV_CAR_OWNER_ADDR                        <!-- 주소(시, 구) -->
+     , RECEV_CAR_OWNER_DETAILADDR                  <!-- 상세주소 -->
+     , RECEV_CAR_OWNER_NM                          <!-- 소유자명 -->
+     , RECEV_CAR_OWNER_SSN                         <!-- 주민번호(생년월일) -->
+     , RECEV_PRINT_DT                              <!-- 출력일자 -->
+     , RECEV_PRINT_YEAR                            <!-- 출력년도 -->
+     , RECEV_PRINT_MONTH                           <!-- 출력월 -->
+     , RECEV_PRINT_DAY                             <!-- 출력일 -->
+     , RECEV_EVIDENCE_NUMBER                       <!-- 증거번호 -->
+     , RECEV_PHOTO_CNT                             <!-- 사진장수 -->
+     , RECEV_PHOTO_FILENAME1                       <!-- 사진파일명1 -->
+     , RECEV_PHOTO_FILENAME2                       <!-- 사진파일명2 -->
+     , RECEV_PHOTO_FILENAME3                       <!-- 사진파일명3 -->
+     , RECEV_PHOTO_FILENAME4                       <!-- 사진파일명4 -->
+     , REG_VAR_DATA1 RECV_NOTICE_CONTS             <!-- 주.정차위반과태료납부 안내 -->
+     , 'NULL' RECEV_TEMP_DATA1                     <!-- 추가데이터1 -->
+     , 'NULL' RECEV_TEMP_DATA2                     <!-- 추가데이터2 -->
+     , 'NULL' RECEV_TEMP_DATA3                     <!-- 추가데이터3 -->
+     , DTL_VAR_DATA1 RECEV_TEMP_DATA4              <!-- 추가데이터4 (계도 메일 제목) -->
+     , DTL_VAR_DATA2 RECEV_TEMP_DATA5              <!-- 추가데이터5 (계도 메일 내용) -->
+     , RECEV_SENDER_FAX                            <!-- 부과부서 팩스번호 -->
+     , RECEV_SERDER_STAFF                          <!-- 부과부서 담당자 -->
+     , RECEV_SENDER_EMAIL                          <!-- 부과부서 이메일 -->
+     , VRACTNO2 RECEV_TEMP_DATA6                   <!-- 추가데이터6 -->
+     , VRACTNO3 RECEV_TEMP_DATA7                   <!-- 추가데이터7 -->
+     , VRACTNO4 RECEV_TEMP_DATA8                   <!-- 추가데이터8 -->
+     , VRACTNO5 RECEV_TEMP_DATA9                   <!-- 추가데이터9 -->
+     , VRACTNO6 RECEV_TEMP_DATA10                  <!-- 추가데이터10 -->
+     , VRACTNO7 RECEV_TEMP_DATA11                  <!-- 추가데이터11 -->
+     , VRACTNO8 RECEV_TEMP_DATA12                  <!-- 추가데이터12 -->
+     , VRACTNO9 RECEV_TEMP_DATA13                  <!-- 추가데이터13 -->
+     , VRACTNO10 RECEV_TEMP_DATA14                 <!-- 추가데이터14 -->
+     , VRACTNO11 RECEV_TEMP_DATA15                 <!-- 추가데이터15 -->
+  FROM TB_EPOST_RCPT_REG A
+     , TB_EPOST_RCPT_DTL B
+     , (SELECT @row_no := 0, @con_key := '', #{conOrg} CON_ORG) C
+ WHERE POST_PROC_STT = '01'
+   AND A.CON_KEY = B.CON_KEY
+ ORDER BY A.CON_KEY, RGST_NMBR, RECEV_SEQ</select>
+
+<resultMap id="emailRequestRow" type="cokr.xit.interfaces.epost.EmailRequest"> <!-- 전자우편 신청 -->
+    <result property="conKey"                 column="CON_KEY" />                 <!-- 외부연계식별키 -->
+    <result property="rceptId"                column="RCEPT_ID" />                <!-- 접수우체국국기호 -->
+    <result property="dataCd"                 column="DATA_CD" />                 <!-- 접수코드 -->
+    <result property="divKb"                  column="DIV_KB" />                  <!-- 취급구분 -->
+    <result property="dfpayyn"                column="DFPAYYN" />                 <!-- 결재방법 -->
+    <result property="rcptKb"                 column="RCPT_KB" />                 <!-- 내용문 유형 -->
+    <result property="sealCd"                 column="SEAL_CD" />                 <!-- 내용문 상세 종류 -->
+    <result property="wordKb"                 column="WORD_KB" />                 <!-- 내용문 종류 -->
+    <result property="mailCnt"                column="MAIL_CNT" />                <!-- 내용문 매수 -->
+    <result property="recevCnt"               column="RECEV_CNT" />               <!-- 수취인 수 -->
+    <result property="envCd"                  column="ENV_CD" />                  <!-- 봉투 종류 -->
+    <result property="colorYn"                column="COLOR_YN" />                <!-- 칼라우편물 -->
+    <result property="mmYn"                   column="MM_YN" />                   <!-- 메일머지 플래그 -->
+    <result property="flexCd"                 column="FLEX_CD" />                 <!-- 이면구분 -->
+    <result property="dmCnt"                  column="DM_CNT" />                  <!-- 동봉물 개수 -->
+    <result property="sbFg"                   column="SB_FG" />                   <!-- 반송불필요 여부 -->
+    <result property="apvlNb"                 column="APVL_NB" />                 <!-- 승인번호 -->
+    <result property="sendDate"               column="SEND_DATE" />               <!-- 신청 일자 -->
+    <result property="sendTime"               column="SEND_TIME" />               <!-- 전송 시간 -->
+    <result property="relorsectCd"            column="RELORSECT_CD" />            <!-- 연계기관결제부서코드 -->
+    <result property="recevSenderOrgCode"     column="RECEV_SENDER_ORG_CODE" />   <!-- 발송기관코드 -->
+    <result property="recevSenderNm"          column="RECEV_SENDER_NM" />         <!-- 발송인명 -->
+    <result property="recevSenderZipcode"     column="RECEV_SENDER_ZIPCODE" />    <!-- 발송인 우편번호 -->
+    <result property="recevSenderAddr"        column="RECEV_SENDER_ADDR" />       <!-- 주소 -->
+    <result property="recevSenderDetailaddr"  column="RECEV_SENDER_DETAILADDR" /> <!-- 상세주소 -->
+    <result property="recevSenderDepartTel"   column="RECEV_SENDER_DEPART_TEL" /> <!-- 부과부서 전화번호 -->
+    <result property="recevSenderDepartNm"    column="RECEV_SENDER_DEPART_NM" />  <!-- 부과부서 -->
+    <result property="recevDivCd"             column="RECEV_DIV_CD" />            <!-- 등기구분 -->
+    <result property="recevPrintDt"           column="RECEV_PRINT_DT" />          <!-- 출력일자 -->
+    <result property="recevPrintYear"         column="RECEV_PRINT_YEAR" />        <!-- 출력연도 -->
+    <result property="recevPrintMonth"        column="RECEV_PRINT_MONTH" />       <!-- 출력월 -->
+    <result property="recevPrintDay"          column="RECEV_PRINT_DAY" />         <!-- 출력일 -->
+    <result property="recevSenderFax"         column="RECEV_SENDER_FAX" />        <!-- 부과부서 팩스번호 -->
+    <result property="recevSerderStaff"       column="RECEV_SERDER_STAFF" />      <!-- 부과부서 담당자 -->
+    <result property="recevSenderEmail"       column="RECEV_SENDER_EMAIL" />      <!-- 부과부서 이메일 -->
+    <result property="sndngId"                column="SNDNG_ID" />                <!-- 발송 ID -->
+    <result property="jobCd"                  column="JOB_CD" />                  <!-- 작업 코드 -->
+    <result property="regVarData1"            column="REG_VAR_DATA1" />           <!-- 추가 데이터1 (주.정차위반과태료납부 안내) -->
+    <result property="regVarData2"            column="REG_VAR_DATA2" />           <!-- 추가 데이터2 -->
+    <result property="regVarData3"            column="REG_VAR_DATA3" />           <!-- 추가 데이터3 -->
+    <result property="regVarData4"            column="REG_VAR_DATA4" />           <!-- 추가 데이터4 -->
+    <result property="regVarData5"            column="REG_VAR_DATA5" />           <!-- 추가 데이터5 -->
+    <result property="postProcStt"            column="POST_PROC_STT" />           <!-- 우편 처리 상태 -->
+    <result property="rceptYmd"               column="RCEPT_YMD" />               <!-- 접수 일자 -->
+    <result property="delYn"                  column="DEL_YN" />                  <!-- 삭제 여부 -->
+    <result property="createdAt"              column="REG_DT" />                  <!-- 등록 일시 -->
+    <result property="createdBy"              column="RGTR" />                    <!-- 등록자 -->
+    <result property="removedAt"              column="DEL_DT" />                  <!-- 삭제 일시 -->
+    <result property="removedBy"              column="DLTR" />                    <!-- 삭제자 -->
+</resultMap>
+
+<sql id="select">SELECT CON_KEY                 <!-- 외부연계식별키 -->
+     , RCEPT_ID                <!-- 접수우체국국기호 -->
+     , DATA_CD                 <!-- 접수코드 -->
+     , DIV_KB                  <!-- 취급구분 -->
+     , DFPAYYN                 <!-- 결재방법 -->
+     , RCPT_KB                 <!-- 내용문 유형 -->
+     , SEAL_CD                 <!-- 내용문 상세 종류 -->
+     , WORD_KB                 <!-- 내용문 종류 -->
+     , MAIL_CNT                <!-- 내용문 매수 -->
+     , RECEV_CNT               <!-- 수취인 수 -->
+     , ENV_CD                  <!-- 봉투 종류 -->
+     , COLOR_YN                <!-- 칼라우편물 -->
+     , MM_YN                   <!-- 메일머지 플래그 -->
+     , FLEX_CD                 <!-- 이면구분 -->
+     , DM_CNT                  <!-- 동봉물 개수 -->
+     , SB_FG                   <!-- 반송불필요 여부 -->
+     , APVL_NB                 <!-- 승인번호 -->
+     , SEND_DATE               <!-- 신청 일자 -->
+     , SEND_TIME               <!-- 전송 시간 -->
+     , RELORSECT_CD            <!-- 연계기관결제부서코드 -->
+     , RECEV_SENDER_ORG_CODE   <!-- 발송기관코드 -->
+     , RECEV_SENDER_NM         <!-- 발송인명 -->
+     , RECEV_SENDER_ZIPCODE    <!-- 발송인 우편번호 -->
+     , RECEV_SENDER_ADDR       <!-- 주소 -->
+     , RECEV_SENDER_DETAILADDR <!-- 상세주소 -->
+     , RECEV_SENDER_DEPART_TEL <!-- 부과부서 전화번호 -->
+     , RECEV_SENDER_DEPART_NM  <!-- 부과부서 -->
+     , RECEV_DIV_CD            <!-- 등기구분 -->
+     , RECEV_PRINT_DT          <!-- 출력일자 -->
+     , RECEV_PRINT_YEAR        <!-- 출력연도 -->
+     , RECEV_PRINT_MONTH       <!-- 출력월 -->
+     , RECEV_PRINT_DAY         <!-- 출력일 -->
+     , RECEV_SENDER_FAX        <!-- 부과부서 팩스번호 -->
+     , RECEV_SERDER_STAFF      <!-- 부과부서 담당자 -->
+     , RECEV_SENDER_EMAIL      <!-- 부과부서 이메일 -->
+     , SNDNG_ID                <!-- 발송 ID -->
+     , JOB_CD                  <!-- 작업 코드 -->
+     , REG_VAR_DATA1           <!-- 추가 데이터1 (주.정차위반과태료납부 안내) -->
+     , REG_VAR_DATA2           <!-- 추가 데이터2 -->
+     , REG_VAR_DATA3           <!-- 추가 데이터3 -->
+     , REG_VAR_DATA4           <!-- 추가 데이터4 -->
+     , REG_VAR_DATA5           <!-- 추가 데이터5 -->
+     , POST_PROC_STT           <!-- 우편 처리 상태 -->
+     , RCEPT_YMD               <!-- 접수 일자 -->
+     , DEL_YN                  <!-- 삭제 여부 -->
+     , REG_DT                  <!-- 등록 일시 -->
+     , RGTR                    <!-- 등록자 -->
+     , DEL_DT                  <!-- 삭제 일시 -->
+     , DLTR                    <!-- 삭제자 -->
+  FROM TB_EPOST_RCPT_REG</sql>
+
+<select id="selectRequestList" parameterType="map" resultType="dataobject">/* 전자우편 신청 목록 조회(emailRequestMapper.selectRequestList) */
+<include refid="utility.paging-prefix" />
+<include refid="select" />
+<where>
+<if test="conKeys != null">AND CON_KEY IN (<foreach collection="conKeys" item="conKey" separator=",">#{conKey}</foreach>)</if>
+<if test="conKeys == null">
+AND RCEPT_YMD BETWEEN #{fromRegDate} AND #{toRegDate}
+<if test="statusList != null">AND POST_PROC_STT IN (<foreach collection="statusList" item="status" separator=",">#{status}</foreach>)</if>
+AND DEL_YN = 'N'
+</if>
+</where>
+<include refid="utility.orderBy" />
+<include refid="utility.paging-suffix" /></select>
+
+<select id="selectRequests" parameterType="map" resultMap="emailRequestRow">/* 전자우편 신청 객체 가져오기(emailRequestMapper.selectRequests) */
+<include refid="select" />
+<where>AND CON_KEY IN (<foreach collection="conKeys" item="conKey" separator=",">#{conKey}</foreach>)</where>
+<include refid="utility.orderBy" /></select>
+
+<insert id="insertRequest" parameterType="map">/* 전자우편 신청 등록(emailRequestMapper.insertRequest) */
+INSERT INTO TB_EPOST_RCPT_REG (
+       CON_KEY                 <!-- 외부연계식별키 -->
+     , RCEPT_ID                <!-- 접수우체국국기호 -->
+     , DATA_CD                 <!-- 접수코드 -->
+     , DIV_KB                  <!-- 취급구분 -->
+     , DFPAYYN                 <!-- 결재방법 -->
+     , RCPT_KB                 <!-- 내용문 유형 -->
+     , SEAL_CD                 <!-- 내용문 상세 종류 -->
+     , WORD_KB                 <!-- 내용문 종류 -->
+     , MAIL_CNT                <!-- 내용문 매수 -->
+     , RECEV_CNT               <!-- 수취인 수 -->
+     , ENV_CD                  <!-- 봉투 종류 -->
+     , COLOR_YN                <!-- 칼라우편물 -->
+     , MM_YN                   <!-- 메일머지 플래그 -->
+     , FLEX_CD                 <!-- 이면구분 -->
+     , DM_CNT                  <!-- 동봉물 개수 -->
+     , SB_FG                   <!-- 반송불필요 여부 -->
+     , APVL_NB                 <!-- 승인번호 -->
+     , SEND_DATE               <!-- 신청 일자 -->
+     , SEND_TIME               <!-- 전송 시간 -->
+     , RELORSECT_CD            <!-- 연계기관결제부서코드 -->
+     , RECEV_SENDER_ORG_CODE   <!-- 발송기관코드 -->
+     , RECEV_SENDER_NM         <!-- 발송인명 -->
+     , RECEV_SENDER_ZIPCODE    <!-- 발송인 우편번호 -->
+     , RECEV_SENDER_ADDR       <!-- 주소 -->
+     , RECEV_SENDER_DETAILADDR <!-- 상세주소 -->
+     , RECEV_SENDER_DEPART_TEL <!-- 부과부서 전화번호 -->
+     , RECEV_SENDER_DEPART_NM  <!-- 부과부서 -->
+     , RECEV_DIV_CD            <!-- 등기구분 -->
+     , RECEV_PRINT_DT          <!-- 출력일자 -->
+     , RECEV_PRINT_YEAR        <!-- 출력연도 -->
+     , RECEV_PRINT_MONTH       <!-- 출력월 -->
+     , RECEV_PRINT_DAY         <!-- 출력일 -->
+     , RECEV_SENDER_FAX        <!-- 부과부서 팩스번호 -->
+     , RECEV_SERDER_STAFF      <!-- 부과부서 담당자 -->
+     , RECEV_SENDER_EMAIL      <!-- 부과부서 이메일 -->
+     , SNDNG_ID                <!-- 발송 ID -->
+     , JOB_CD                  <!-- 작업 코드 -->
+     , REG_VAR_DATA1           <!-- 추가 데이터1 (주.정차위반과태료납부 안내) -->
+     , REG_VAR_DATA2           <!-- 추가 데이터2 -->
+     , REG_VAR_DATA3           <!-- 추가 데이터3 -->
+     , REG_VAR_DATA4           <!-- 추가 데이터4 -->
+     , REG_VAR_DATA5           <!-- 추가 데이터5 -->
+     , POST_PROC_STT           <!-- 우편 처리 상태 -->
+     , RCEPT_YMD               <!-- 접수 일자 -->
+     , DEL_YN                  <!-- 삭제 여부 -->
+     , REG_DT                  <!-- 등록 일시 -->
+     , RGTR                    <!-- 등록자 -->
+     , DEL_DT                  <!-- 삭제 일시 -->
+     , DLTR                    <!-- 삭제자 -->
+) VALUES (
+       #{emailRequest.conKey}                <!-- 외부연계식별키 -->
+     , #{emailRequest.rceptId}               <!-- 접수우체국국기호 -->
+     , #{emailRequest.dataCd}                <!-- 접수코드 -->
+     , #{emailRequest.divKb}                 <!-- 취급구분 -->
+     , #{emailRequest.dfpayyn}               <!-- 결재방법 -->
+     , #{emailRequest.rcptKb}                <!-- 내용문 유형 -->
+     , #{emailRequest.sealCd}                <!-- 내용문 상세 종류 -->
+     , #{emailRequest.wordKb}                <!-- 내용문 종류 -->
+     , #{emailRequest.mailCnt}               <!-- 내용문 매수 -->
+     , #{emailRequest.recevCnt}              <!-- 수취인 수 -->
+     , #{emailRequest.envCd}                 <!-- 봉투 종류 -->
+     , #{emailRequest.colorYn}               <!-- 칼라우편물 -->
+     , #{emailRequest.mmYn}                  <!-- 메일머지 플래그 -->
+     , #{emailRequest.flexCd}                <!-- 이면구분 -->
+     , #{emailRequest.dmCnt}                 <!-- 동봉물 개수 -->
+     , #{emailRequest.sbFg}                  <!-- 반송불필요 여부 -->
+     , #{emailRequest.apvlNb}                <!-- 승인번호 -->
+     , #{emailRequest.sendDate}              <!-- 신청 일자 -->
+     , #{emailRequest.sendTime}              <!-- 전송 시간 -->
+     , #{emailRequest.relorsectCd}           <!-- 연계기관결제부서코드 -->
+     , #{emailRequest.recevSenderOrgCode}    <!-- 발송기관코드 -->
+     , #{emailRequest.recevSenderNm}         <!-- 발송인명 -->
+     , #{emailRequest.recevSenderZipcode}    <!-- 발송인 우편번호 -->
+     , #{emailRequest.recevSenderAddr}       <!-- 주소 -->
+     , #{emailRequest.recevSenderDetailaddr} <!-- 상세주소 -->
+     , #{emailRequest.recevSenderDepartTel}  <!-- 부과부서 전화번호 -->
+     , #{emailRequest.recevSenderDepartNm}   <!-- 부과부서 -->
+     , #{emailRequest.recevDivCd}            <!-- 등기구분 -->
+     , #{emailRequest.recevPrintDt}          <!-- 출력일자 -->
+     , #{emailRequest.recevPrintYear}        <!-- 출력연도 -->
+     , #{emailRequest.recevPrintMonth}       <!-- 출력월 -->
+     , #{emailRequest.recevPrintDay}         <!-- 출력일 -->
+     , #{emailRequest.recevSenderFax}        <!-- 부과부서 팩스번호 -->
+     , #{emailRequest.recevSerderStaff}      <!-- 부과부서 담당자 -->
+     , #{emailRequest.recevSenderEmail}      <!-- 부과부서 이메일 -->
+     , #{emailRequest.sndngId}               <!-- 발송 ID -->
+     , #{emailRequest.jobCd}                 <!-- 작업 코드 -->
+     , #{emailRequest.regVarData1}           <!-- 추가 데이터1 (주.정차위반과태료납부 안내) -->
+     , #{emailRequest.regVarData2}           <!-- 추가 데이터2 -->
+     , #{emailRequest.regVarData3}           <!-- 추가 데이터3 -->
+     , #{emailRequest.regVarData4}           <!-- 추가 데이터4 -->
+     , #{emailRequest.regVarData5}           <!-- 추가 데이터5 -->
+     , #{emailRequest.postProcStt}           <!-- 우편 처리 상태 -->
+     , #{emailRequest.rceptYmd}              <!-- 접수 일자 -->
+     , #{emailRequest.delYn}                 <!-- 삭제 여부 -->
+     , <include refid="utility.now" />       <!-- 등록 일시 -->
+     , #{currentUser.id}                     <!-- 등록자 -->
+     , #{emailRequest.removedAt}             <!-- 삭제 일시 -->
+     , #{emailRequest.removedBy}             <!-- 삭제자 -->
+)</insert>
+
+<update id="updateRequest" parameterType="map">/* 전자우편 신청 수정(emailRequestMapper.updateRequest) */
+UPDATE TB_EPOST_RCPT_REG SET
+       RCEPT_ID = #{emailRequest.rceptId}                              <!-- 접수우체국국기호 -->
+     , DATA_CD = #{emailRequest.dataCd}                                <!-- 접수코드 -->
+     , DIV_KB = #{emailRequest.divKb}                                  <!-- 취급구분 -->
+     , DFPAYYN = #{emailRequest.dfpayyn}                               <!-- 결재방법 -->
+     , RCPT_KB = #{emailRequest.rcptKb}                                <!-- 내용문 유형 -->
+     , SEAL_CD = #{emailRequest.sealCd}                                <!-- 내용문 상세 종류 -->
+     , WORD_KB = #{emailRequest.wordKb}                                <!-- 내용문 종류 -->
+     , MAIL_CNT = #{emailRequest.mailCnt}                              <!-- 내용문 매수 -->
+     , RECEV_CNT = #{emailRequest.recevCnt}                            <!-- 수취인 수 -->
+     , ENV_CD = #{emailRequest.envCd}                                  <!-- 봉투 종류 -->
+     , COLOR_YN = #{emailRequest.colorYn}                              <!-- 칼라우편물 -->
+     , MM_YN = #{emailRequest.mmYn}                                    <!-- 메일머지 플래그 -->
+     , FLEX_CD = #{emailRequest.flexCd}                                <!-- 이면구분 -->
+     , DM_CNT = #{emailRequest.dmCnt}                                  <!-- 동봉물 개수 -->
+     , SB_FG = #{emailRequest.sbFg}                                    <!-- 반송불필요 여부 -->
+     , APVL_NB = #{emailRequest.apvlNb}                                <!-- 승인번호 -->
+     , SEND_DATE = #{emailRequest.sendDate}                            <!-- 신청 일자 -->
+     , SEND_TIME = #{emailRequest.sendTime}                            <!-- 전송 시간 -->
+     , RELORSECT_CD = #{emailRequest.relorsectCd}                      <!-- 연계기관결제부서코드 -->
+     , RECEV_SENDER_ORG_CODE = #{emailRequest.recevSenderOrgCode}      <!-- 발송기관코드 -->
+     , RECEV_SENDER_NM = #{emailRequest.recevSenderNm}                 <!-- 발송인명 -->
+     , RECEV_SENDER_ZIPCODE = #{emailRequest.recevSenderZipcode}       <!-- 발송인 우편번호 -->
+     , RECEV_SENDER_ADDR = #{emailRequest.recevSenderAddr}             <!-- 주소 -->
+     , RECEV_SENDER_DETAILADDR = #{emailRequest.recevSenderDetailaddr} <!-- 상세주소 -->
+     , RECEV_SENDER_DEPART_TEL = #{emailRequest.recevSenderDepartTel}  <!-- 부과부서 전화번호 -->
+     , RECEV_SENDER_DEPART_NM = #{emailRequest.recevSenderDepartNm}    <!-- 부과부서 -->
+     , RECEV_DIV_CD = #{emailRequest.recevDivCd}                       <!-- 등기구분 -->
+     , RECEV_PRINT_DT = #{emailRequest.recevPrintDt}                   <!-- 출력일자 -->
+     , RECEV_PRINT_YEAR = #{emailRequest.recevPrintYear}               <!-- 출력연도 -->
+     , RECEV_PRINT_MONTH = #{emailRequest.recevPrintMonth}             <!-- 출력월 -->
+     , RECEV_PRINT_DAY = #{emailRequest.recevPrintDay}                 <!-- 출력일 -->
+     , RECEV_SENDER_FAX = #{emailRequest.recevSenderFax}               <!-- 부과부서 팩스번호 -->
+     , RECEV_SERDER_STAFF = #{emailRequest.recevSerderStaff}           <!-- 부과부서 담당자 -->
+     , RECEV_SENDER_EMAIL = #{emailRequest.recevSenderEmail}           <!-- 부과부서 이메일 -->
+     , SNDNG_ID = #{emailRequest.sndngId}                              <!-- 발송 ID -->
+     , JOB_CD = #{emailRequest.jobCd}                                  <!-- 작업 코드 -->
+     , REG_VAR_DATA1 = #{emailRequest.regVarData1}                     <!-- 추가 데이터1 (주.정차위반과태료납부 안내) -->
+     , REG_VAR_DATA2 = #{emailRequest.regVarData2}                     <!-- 추가 데이터2 -->
+     , REG_VAR_DATA3 = #{emailRequest.regVarData3}                     <!-- 추가 데이터3 -->
+     , REG_VAR_DATA4 = #{emailRequest.regVarData4}                     <!-- 추가 데이터4 -->
+     , REG_VAR_DATA5 = #{emailRequest.regVarData5}                     <!-- 추가 데이터5 -->
+     , POST_PROC_STT = #{emailRequest.postProcStt}                     <!-- 우편 처리 상태 -->
+     , RCEPT_YMD = #{emailRequest.rceptYmd}                            <!-- 접수 일자 -->
+     , DEL_YN = #{emailRequest.delYn}                                  <!-- 삭제 여부 -->
+     , DEL_DT = #{emailRequest.removedAt}                              <!-- 삭제 일시 -->
+     , DLTR = #{emailRequest.removedBy}                                <!-- 삭제자 -->
+ WHERE CON_KEY = #{emailRequest.conKey}</update>
+
+<update id="updateRequestStatus" parameterType="map">/* 전자우편 신청 상태 변경(emailRequestMapper.updateRequestStatus) */
+UPDATE TB_EPOST_RCPT_REG SET
+       POST_PROC_STT = #{status}
+<if test='resultType == "registration"'>    , RCEPT_YMD = CASE CON_KEY<foreach collection="results" item="result">
+            WHEN #{result.reletcdata} THEN #{result.rceptYmd}</foreach>
+            ELSE RCEPT_YMD END</if>
+ WHERE CON_KEY IN (
+ <if test='conKeys != null'><foreach collection="conKeys" item="conKey" separator=",">#{conKey}</foreach></if>
+ <if test='resultType == "reception"'><foreach collection="results" item="result" separator=",">#{result.reldivkey}</foreach></if>
+ <if test='resultType == "registration"'><foreach collection="results" item="result" separator=",">#{result.reletcdata}</foreach></if>
+ <if test='resultType == "production"'><foreach collection="results" item="result" separator=",">#{result.conKey}</foreach></if>
+ <if test='resultType == "delivery"'><foreach collection="results" item="result" separator=",">#{result.reletcdata}</foreach></if>
+ )
+   AND POST_PROC_STT &lt; #{maxStatus}</update>
+
+<update id="updateRequestAsDelivered" parameterType="map">/* 전자우편 배달 완료 처리(emailRequestMapper.updateRequestAsDelivered) */
+UPDATE TB_EPOST_RCPT_REG SET
+       POST_PROC_STT = #{status}
+ WHERE POST_PROC_STT = '27' <!-- 배달중 --> 
+   AND DEL_YN = 'N'
+   AND REG_DT &lt; CONCAT(DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL #{expiryDays} DAY), '%Y%m%d'), '000000')</update>
+
+<update id="deleteRequest" parameterType="map">/* 전자우편 신청 삭제(emailRequestMapper.deleteRequest) */
+UPDATE TB_EPOST_RCPT_REG SET
+       DEL_YN = 'Y'
+     , DEL_DT =<include refid="utility.now" />
+     , DLTR = #{currentUser.id}
+ WHERE CON_KEY IN (<foreach collection="conKeys" item="conKey" separator=",">#{conKey}</foreach>)</update>
+
+<resultMap id="emailRequestDetailRow" type="cokr.xit.interfaces.epost.EmailRequestDetail"> <!-- 전자우편 신청 상세 -->
+    <result property="conKey"                   column="CON_KEY" />                     <!-- 외부연계식별키 -->
+    <result property="rgstNmbr"                 column="RGST_NMBR" />                   <!-- 등기번호 -->
+    <result property="recevSeq"                 column="RECEV_SEQ" />                   <!-- 일련번호 -->
+    <result property="recevCode"                column="RECEV_CODE" />                  <!-- 발송코드 -->
+    <result property="recevBar1d"               column="RECEV_BAR1D" />                 <!-- 바코드 -->
+    <result property="recevBar2d"               column="RECEV_BAR2D" />                 <!-- 이차원바코드 -->
+    <result property="recevBillNunber"          column="RECEV_BILL_NUNBER" />           <!-- 고지번호 -->
+    <result property="recevDocCd1"              column="RECEV_DOC_CD1" />               <!-- 문서종류1 -->
+    <result property="recevDocCd2"              column="RECEV_DOC_CD2" />               <!-- 문서종류2 -->
+    <result property="recevDocCd3"              column="RECEV_DOC_CD3" />               <!-- 문서종류3 -->
+    <result property="recevDocCd4"              column="RECEV_DOC_CD4" />               <!-- 문서종류4 -->
+    <result property="recevDocCd5"              column="RECEV_DOC_CD5" />               <!-- 문서종류5 -->
+    <result property="recevSubj1"               column="RECEV_SUBJ1" />                 <!-- 과목명1 -->
+    <result property="recevSubj2"               column="RECEV_SUBJ2" />                 <!-- 과목명2 -->
+    <result property="recevSubj3"               column="RECEV_SUBJ3" />                 <!-- 과목명3 -->
+    <result property="recevViolateDt"           column="RECEV_VIOLATE_DT" />            <!-- 위반일시 -->
+    <result property="recevViolateDong"         column="RECEV_VIOLATE_DONG" />          <!-- 위반동 -->
+    <result property="recevViolatePlace"        column="RECEV_VIOLATE_PLACE" />         <!-- 위반장소 -->
+    <result property="recevLaws"                column="RECEV_LAWS" />                  <!-- 법조항 -->
+    <result property="recevPayNumber1"          column="RECEV_PAY_NUMBER1" />           <!-- 납부번호1 -->
+    <result property="recevPayNumber2"          column="RECEV_PAY_NUMBER2" />           <!-- 납부번호2 -->
+    <result property="recevOcr0"                column="RECEV_OCR0" />                  <!-- OCR0 -->
+    <result property="recevOcr1"                column="RECEV_OCR1" />                  <!-- OCR1 -->
+    <result property="recevOcr2"                column="RECEV_OCR2" />                  <!-- OCR2 -->
+    <result property="recevOnlinePayNumber"     column="RECEV_ONLINE_PAY_NUMBER" />     <!-- 전자납부번호 -->
+    <result property="recevFinePrice"           column="RECEV_FINE_PRICE" />            <!-- 과태료 -->
+    <result property="recevPayPrice"            column="RECEV_PAY_PRICE" />             <!-- 납부금액 -->
+    <result property="recevPayDt"               column="RECEV_PAY_DT" />                <!-- 납부기한 -->
+    <result property="recevPayInDate"           column="RECEV_PAY_IN_DATE" />           <!-- 납기내기한 -->
+    <result property="recevPayInPrice"          column="RECEV_PAY_IN_PRICE" />          <!-- 납기내금액 -->
+    <result property="recevPayInAddPrice"       column="RECEV_PAY_IN_ADD_PRICE" />      <!-- 납기내가산금 -->
+    <result property="recevPayInDefaultPrice"   column="RECEV_PAY_IN_DEFAULT_PRICE" />  <!-- 납기내합계금액 -->
+    <result property="recevPayOutDate"          column="RECEV_PAY_OUT_DATE" />          <!-- 납기후기한 -->
+    <result property="recevPayOutPrice"         column="RECEV_PAY_OUT_PRICE" />         <!-- 납기후금액 -->
+    <result property="recevPayOutAddPrice"      column="RECEV_PAY_OUT_ADD_PRICE" />     <!-- 납기후가산금 -->
+    <result property="recevPayOutDefaultPrice"  column="RECEV_PAY_OUT_DEFAULT_PRICE" /> <!-- 납기후합계금액 -->
+    <result property="recevCarNumber"           column="RECEV_CAR_NUMBER" />            <!-- 차량번호 -->
+    <result property="recevCarOwnerZipcode"     column="RECEV_CAR_OWNER_ZIPCODE" />     <!-- 우편번호 -->
+    <result property="recevCarOwnerAddr"        column="RECEV_CAR_OWNER_ADDR" />        <!-- 주소 -->
+    <result property="recevCarOwnerDetailaddr"  column="RECEV_CAR_OWNER_DETAILADDR" />  <!-- 상세주소 -->
+    <result property="recevCarOwnerNm"          column="RECEV_CAR_OWNER_NM" />          <!-- 소유자명 -->
+    <result property="recevCarOwnerSsn"         column="RECEV_CAR_OWNER_SSN" />         <!-- 주민번호 -->
+    <result property="recevEvidenceNumber"      column="RECEV_EVIDENCE_NUMBER" />       <!-- 증거번호 -->
+    <result property="recevPhotoCnt"            column="RECEV_PHOTO_CNT" />             <!-- 사진장수 -->
+    <result property="recevPhotoFilename1"      column="RECEV_PHOTO_FILENAME1" />       <!-- 사진파일명1 -->
+    <result property="recevPhotoFilename2"      column="RECEV_PHOTO_FILENAME2" />       <!-- 사진파일명2 -->
+    <result property="recevPhotoFilename3"      column="RECEV_PHOTO_FILENAME3" />       <!-- 사진파일명3 -->
+    <result property="recevPhotoFilename4"      column="RECEV_PHOTO_FILENAME4" />       <!-- 사진파일명4 -->
+    <result property="vractno2"                 column="VRACTNO2" />                    <!-- 가상계좌번호2 -->
+    <result property="vractno3"                 column="VRACTNO3" />                    <!-- 가상계좌번호3 -->
+    <result property="vractno4"                 column="VRACTNO4" />                    <!-- 가상계좌번호4 -->
+    <result property="vractno5"                 column="VRACTNO5" />                    <!-- 가상계좌번호5 -->
+    <result property="vractno6"                 column="VRACTNO6" />                    <!-- 가상계좌번호6 -->
+    <result property="vractno7"                 column="VRACTNO7" />                    <!-- 가상계좌번호7 -->
+    <result property="vractno8"                 column="VRACTNO8" />                    <!-- 가상계좌번호8 -->
+    <result property="vractno9"                 column="VRACTNO9" />                    <!-- 가상계좌번호9 -->
+    <result property="vractno10"                column="VRACTNO10" />                   <!-- 가상계좌번호10 -->
+    <result property="vractno11"                column="VRACTNO11" />                   <!-- 가상계좌번호11 -->
+	<result property="dtlVarData1"              column="DTL_VAR_DATA1" />               <!-- 추가 데이터1 (계도 메일 제목) -->
+	<result property="dtlVarData2"              column="DTL_VAR_DATA2" />               <!-- 추가 데이터2 (계도 메일 내용) -->
+	<result property="dtlVarData3"              column="DTL_VAR_DATA3" />               <!-- 추가 데이터3 -->
+	<result property="dtlVarData4"              column="DTL_VAR_DATA4" />               <!-- 추가 데이터4 -->
+	<result property="dtlVarData5"              column="DTL_VAR_DATA5" />               <!-- 추가 데이터5 -->
+    <result property="dlvrRsltId"               column="DLVR_RSLT_ID" />                <!-- 배달 결과 ID -->
+    <result property="makeRsltCd"               column="MAKE_RSLT_CD" />                <!-- 제작 결과 코드 -->
+    <result property="createdAt"                column="REG_DT" />                      <!-- 등록 일시 -->
+    <result property="createdBy"                column="RGTR" />                        <!-- 등록자 -->
+    <result property="vractno"                  column="VRACTNO" />                     <!-- 가상계좌번호 -->
+</resultMap>
+
+<sql id="selectDetail">SELECT CON_KEY                     <!-- 외부연계식별키 -->
+     , RGST_NMBR                   <!-- 등기번호 -->
+     , RECEV_SEQ                   <!-- 일련번호 -->
+     , RECEV_CODE                  <!-- 발송코드 -->
+     , RECEV_BAR1D                 <!-- 바코드 -->
+     , RECEV_BAR2D                 <!-- 이차원바코드 -->
+     , RECEV_BILL_NUNBER           <!-- 고지번호 -->
+     , RECEV_DOC_CD1               <!-- 문서종류1 -->
+     , RECEV_DOC_CD2               <!-- 문서종류2 -->
+     , RECEV_DOC_CD3               <!-- 문서종류3 -->
+     , RECEV_DOC_CD4               <!-- 문서종류4 -->
+     , RECEV_DOC_CD5               <!-- 문서종류5 -->
+     , RECEV_SUBJ1                 <!-- 과목명1 -->
+     , RECEV_SUBJ2                 <!-- 과목명2 -->
+     , RECEV_SUBJ3                 <!-- 과목명3 -->
+     , RECEV_VIOLATE_DT            <!-- 위반일시 -->
+     , RECEV_VIOLATE_DONG          <!-- 위반동 -->
+     , RECEV_VIOLATE_PLACE         <!-- 위반장소 -->
+     , RECEV_LAWS                  <!-- 법조항 -->
+     , RECEV_PAY_NUMBER1           <!-- 납부번호1 -->
+     , RECEV_PAY_NUMBER2           <!-- 납부번호2 -->
+     , RECEV_OCR0                  <!-- OCR0 -->
+     , RECEV_OCR1                  <!-- OCR1 -->
+     , RECEV_OCR2                  <!-- OCR2 -->
+     , RECEV_ONLINE_PAY_NUMBER     <!-- 전자납부번호 -->
+     , RECEV_FINE_PRICE            <!-- 과태료 -->
+     , RECEV_PAY_PRICE             <!-- 납부금액 -->
+     , RECEV_PAY_DT                <!-- 납부기한 -->
+     , RECEV_PAY_IN_DATE           <!-- 납기내기한 -->
+     , RECEV_PAY_IN_PRICE          <!-- 납기내금액 -->
+     , RECEV_PAY_IN_ADD_PRICE      <!-- 납기내가산금 -->
+     , RECEV_PAY_IN_DEFAULT_PRICE  <!-- 납기내합계금액 -->
+     , RECEV_PAY_OUT_DATE          <!-- 납기후기한 -->
+     , RECEV_PAY_OUT_PRICE         <!-- 납기후금액 -->
+     , RECEV_PAY_OUT_ADD_PRICE     <!-- 납기후가산금 -->
+     , RECEV_PAY_OUT_DEFAULT_PRICE <!-- 납기후합계금액 -->
+     , RECEV_CAR_NUMBER            <!-- 차량번호 -->
+     , RECEV_CAR_OWNER_ZIPCODE     <!-- 우편번호 -->
+     , RECEV_CAR_OWNER_ADDR        <!-- 주소 -->
+     , RECEV_CAR_OWNER_DETAILADDR  <!-- 상세주소 -->
+     , RECEV_CAR_OWNER_NM          <!-- 소유자명 -->
+     , RECEV_CAR_OWNER_SSN         <!-- 주민번호 -->
+     , RECEV_EVIDENCE_NUMBER       <!-- 증거번호 -->
+     , RECEV_PHOTO_CNT             <!-- 사진장수 -->
+     , RECEV_PHOTO_FILENAME1       <!-- 사진파일명1 -->
+     , RECEV_PHOTO_FILENAME2       <!-- 사진파일명2 -->
+     , RECEV_PHOTO_FILENAME3       <!-- 사진파일명3 -->
+     , RECEV_PHOTO_FILENAME4       <!-- 사진파일명4 -->
+     , VRACTNO2                    <!-- 가상계좌번호2 -->
+     , VRACTNO3                    <!-- 가상계좌번호3 -->
+     , VRACTNO4                    <!-- 가상계좌번호4 -->
+     , VRACTNO5                    <!-- 가상계좌번호5 -->
+     , VRACTNO6                    <!-- 가상계좌번호6 -->
+     , VRACTNO7                    <!-- 가상계좌번호7 -->
+     , VRACTNO8                    <!-- 가상계좌번호8 -->
+     , VRACTNO9                    <!-- 가상계좌번호9 -->
+     , VRACTNO10                   <!-- 가상계좌번호10 -->
+     , VRACTNO11                   <!-- 가상계좌번호11 -->
+     , DTL_VAR_DATA1               <!-- 추가 데이터1 (계도 메일 제목) -->
+     , DTL_VAR_DATA2               <!-- 추가 데이터2 (계도 메일 내용) -->
+     , DTL_VAR_DATA3               <!-- 추가 데이터3 -->
+     , DTL_VAR_DATA4               <!-- 추가 데이터4 -->
+     , DTL_VAR_DATA5               <!-- 추가 데이터5 -->
+     , DLVR_RSLT_ID                <!-- 배달 결과 ID -->
+     , MAKE_RSLT_CD                <!-- 제작 결과 코드 -->
+     , REG_DT                      <!-- 등록 일시 -->
+     , RGTR                        <!-- 등록자 -->
+     , VRACTNO                     <!-- 가상계좌번호 -->
+  FROM TB_EPOST_RCPT_DTL</sql>
+
+<select id="selectRequestDetailList" parameterType="map" resultType="dataobject">/* 전자우편 신청 상세 목록 조회(emailRequestMapper.selectRequestDetailList) */
+<include refid="utility.paging-prefix" />
+<include refid="selectDetail" />
+<where>
+AND CON_KEY IN (<foreach collection="conKeys" item="conKey" separator=",">#{conKey}</foreach>)
+<if test="rgstNmbrs != null">AND RGST_NMBR IN (<foreach collection="rgstNmbrs" item="rgstNmbr" separator=",">#{rgstNmbr}</foreach>)</if>
+</where>
+<include refid="utility.orderBy" />
+<include refid="utility.paging-suffix" /></select>
+
+<select id="selectRequestDetails" parameterType="map" resultMap="emailRequestDetailRow">/* 전자우편 신청 상세 객체 가져오기(emailRequestMapper.selectRequestDetails) */
+<include refid="selectDetail" />
+<where>
+AND CON_KEY IN (<foreach collection="conKeys" item="conKey" separator=",">#{conKey}</foreach>)
+<if test="rgstNmbrs != null">AND RGST_NMBR IN (<foreach collection="rgstNmbrs" item="rgstNmbr" separator=",">#{rgstNmbr}</foreach>)</if>
+</where>
+<include refid="utility.orderBy" /></select>
+
+<insert id="insertRequestDetail" parameterType="map">/* 전자우편 신청 상세 등록(emailRequestMapper.insertRequestDetail) */
+INSERT INTO TB_EPOST_RCPT_DTL (
+       CON_KEY                     <!-- 외부연계식별키 -->
+     , RGST_NMBR                   <!-- 등기번호 -->
+     , RECEV_SEQ                   <!-- 일련번호 -->
+     , RECEV_CODE                  <!-- 발송코드 -->
+     , RECEV_BAR1D                 <!-- 바코드 -->
+     , RECEV_BAR2D                 <!-- 이차원바코드 -->
+     , RECEV_BILL_NUNBER           <!-- 고지번호 -->
+     , RECEV_DOC_CD1               <!-- 문서종류1 -->
+     , RECEV_DOC_CD2               <!-- 문서종류2 -->
+     , RECEV_DOC_CD3               <!-- 문서종류3 -->
+     , RECEV_DOC_CD4               <!-- 문서종류4 -->
+     , RECEV_DOC_CD5               <!-- 문서종류5 -->
+     , RECEV_SUBJ1                 <!-- 과목명1 -->
+     , RECEV_SUBJ2                 <!-- 과목명2 -->
+     , RECEV_SUBJ3                 <!-- 과목명3 -->
+     , RECEV_VIOLATE_DT            <!-- 위반일시 -->
+     , RECEV_VIOLATE_DONG          <!-- 위반동 -->
+     , RECEV_VIOLATE_PLACE         <!-- 위반장소 -->
+     , RECEV_LAWS                  <!-- 법조항 -->
+     , RECEV_PAY_NUMBER1           <!-- 납부번호1 -->
+     , RECEV_PAY_NUMBER2           <!-- 납부번호2 -->
+     , RECEV_OCR0                  <!-- OCR0 -->
+     , RECEV_OCR1                  <!-- OCR1 -->
+     , RECEV_OCR2                  <!-- OCR2 -->
+     , RECEV_ONLINE_PAY_NUMBER     <!-- 전자납부번호 -->
+     , RECEV_FINE_PRICE            <!-- 과태료 -->
+     , RECEV_PAY_PRICE             <!-- 납부금액 -->
+     , RECEV_PAY_DT                <!-- 납부기한 -->
+     , RECEV_PAY_IN_DATE           <!-- 납기내기한 -->
+     , RECEV_PAY_IN_PRICE          <!-- 납기내금액 -->
+     , RECEV_PAY_IN_ADD_PRICE      <!-- 납기내가산금 -->
+     , RECEV_PAY_IN_DEFAULT_PRICE  <!-- 납기내합계금액 -->
+     , RECEV_PAY_OUT_DATE          <!-- 납기후기한 -->
+     , RECEV_PAY_OUT_PRICE         <!-- 납기후금액 -->
+     , RECEV_PAY_OUT_ADD_PRICE     <!-- 납기후가산금 -->
+     , RECEV_PAY_OUT_DEFAULT_PRICE <!-- 납기후합계금액 -->
+     , RECEV_CAR_NUMBER            <!-- 차량번호 -->
+     , RECEV_CAR_OWNER_ZIPCODE     <!-- 우편번호 -->
+     , RECEV_CAR_OWNER_ADDR        <!-- 주소 -->
+     , RECEV_CAR_OWNER_DETAILADDR  <!-- 상세주소 -->
+     , RECEV_CAR_OWNER_NM          <!-- 소유자명 -->
+     , RECEV_CAR_OWNER_SSN         <!-- 주민번호 -->
+     , RECEV_EVIDENCE_NUMBER       <!-- 증거번호 -->
+     , RECEV_PHOTO_CNT             <!-- 사진장수 -->
+     , RECEV_PHOTO_FILENAME1       <!-- 사진파일명1 -->
+     , RECEV_PHOTO_FILENAME2       <!-- 사진파일명2 -->
+     , RECEV_PHOTO_FILENAME3       <!-- 사진파일명3 -->
+     , RECEV_PHOTO_FILENAME4       <!-- 사진파일명4 -->
+     , VRACTNO2                    <!-- 가상계좌번호2 -->
+     , VRACTNO3                    <!-- 가상계좌번호3 -->
+     , VRACTNO4                    <!-- 가상계좌번호4 -->
+     , VRACTNO5                    <!-- 가상계좌번호5 -->
+     , VRACTNO6                    <!-- 가상계좌번호6 -->
+     , VRACTNO7                    <!-- 가상계좌번호7 -->
+     , VRACTNO8                    <!-- 가상계좌번호8 -->
+     , VRACTNO9                    <!-- 가상계좌번호9 -->
+     , VRACTNO10                   <!-- 가상계좌번호10 -->
+     , VRACTNO11                   <!-- 가상계좌번호11 -->
+     , DTL_VAR_DATA1               <!-- 추가 데이터1 (계도 메일 제목) -->
+     , DTL_VAR_DATA2               <!-- 추가 데이터2 (계도 메일 내용) -->
+     , DTL_VAR_DATA3               <!-- 추가 데이터3 -->
+     , DTL_VAR_DATA4               <!-- 추가 데이터4 -->
+     , DTL_VAR_DATA5               <!-- 추가 데이터5 -->
+     , DLVR_RSLT_ID                <!-- 배달 결과 ID -->
+     , MAKE_RSLT_CD                <!-- 제작 결과 코드 -->
+     , REG_DT                      <!-- 등록 일시 -->
+     , RGTR                        <!-- 등록자 -->
+     , VRACTNO                     <!-- 가상계좌번호 -->
+) VALUES (
+       #{emailRequestDetail.conKey}                  <!-- 외부연계식별키 -->
+     , #{emailRequestDetail.rgstNmbr}                <!-- 등기번호 -->
+     , #{emailRequestDetail.recevSeq}                <!-- 일련번호 -->
+     , #{emailRequestDetail.recevCode}               <!-- 발송코드 -->
+     , #{emailRequestDetail.recevBar1d}              <!-- 바코드 -->
+     , #{emailRequestDetail.recevBar2d}              <!-- 이차원바코드 -->
+     , #{emailRequestDetail.recevBillNunber}         <!-- 고지번호 -->
+     , #{emailRequestDetail.recevDocCd1}             <!-- 문서종류1 -->
+     , #{emailRequestDetail.recevDocCd2}             <!-- 문서종류2 -->
+     , #{emailRequestDetail.recevDocCd3}             <!-- 문서종류3 -->
+     , #{emailRequestDetail.recevDocCd4}             <!-- 문서종류4 -->
+     , #{emailRequestDetail.recevDocCd5}             <!-- 문서종류5 -->
+     , #{emailRequestDetail.recevSubj1}              <!-- 과목명1 -->
+     , #{emailRequestDetail.recevSubj2}              <!-- 과목명2 -->
+     , #{emailRequestDetail.recevSubj3}              <!-- 과목명3 -->
+     , #{emailRequestDetail.recevViolateDt}          <!-- 위반일시 -->
+     , #{emailRequestDetail.recevViolateDong}        <!-- 위반동 -->
+     , #{emailRequestDetail.recevViolatePlace}       <!-- 위반장소 -->
+     , #{emailRequestDetail.recevLaws}               <!-- 법조항 -->
+     , #{emailRequestDetail.recevPayNumber1}         <!-- 납부번호1 -->
+     , #{emailRequestDetail.recevPayNumber2}         <!-- 납부번호2 -->
+     , #{emailRequestDetail.recevOcr0}               <!-- OCR0 -->
+     , #{emailRequestDetail.recevOcr1}               <!-- OCR1 -->
+     , #{emailRequestDetail.recevOcr2}               <!-- OCR2 -->
+     , #{emailRequestDetail.recevOnlinePayNumber}    <!-- 전자납부번호 -->
+     , #{emailRequestDetail.recevFinePrice}          <!-- 과태료 -->
+     , #{emailRequestDetail.recevPayPrice}           <!-- 납부금액 -->
+     , #{emailRequestDetail.recevPayDt}              <!-- 납부기한 -->
+     , #{emailRequestDetail.recevPayInDate}          <!-- 납기내기한 -->
+     , #{emailRequestDetail.recevPayInPrice}         <!-- 납기내금액 -->
+     , #{emailRequestDetail.recevPayInAddPrice}      <!-- 납기내가산금 -->
+     , #{emailRequestDetail.recevPayInDefaultPrice}  <!-- 납기내합계금액 -->
+     , #{emailRequestDetail.recevPayOutDate}         <!-- 납기후기한 -->
+     , #{emailRequestDetail.recevPayOutPrice}        <!-- 납기후금액 -->
+     , #{emailRequestDetail.recevPayOutAddPrice}     <!-- 납기후가산금 -->
+     , #{emailRequestDetail.recevPayOutDefaultPrice} <!-- 납기후합계금액 -->
+     , #{emailRequestDetail.recevCarNumber}          <!-- 차량번호 -->
+     , #{emailRequestDetail.recevCarOwnerZipcode}    <!-- 우편번호 -->
+     , #{emailRequestDetail.recevCarOwnerAddr}       <!-- 주소 -->
+     , #{emailRequestDetail.recevCarOwnerDetailaddr} <!-- 상세주소 -->
+     , #{emailRequestDetail.recevCarOwnerNm}         <!-- 소유자명 -->
+     , #{emailRequestDetail.recevCarOwnerSsn}        <!-- 주민번호 -->
+     , #{emailRequestDetail.recevEvidenceNumber}     <!-- 증거번호 -->
+     , #{emailRequestDetail.recevPhotoCnt}           <!-- 사진장수 -->
+     , #{emailRequestDetail.recevPhotoFilename1}     <!-- 사진파일명1 -->
+     , #{emailRequestDetail.recevPhotoFilename2}     <!-- 사진파일명2 -->
+     , #{emailRequestDetail.recevPhotoFilename3}     <!-- 사진파일명3 -->
+     , #{emailRequestDetail.recevPhotoFilename4}     <!-- 사진파일명4 -->
+     , #{emailRequestDetail.vractno2}                <!-- 가상계좌번호2 -->
+     , #{emailRequestDetail.vractno3}                <!-- 가상계좌번호3 -->
+     , #{emailRequestDetail.vractno4}                <!-- 가상계좌번호4 -->
+     , #{emailRequestDetail.vractno5}                <!-- 가상계좌번호5 -->
+     , #{emailRequestDetail.vractno6}                <!-- 가상계좌번호6 -->
+     , #{emailRequestDetail.vractno7}                <!-- 가상계좌번호7 -->
+     , #{emailRequestDetail.vractno8}                <!-- 가상계좌번호8 -->
+     , #{emailRequestDetail.vractno9}                <!-- 가상계좌번호9 -->
+     , #{emailRequestDetail.vractno10}               <!-- 가상계좌번호10 -->
+     , #{emailRequestDetail.vractno11}               <!-- 가상계좌번호11 -->
+     , #{emailRequestDetail.dtlVarData1}             <!-- 추가 데이터1 (계도 메일 제목) -->
+     , #{emailRequestDetail.dtlVarData2}             <!-- 추가 데이터2 (계도 메일 내용) -->
+     , #{emailRequestDetail.dtlVarData3}             <!-- 추가 데이터3 -->
+     , #{emailRequestDetail.dtlVarData4}             <!-- 추가 데이터4 -->
+     , #{emailRequestDetail.dtlVarData5}             <!-- 추가 데이터5 -->
+     , #{emailRequestDetail.dlvrRsltId}              <!-- 배달 결과 ID -->
+     , #{emailRequestDetail.makeRsltCd}              <!-- 제작 결과 코드 -->
+     , <include refid="utility.now" />                   <!-- 등록 일시 -->
+     , #{currentUser.id}                                 <!-- 등록자 -->
+     , #{emailRequestDetail.vractno}                 <!-- 가상계좌번호 -->
+)</insert>
+
+<update id="updateRequestDetail" parameterType="map">/* 전자우편 신청 상세 수정(emailRequestMapper.updateRequestDetail) */
+UPDATE TB_EPOST_RCPT_DTL SET
+       RECEV_SEQ = #{emailRequestDetail.recevSeq}                                  <!-- 일련번호 -->
+     , RECEV_CODE = #{emailRequestDetail.recevCode}                                <!-- 발송코드 -->
+     , RECEV_BAR1D = #{emailRequestDetail.recevBar1d}                              <!-- 바코드 -->
+     , RECEV_BAR2D = #{emailRequestDetail.recevBar2d}                              <!-- 이차원바코드 -->
+     , RECEV_BILL_NUNBER = #{emailRequestDetail.recevBillNunber}                   <!-- 고지번호 -->
+     , RECEV_DOC_CD1 = #{emailRequestDetail.recevDocCd1}                           <!-- 문서종류1 -->
+     , RECEV_DOC_CD2 = #{emailRequestDetail.recevDocCd2}                           <!-- 문서종류2 -->
+     , RECEV_DOC_CD3 = #{emailRequestDetail.recevDocCd3}                           <!-- 문서종류3 -->
+     , RECEV_DOC_CD4 = #{emailRequestDetail.recevDocCd4}                           <!-- 문서종류4 -->
+     , RECEV_DOC_CD5 = #{emailRequestDetail.recevDocCd5}                           <!-- 문서종류5 -->
+     , RECEV_SUBJ1 = #{emailRequestDetail.recevSubj1}                              <!-- 과목명1 -->
+     , RECEV_SUBJ2 = #{emailRequestDetail.recevSubj2}                              <!-- 과목명2 -->
+     , RECEV_SUBJ3 = #{emailRequestDetail.recevSubj3}                              <!-- 과목명3 -->
+     , RECEV_VIOLATE_DT = #{emailRequestDetail.recevViolateDt}                     <!-- 위반일시 -->
+     , RECEV_VIOLATE_DONG = #{emailRequestDetail.recevViolateDong}                 <!-- 위반동 -->
+     , RECEV_VIOLATE_PLACE = #{emailRequestDetail.recevViolatePlace}               <!-- 위반장소 -->
+     , RECEV_LAWS = #{emailRequestDetail.recevLaws}                                <!-- 법조항 -->
+     , RECEV_PAY_NUMBER1 = #{emailRequestDetail.recevPayNumber1}                   <!-- 납부번호1 -->
+     , RECEV_PAY_NUMBER2 = #{emailRequestDetail.recevPayNumber2}                   <!-- 납부번호2 -->
+     , RECEV_OCR0 = #{emailRequestDetail.recevOcr0}                                <!-- OCR0 -->
+     , RECEV_OCR1 = #{emailRequestDetail.recevOcr1}                                <!-- OCR1 -->
+     , RECEV_OCR2 = #{emailRequestDetail.recevOcr2}                                <!-- OCR2 -->
+     , RECEV_ONLINE_PAY_NUMBER = #{emailRequestDetail.recevOnlinePayNumber}        <!-- 전자납부번호 -->
+     , RECEV_FINE_PRICE = #{emailRequestDetail.recevFinePrice}                     <!-- 과태료 -->
+     , RECEV_PAY_PRICE = #{emailRequestDetail.recevPayPrice}                       <!-- 납부금액 -->
+     , RECEV_PAY_DT = #{emailRequestDetail.recevPayDt}                             <!-- 납부기한 -->
+     , RECEV_PAY_IN_DATE = #{emailRequestDetail.recevPayInDate}                    <!-- 납기내기한 -->
+     , RECEV_PAY_IN_PRICE = #{emailRequestDetail.recevPayInPrice}                  <!-- 납기내금액 -->
+     , RECEV_PAY_IN_ADD_PRICE = #{emailRequestDetail.recevPayInAddPrice}           <!-- 납기내가산금 -->
+     , RECEV_PAY_IN_DEFAULT_PRICE = #{emailRequestDetail.recevPayInDefaultPrice}   <!-- 납기내합계금액 -->
+     , RECEV_PAY_OUT_DATE = #{emailRequestDetail.recevPayOutDate}                  <!-- 납기후기한 -->
+     , RECEV_PAY_OUT_PRICE = #{emailRequestDetail.recevPayOutPrice}                <!-- 납기후금액 -->
+     , RECEV_PAY_OUT_ADD_PRICE = #{emailRequestDetail.recevPayOutAddPrice}         <!-- 납기후가산금 -->
+     , RECEV_PAY_OUT_DEFAULT_PRICE = #{emailRequestDetail.recevPayOutDefaultPrice} <!-- 납기후합계금액 -->
+     , RECEV_CAR_NUMBER = #{emailRequestDetail.recevCarNumber}                     <!-- 차량번호 -->
+     , RECEV_CAR_OWNER_ZIPCODE = #{emailRequestDetail.recevCarOwnerZipcode}        <!-- 우편번호 -->
+     , RECEV_CAR_OWNER_ADDR = #{emailRequestDetail.recevCarOwnerAddr}              <!-- 주소 -->
+     , RECEV_CAR_OWNER_DETAILADDR = #{emailRequestDetail.recevCarOwnerDetailaddr}  <!-- 상세주소 -->
+     , RECEV_CAR_OWNER_NM = #{emailRequestDetail.recevCarOwnerNm}                  <!-- 소유자명 -->
+     , RECEV_CAR_OWNER_SSN = #{emailRequestDetail.recevCarOwnerSsn}                <!-- 주민번호 -->
+     , RECEV_EVIDENCE_NUMBER = #{emailRequestDetail.recevEvidenceNumber}           <!-- 증거번호 -->
+     , RECEV_PHOTO_CNT = #{emailRequestDetail.recevPhotoCnt}                       <!-- 사진장수 -->
+     , RECEV_PHOTO_FILENAME1 = #{emailRequestDetail.recevPhotoFilename1}           <!-- 사진파일명1 -->
+     , RECEV_PHOTO_FILENAME2 = #{emailRequestDetail.recevPhotoFilename2}           <!-- 사진파일명2 -->
+     , RECEV_PHOTO_FILENAME3 = #{emailRequestDetail.recevPhotoFilename3}           <!-- 사진파일명3 -->
+     , RECEV_PHOTO_FILENAME4 = #{emailRequestDetail.recevPhotoFilename4}           <!-- 사진파일명4 -->
+     , VRACTNO2 = #{emailRequestDetail.vractno2}                                   <!-- 가상계좌번호2 -->
+     , VRACTNO3 = #{emailRequestDetail.vractno3}                                   <!-- 가상계좌번호3 -->
+     , VRACTNO4 = #{emailRequestDetail.vractno4}                                   <!-- 가상계좌번호4 -->
+     , VRACTNO5 = #{emailRequestDetail.vractno5}                                   <!-- 가상계좌번호5 -->
+     , VRACTNO6 = #{emailRequestDetail.vractno6}                                   <!-- 가상계좌번호6 -->
+     , VRACTNO7 = #{emailRequestDetail.vractno7}                                   <!-- 가상계좌번호7 -->
+     , VRACTNO8 = #{emailRequestDetail.vractno8}                                   <!-- 가상계좌번호8 -->
+     , VRACTNO9 = #{emailRequestDetail.vractno9}                                   <!-- 가상계좌번호9 -->
+     , VRACTNO10 = #{emailRequestDetail.vractno10}                                 <!-- 가상계좌번호10 -->
+     , VRACTNO11 = #{emailRequestDetail.vractno11}                                 <!-- 가상계좌번호11 -->
+     , DTL_VAR_DATA1 = #{emailRequestDetail.dtlVarData1}                           <!-- 추가 데이터1 -->
+     , DTL_VAR_DATA2 = #{emailRequestDetail.dtlVarData2}                           <!-- 추가 데이터2 -->
+     , DTL_VAR_DATA3 = #{emailRequestDetail.dtlVarData3}                           <!-- 추가 데이터3 -->
+     , DTL_VAR_DATA4 = #{emailRequestDetail.dtlVarData4}                           <!-- 추가 데이터4 -->
+     , DTL_VAR_DATA5 = #{emailRequestDetail.dtlVarData5}                           <!-- 추가 데이터5 -->
+     , DLVR_RSLT_ID = #{emailRequestDetail.dlvrRsltId}                             <!-- 배달 결과 ID -->
+     , MAKE_RSLT_CD = #{emailRequestDetail.makeRsltCd}                             <!-- 제작 결과 코드 -->
+     , VRACTNO = #{emailRequestDetail.vractno}                                     <!-- 가상계좌번호 -->
+ WHERE CON_KEY = #{emailRequestDetail.conKey}
+   AND RGST_NMBR = #{emailRequestDetail.rgstNmbr}</update>
+
+<update id="updateRequestDetailStatus" parameterType="map">/* 전자우편 신청 상세 상태 변경(emailRequestMapper.updateRequestDetailStatus) */
+UPDATE TB_EPOST_RCPT_DTL A
+<if test='resultType == "production"'>
+     , (<foreach collection="results" item="result" separator=" UNION">
+        SELECT #{result.conKey} CON_KEY, #{result.rgstNmbr} RGST_NMBR, #{result.dataCd} MAKE_RSLT_CD</foreach>
+       ) B
+   SET A.MAKE_RSLT_CD = B.MAKE_RSLT_CD
+</if>
+<if test='resultType == "delivery"'>
+     , (<foreach collection="results" item="result" separator=" UNION">
+        SELECT #{result.reletcdata} CON_KEY, #{result.regino} RGST_NMBR, #{result.dlvrRsltId} DLVR_RSLT_ID</foreach>
+       ) B
+   SET A.DLVR_RSLT_ID = B.DLVR_RSLT_ID
+</if>
+ WHERE A.CON_KEY = B.CON_KEY
+   AND B.RGST_NMBR = B.RGST_NMBR
+</update>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/sql/mapper/interfaces/emailResult-mapper.xml b/src/main/resources/sql/mapper/interfaces/emailResult-mapper.xml
new file mode 100644
index 00000000..73a2c9b4
--- /dev/null
+++ b/src/main/resources/sql/mapper/interfaces/emailResult-mapper.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cokr.xit.interfaces.epost.dao.EmailResultMapper">
+
+<!-- 전자우편 신청 정보 매퍼
+ ========== 변경 이력 ==========
+ 2023-07-03	mjkhan 최초 작성
+ ============================ -->
+
+<insert id="insertReceptionResult"  parameterType="cokr.xit.interfaces.epost.ReceptionResult">/* 전자우편 신청 수신 결과 등록(emailResultMapper.insertReceptionResult) */
+<selectKey resultType="string" keyProperty="rcptnRsltId" order="BEFORE">
+SELECT IFNULL(MAX(RCPTN_RSLT_ID) + 1, CONCAT(TODAY, '0000001')) NEW_ID
+  FROM TB_EPOST_RCPTN_RSLT A, (<include refid="utility.selectToday" />) B
+ WHERE RCPTN_RSLT_ID LIKE CONCAT(TODAY, '%')</selectKey>
+INSERT INTO TB_EPOST_RCPTN_RSLT (
+       RCPTN_RSLT_ID <!-- 수신 결과 ID -->
+     , OUTSIDUSERID  <!-- 연계기관코드 -->
+     , INIT_TIME     <!-- 수신일시 -->
+     , RECV_FILENAME <!-- 수신파일명 -->
+     , RELDIVKEY     <!-- 연계키 -->
+     , RECPRSNSEQ    <!-- 수취인순번 -->
+     , REGINO        <!-- 등기번호 -->
+     , ATTACHFILENM  <!-- 첨부파일명 -->
+     , JUNGHAP1      <!-- 1차검증 -->
+     , JUNGHAP2      <!-- 2차검증 -->
+     , JUNGHAP3      <!-- 3차검증 -->
+     , CODE          <!-- 상태코드 -->
+     , MSG           <!-- 메시지 -->
+     , REG_DT        <!-- 등록 일시 -->
+     , RGTR          <!-- 등록자 -->
+)
+SELECT #{rcptnRsltId}  <!-- 수신 결과 ID -->
+     , #{outsiduserid} <!-- 연계기관코드 -->
+     , #{initTime}     <!-- 수신일시 -->
+     , #{recvFilename} <!-- 수신파일명 -->
+     , #{reldivkey}    <!-- 연계키 -->
+     , #{recprsnseq}   <!-- 수취인순번 -->
+     , #{regino}       <!-- 등기번호 -->
+     , #{attachfilenm} <!-- 첨부파일명 -->
+     , #{junghap1}     <!-- 1차검증 -->
+     , #{junghap2}     <!-- 2차검증 -->
+     , #{junghap3}     <!-- 3차검증 -->
+     , #{code}         <!-- 상태코드 -->
+     , #{msg}          <!-- 메시지 -->
+     , #{createdAt}    <!-- 등록 일시 -->
+     , #{createdBy}    <!-- 등록자 -->
+ WHERE NOT EXISTS (
+       SELECT 1
+         FROM TB_EPOST_RCPTN_RSLT
+        WHERE RELDIVKEY = #{reldivkey}
+          AND REGINO = #{regino}
+ )</insert>
+
+<insert id="insertRegistrationResult" parameterType="cokr.xit.interfaces.epost.RegistrationResult">/* 전자우편 신청 접수 결과 등록(emailResultMapper.insertRegistrationResult) */
+<selectKey resultType="string" keyProperty="rcptRsltId" order="BEFORE">
+SELECT IFNULL(MAX(RCPT_RSLT_ID) + 1, CONCAT(TODAY, '0000001')) NEW_ID
+  FROM TB_EPOST_RCPT_RSLT A, (<include refid="utility.selectToday" />) B
+ WHERE RCPT_RSLT_ID LIKE CONCAT(TODAY, '%')</selectKey>
+INSERT INTO TB_EPOST_RCPT_RSLT (
+       RCPT_RSLT_ID <!-- 접수 결과 ID -->
+     , CON_ORG      <!-- 외부기관구분코드 -->
+     , RELORSECT_CD <!-- 결제부서코드 -->
+     , RELETCDATA   <!-- 발송인별추가데이터 -->
+     , EXTRI_REGYMD <!-- 기관발송일자 -->
+     , RCEPT_YMD    <!-- 접수일자 -->
+     , RCEPT_ID     <!-- 접수우체국국기호 -->
+     , DIV_KB       <!-- 취급구분 -->
+     , RCEPT_CNT    <!-- 발송수량 -->
+     , RCEPT_AMT    <!-- 결제금액 -->
+     , USEFEE_AMT   <!-- 제작수수료 -->
+     , TOTPOST_PRC  <!-- 우편요금 -->
+     , JOB_CD       <!-- 작업 코드 -->
+     , REG_DT       <!-- 등록 일시 -->
+     , RGTR         <!-- 등록자 -->
+)
+SELECT #{rcptRsltId}  <!-- 접수 결과 ID -->
+     , #{conOrg}      <!-- 외부기관구분코드 -->
+     , #{relorsectCd} <!-- 결제부서코드 -->
+     , #{reletcdata}  <!-- 발송인별추가데이터 -->
+     , #{extriRegymd} <!-- 기관발송일자 -->
+     , #{rceptYmd}    <!-- 접수일자 -->
+     , #{rceptId}     <!-- 접수우체국국기호 -->
+     , #{divKb}       <!-- 취급구분 -->
+     , #{rceptCnt}    <!-- 발송수량 -->
+     , #{rceptAmt}    <!-- 결제금액 -->
+     , #{usefeeAmt}   <!-- 제작수수료 -->
+     , #{totpostPrc}  <!-- 우편요금 -->
+     , #{jobCd}       <!-- 작업 코드 -->
+     , #{createdAt}   <!-- 등록 일시 -->
+     , #{createdBy}   <!-- 등록자 -->
+  FROM DUAL
+ WHERE NOT EXISTS ( <!-- RELETCDATA가 등록되어 있는 것은 제외 -->
+       SELECT 1
+         FROM TB_EPOST_RCPT_RSLT
+        WHERE RELETCDATA = #{reletcdata}
+ )</insert>
+
+<update id="updateRegistrationResult" parameterType="map">/* 전자우편 신청 접수 결과(jobCd) 업데이트(emailResultMapper.updateRegistrationResult) */
+UPDATE TB_EPOST_RCPT_RSLT A
+     , TB_EPOST_RCPT_REG B
+   SET A.JOB_CD = SUBSTR(B.JOB_CD, 2)
+ WHERE A.RELETCDATA IN (<foreach collection="conKeys" item="conKey" separator=",">#{conKey}</foreach>)
+   AND A.RELETCDATA = B.CON_KEY</update>
+
+<insert id="insertProductionResult" parameterType="cokr.xit.interfaces.epost.ProductionResult">/* 전자우편 제작 결과 등록(emailResultMapper.insertProductionResult) */
+INSERT INTO TB_EPOST_MAKE_RSLT (
+       CON_KEY    <!-- 외부연계식별키 -->
+     , RGST_NMBR  <!-- 등기 번호 -->
+     , RELETCDATA <!-- 발송인별추가데이터 -->
+     , DATA_CD    <!-- 제작결과 -->
+     , MAIL_CNT   <!-- 내용문매수 -->
+     , REG_DT     <!-- 등록 일시 -->
+     , RGTR       <!-- 등록자 -->
+)
+SELECT #{conKey}      <!-- 외부연계식별키 -->
+     , #{rgstNmbr}    <!-- 등기 번호 -->
+     , #{reletcdata}  <!-- 발송인별추가데이터 -->
+     , #{dataCd}      <!-- 제작결과 -->
+     , #{mailCnt}     <!-- 내용문매수 -->
+     , #{createdAt}   <!-- 등록 일시 -->
+     , #{createdBy}   <!-- 등록자 -->
+  FROM DUAL
+ WHERE NOT EXISTS ( <!-- CON_KEY, RGST_NMBR가 등록되어 있는 것은 제외 -->
+       SELECT 1
+         FROM TB_EPOST_MAKE_RSLT
+        WHERE CON_KEY = #{conKey}
+          AND RGST_NMBR = #{rgstNmbr}
+ )</insert>
+
+<insert id="insertDeliveryResult" parameterType="cokr.xit.interfaces.epost.DeliveryResult">/* 전자우편 배달 결과 등록(emailResultMapper.insertDeliveryResult) */
+<selectKey resultType="string" keyProperty="dlvrRsltId" order="BEFORE">
+SELECT IFNULL(MAX(DLVR_RSLT_ID) + 1, CONCAT(TODAY, '0000001')) NEW_ID
+  FROM TB_EPOST_DLVR_RSLT A, (<include refid="utility.selectToday" />) B
+ WHERE DLVR_RSLT_ID LIKE CONCAT(TODAY, '%')</selectKey>
+INSERT INTO TB_EPOST_DLVR_RSLT (
+       DLVR_RSLT_ID      <!-- 배달 결과 ID -->
+     , CON_KEY           <!-- 외부연계식별키 -->
+     , OUTSIDUSERID      <!-- 외부기관구분코드 -->
+     , RELETCDATA        <!-- 발송인별추가데이터 -->
+     , REGINO            <!-- 등기번호 -->
+     , DELIVYMD          <!-- 배달일자 -->
+     , DELIVHHMI         <!-- 배달시분 -->
+     , DELIVRSLTCD       <!-- 배달결과코드 -->
+     , NONDELIVREASNCD   <!-- 미배달사유코드 -->
+     , NONDELIVREASNCDNM <!-- 미배달사유명 -->
+     , SUBRECPRSNNM      <!-- 수령인명 -->
+     , RELRECPRSNCD      <!-- 수령인관계코드 -->
+     , RELRECPRSNCDNM    <!-- 수령인관계명 -->
+     , REG_DT            <!-- 등록 일시 -->
+     , RGTR              <!-- 등록자 -->
+) VALUES (
+       #{dlvrRsltId}        <!-- 배달 결과 ID -->
+     , #{reletcdata}        <!-- 외부연계식별키, 발송인별추가데이터 -->
+     , #{outsiduserid}      <!-- 외부기관구분코드 -->
+     , #{reletcdata}        <!-- 발송인별추가데이터 -->
+     , #{regino}            <!-- 등기번호 -->
+     , #{delivymd}          <!-- 배달일자 -->
+     , #{delivhhmi}         <!-- 배달시분 -->
+     , #{delivrsltcd}       <!-- 배달결과코드 -->
+     , #{nondelivreasncd}   <!-- 미배달사유코드 -->
+     , #{nondelivreasncdnm} <!-- 미배달사유명 -->
+     , #{subrecprsnnm}      <!-- 수령인명 -->
+     , #{relrecprsncd}      <!-- 수령인관계코드 -->
+     , #{relrecprsncdnm}    <!-- 수령인관계명 -->
+     , #{createdAt}         <!-- 등록 일시 -->
+     , #{createdBy}         <!-- 등록자 -->
+)</insert>
+
+<select id="selectResultLogs" parameterType="map" resultType="dataobject">/* 전자우편 신청결과 로그 조회(emailResultMapper.selectResultLogs) */
+<include refid="utility.paging-prefix" />
+SELECT PROC_ID    <!-- 처리 ID -->
+     , PROC_SEQ   <!-- 순번 -->
+     , PROC_TYPE  <!-- 처리 유형 -->
+     , RESULT_ID  <!-- 처리결과 ID -->
+     , CON_KEY    <!-- 외부연계 식별자 -->
+     , RGST_NMBR  <!-- 등기번호 -->
+     , PROC_STT   <!-- 처리상태 -->
+  FROM TB_EPOST_PROC_LOG
+ WHERE PROC_ID = #{procID}
+   AND PROC_STT = 'N'
+<include refid="utility.orderBy" />
+<include refid="utility.paging-suffix" /></select>
+
+<insert id="insertResultLogs" parameterType="map">/* 전자우편 신청결과 로그 등록(emailResultMapper.insertResultLogs) */
+INSERT INTO TB_EPOST_PROC_LOG (
+       PROC_ID   <!-- 처리 ID -->
+     , PROC_SEQ  <!-- 처리 순번 -->
+     , PROC_TYPE <!-- 처리 유형 -->
+     , RESULT_ID <!-- 결과 ID -->
+     , CON_KEY   <!-- 외부연계 식별키 -->
+     , RGST_NMBR <!-- 등기번호 -->
+     , PROC_STT  <!-- 업무 연계 상태 -->
+     , REG_DT    <!-- 등록 일시 -->
+     , RGTR      <!-- 등록자 -->
+)<foreach collection="logs" item="log" separator=" UNION">
+SELECT #{log.procId}       <!-- 처리 ID -->
+     , #{log.procSeq}      <!-- 처리 순번 -->
+     , #{log.procType}     <!-- 처리 유형 -->
+     , #{log.resultId}     <!-- 결과 ID -->
+     , #{log.conKey}       <!-- 외부연계 식별키 -->
+     , #{log.rgstNmbr}     <!-- 등기번호 -->
+     , 'N'                 <!-- 업무 연계 상태 -->
+     , #{log.createdAt}    <!-- 등록 일시 -->
+     , #{log.createdBy}    <!-- 등록자 --></foreach>
+</insert>
+
+<update id="updateResultLogStatus" parameterType="map">/* 전자우편 신청결과 로그 상태 업데이트(emailResultMapper.updateResultLogStatus) */
+UPDATE TB_EPOST_PROC_LOG A
+     , (<foreach collection="logs" item="log" separator=" UNION">
+        SELECT #{log.PROC_ID} PROC_ID, #{log.PROC_SEQ} PROC_SEQ, #{log.PROC_STT} PROC_STT</foreach>
+       ) B
+   SET A.PROC_STT = B.PROC_STT
+ WHERE A.PROC_ID = B.PROC_ID
+   AND A.PROC_SEQ = B.PROC_SEQ</update>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/sql/mapper/interfaces/smg-mapper.xml b/src/main/resources/sql/mapper/interfaces/smg-mapper.xml
new file mode 100644
index 00000000..19f9689c
--- /dev/null
+++ b/src/main/resources/sql/mapper/interfaces/smg-mapper.xml
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cokr.xit.interfaces.smg.dao.SmgMapper">
+
+<resultMap id="petitionRow" type="cokr.xit.interfaces.smg.Petition">
+	<result column="INTERFACE_SEQ_N"			property="interfaceSeqN" />			<!-- 인터페이스 키 -->
+	<result column="SYS_GUBUN_C"				property="sysGubunC" />				<!-- 시스템 구분 -->
+	<result column="ANC_CODE_V"					property="ancCodeV" />				<!-- 기관 코드 -->
+	<result column="PETI_GUBUN_C"				property="petiGubunC" />			<!-- 민원 구분 -->
+	<result column="PETI_ANC_CODE_V"			property="petiAncCodeV" />			<!-- 민원 기관 코드 -->
+	<result column="PETI_NO_C"					property="petiNoC" />				<!-- 민원 신청 번호 -->
+	<result column="CIVIL_NO_C"					property="civilNoC" />				<!-- 민원 접수 번호 -->
+	<result column="PETER_NAME_V"				property="peterNameV" />			<!-- 민원 신청인 명 -->
+	<result column="ZIP_CODE_C"					property="zipCodeC" />				<!-- 민원 신청인 우편번호 -->
+	<result column="ADDRESS_V"					property="addressV" />				<!-- 민원 신청인 주소 -->
+	<result column="EMAIL_V"					property="emailV" />				<!-- 민원 신청인 이메일 -->
+	<result column="CEL_NO_V"					property="celNoV" />				<!-- 민원 신청인 핸드폰번호 -->
+	<result column="TEL_NO_V"					property="telNoV" />				<!-- 민원 신청인 전화번호 -->
+	<result column="PETI_TITLE_V"				property="petiTitleV" />			<!-- 민원 신청 제목 -->
+	<result column="PETI_REASON_L"				property="petiReasonL" />			<!-- 민원 신청 내용 -->
+	<result column="OPEN_YN_C"					property="openYnC" />				<!-- 민원 공개 여부 -->
+	<result column="PETI_REG_D"					property="petiRegD" />				<!-- 민원 신청 일자 -->
+	<result column="PETI_REASON_ATTACH_YN_C"	property="petiReasonAttachYnC" />	<!-- 민원 신청 내용 첨부 여부 -->
+	<result column="CIVIL_GIST_V"				property="civilGistV" />			<!-- 민원 요지 -->
+	<result column="CIVIL_ABSTRACT_L"			property="civilAbstractL" />		<!-- 민원 처리 요약 -->
+	<result column="PCD_DEPT_V"					property="pcdDeptV" />				<!-- 처리 부서 코드 -->
+	<result column="PCD_DEPT_NM_V"				property="pcdDeptNmV" />			<!-- 민원 처리 부서명 -->
+	<result column="DUTY_ID_V"					property="dutyIdV" />				<!-- 민원 처리 담당자 명 -->
+	<result column="PCD_EMAIL_V"				property="pcdEmailV" />				<!-- 담당자 이메일 -->
+	<result column="PCD_TEL_V"					property="pcdTelV" />				<!-- 담당자 전화번호 -->
+	<result column="PCD_RST_CONT_L"				property="pcdRstContL" />			<!-- 민원 처리 결과 -->
+	<result column="DO_REG_D"					property="doRegD" />				<!-- 민원 처리 완료 일자 -->
+	<result column="PCD_RST_CONT_ATTACH_YN_C"	property="pcdRstContAttachYnC" />	<!-- 민원 처리 결과 첨부 여부 -->
+	<result column="PCD_ANC_CODE_V"				property="pcdAncCodeV" />			<!-- 민원 실 처리 기관 코드 -->
+	<result column="PETI_PROC_DUR_N"			property="petiProcDurN" />			<!-- 민원 처리 기간'column="-->
+	<result column="PETI_END_D"					property="petiEndD" />				<!-- 처리 예정 일자 -->
+	<result column="ANC_REG_D"					property="ancRegD" />				<!-- 접수 일자 -->
+	<result column="MORE_AGAIN_V"				property="moreAgainV" />			<!-- 한마디더 -->
+	<result column="SATISFY_C"					property="satisfyC" />				<!-- 만족도 항목1 -->
+	<result column="SATISFY2_C"					property="satisfy2C" />				<!-- 만족도 항목2 -->
+	<result column="SATISFY3_C"					property="satisfy3C" />				<!-- 만족도 항목3 -->
+	<result column="SATISFY_REG_D"				property="satisfyRegD" />			<!-- 만족도 입력일 -->
+	<result column="REG_D"						property="regD" />					<!-- 등록 일자 -->
+	<result column="SEND_YN_C"					property="sendYnC" />				<!-- 송신 여부 -->
+	<result column="SEND_D"						property="sendD" />					<!-- 송신 일자 -->
+	<result column="APPLY_D"					property="applyD" />				<!-- 적용 일자 -->
+	<result column="APPLY_GUBUN_C"				property="applyGubunC" />			<!-- 완료 구분 -->
+	<result column="PCD_GUBUN_V"				property="pcdGubunV" />				<!-- 처리 구분1 -->
+	<result column="PCD_GUBUN2_V"				property="pcdGubun2V" />			<!-- 처리 구분2 -->
+	<result column="PCD_GUBUN3_V"				property="pcdGubun3V" />			<!-- 처리 구분3 -->
+	<result column="PETI_PATH_GUBUN_C"			property="petiPathGubunC" />		<!-- 신청 경로 코드 -->
+	<result column="ORGNL_FILE_NM"				property="originalFilename" />		<!-- 원본 파일 명 -->
+	<result column="REG_DT"						property="createdAt" />				<!-- 등록 일시 -->
+	<result column="RGTR"						property="createdBy" />				<!-- 등록자 -->
+		
+	<result column="PETI_FILE_SIZE_N"			property="petiFileSizeN" />			<!-- 민원 신청 첨부파일 크기 -->
+	<result column="PETI_FILE_PATH1_V"			property="petiFilePath1V" />		<!-- 민원 신청 첨부파일명 1 -->
+	<result column="PETI_FILE_PATH2_V"			property="petiFilePath2V" />		<!-- 민원 신청 첨부파일명 2 -->
+	<result column="PETI_FILE_PATH3_V"			property="petiFilePath3V" />		<!-- 민원 신청 첨부파일명 3 -->
+	<result column="PETI_FILE_PATH4_V"			property="petiFilePath4V" />		<!-- 민원 신청 첨부파일명 4 -->
+	<result column="PETI_FILE_PATH5_V"			property="petiFilePath5V" />		<!-- 민원 신청 첨부파일명 5 -->
+		
+	<result column="PCD_FILE_SIZE_N"			property="pcdFileSizeN" />			<!-- 민원 처리 첨부파일 크기 -->
+	<result column="PCD_FILE_PATH1_V"			property="pcdFilePath1V" />			<!-- 민원 처리 첨부파일명 1 -->
+	<result column="PCD_FILE_PATH2_V"			property="pcdFilePath1V" />			<!-- 민원 처리 첨부파일명 2 -->
+	<result column="PCD_FILE_PATH3_V"			property="pcdFilePath1V" />			<!-- 민원 처리 첨부파일명 3 -->
+	<result column="PCD_FILE_PATH4_V"			property="pcdFilePath1V" />			<!-- 민원 처리 첨부파일명 4 -->
+	<result column="PCD_FILE_PATH5_V"			property="pcdFilePath1V" />			<!-- 민원 처리 첨부파일명 5 -->
+		
+	<result column="STRG_ATCHFILE_NM1"			property="attachmentPath1" />		<!-- 저장 첨부파일명 1 -->
+	<result column="STRG_ATCHFILE_NM2"			property="attachmentPath2" />		<!-- 저장 첨부파일명 2 -->
+	<result column="STRG_ATCHFILE_NM3"			property="attachmentPath3" />		<!-- 저장 첨부파일명 3 -->
+	<result column="STRG_ATCHFILE_NM4"			property="attachmentPath4" />		<!-- 저장 첨부파일명 4 -->
+	<result column="STRG_ATCHFILE_NM5"			property="attachmentPath5" />		<!-- 저장 첨부파일명 5 -->
+
+	<result column="TRSM_INTERFACE_SEQ_N"		property="sendInterfaceSeqN" />		<!-- 전송 인터페이스 키 -->
+	<result column="TRSM_STTS_CD"				property="sendStatus" />			<!-- 전송 상태 -->
+	<result column="TRSM_STTS_MSG"				property="sendStatusMsg" />			<!-- 전송 상태 메시지 -->
+</resultMap>
+
+<select id="selectPetitions" parameterType="list" resultMap="petitionRow">/* smgMapper.selectPetitions(국민신문고 수신 민원 조회) */
+SELECT A.*
+     , PETI_FILE_SIZE_N
+     , PETI_FILE_PATH1_V
+     , PETI_FILE_PATH2_V
+     , PETI_FILE_PATH3_V
+     , PETI_FILE_PATH4_V
+     , PETI_FILE_PATH5_V
+
+     , PCD_FILE_SIZE_N
+     , PCD_FILE_PATH1_V
+     , PCD_FILE_PATH2_V
+     , PCD_FILE_PATH3_V
+     , PCD_FILE_PATH4_V
+     , PCD_FILE_PATH5_V
+
+     , STRG_ATCHFILE_NM1
+     , STRG_ATCHFILE_NM2
+     , STRG_ATCHFILE_NM3
+     , STRG_ATCHFILE_NM4
+     , STRG_ATCHFILE_NM5
+  FROM TB_ESB_INTERFACE A
+     , TB_ESB_INTERFACE_FILE B
+ WHERE A.INTERFACE_SEQ_N IN (<foreach collection="list" item="item" separator=",">#{item}</foreach>)
+   AND A.INTERFACE_SEQ_N = B.INTERFACE_SEQ_N
+ ORDER BY INTERFACE_SEQ_N DESC</select>
+
+<insert id="insertPetition" parameterType="cokr.xit.interfaces.smg.Petition">/* smgMapper.insertPetition(국민신문고 수신 민원 등록) */
+INSERT INTO TB_ESB_INTERFACE (
+      INTERFACE_SEQ_N			<!-- 인터페이스 키 -->
+    , SYS_GUBUN_C				<!-- 시스템 구분 -->
+    , ANC_CODE_V				<!-- 기관 코드 -->
+    , PETI_GUBUN_C				<!-- 민원 구분 -->
+    , PETI_ANC_CODE_V			<!-- 민원 기관 코드 -->
+    , PETI_NO_C					<!-- 민원 신청 번호 -->
+    , CIVIL_NO_C				<!-- 민원 접수 번호 -->
+    , PETER_NAME_V				<!-- 민원 신청인 명 -->
+    , ZIP_CODE_C				<!-- 민원 신청인 우편번호 -->
+    , ADDRESS_V					<!-- 민원 신청인 주소 -->
+    , EMAIL_V					<!-- 민원 신청인 이메일 -->
+    , CEL_NO_V					<!-- 민원 신청인 핸드폰번호 -->
+    , TEL_NO_V					<!-- 민원 신청인 전화번호 -->
+    , PETI_TITLE_V				<!-- 민원 신청 제목 -->
+    , PETI_REASON_L				<!-- 민원 신청 내용 -->
+    , OPEN_YN_C					<!-- 민원 공개 여부 -->
+    , PETI_REG_D				<!-- 민원 신청 일자 -->
+    , PETI_REASON_ATTACH_YN_C	<!-- 민원 신청 내용 첨부 여부 -->
+    , CIVIL_GIST_V				<!-- 민원 요지 -->
+    , CIVIL_ABSTRACT_L			<!-- 민원 처리 요약 -->
+    , PCD_DEPT_V				<!-- 처리 부서 코드 -->
+    , PCD_DEPT_NM_V				<!-- 민원 처리 부서명 -->
+    , DUTY_ID_V					<!-- 민원 처리 담당자 명 -->
+    , PCD_EMAIL_V				<!-- 담당자 이메일 -->
+    , PCD_TEL_V					<!-- 담당자 전화번호 -->
+    , PCD_RST_CONT_L			<!-- 민원 처리 결과 -->
+    , DO_REG_D					<!-- 민원 처리 완료 일자 -->
+    , PCD_RST_CONT_ATTACH_YN_C	<!-- 민원 처리 결과 첨부 여부 -->
+    , PCD_ANC_CODE_V			<!-- 민원 실 처리 기관 코드 -->
+    , PETI_PROC_DUR_N			<!-- 민원 처리 기간', -->
+    , PETI_END_D				<!-- 처리 예정 일자 -->
+    , ANC_REG_D					<!-- 접수 일자 -->
+    , MORE_AGAIN_V				<!-- 한마디더 -->
+    , SATISFY_C					<!-- 만족도 항목1 -->
+    , SATISFY2_C				<!-- 만족도 항목2 -->
+    , SATISFY3_C				<!-- 만족도 항목3 -->
+    , SATISFY_REG_D				<!-- 만족도 입력일 -->
+    , REG_D						<!-- 등록 일자 -->
+    , SEND_YN_C					<!-- 송신 여부 -->
+    , SEND_D					<!-- 송신 일자 -->
+    , APPLY_D					<!-- 적용 일자 -->
+    , APPLY_GUBUN_C				<!-- 완료 구분 -->
+    , PCD_GUBUN_V				<!-- 처리 구분1 -->
+    , PCD_GUBUN2_V				<!-- 처리 구분2 -->
+    , PCD_GUBUN3_V				<!-- 처리 구분3 -->
+    , PETI_PATH_GUBUN_C			<!-- 신청 경로 코드 -->
+    , ORGNL_FILE_NM				<!-- 원본 파일 명 -->
+    , REG_DT					<!-- 등록 일시 -->
+    , RGTR						<!-- 등록자 -->
+) VALUES (
+      #{interfaceSeqN}			<!-- 인터페이스 키 -->
+    , #{sysGubunC}				<!-- 시스템 구분 -->
+    , #{ancCodeV}				<!-- 기관 코드 -->
+    , #{petiGubunC}				<!-- 민원 구분 -->
+    , #{petiAncCodeV}			<!-- 민원 기관 코드 -->
+    , #{petiNoC}				<!-- 민원 신청 번호 -->
+    , #{civilNoC}				<!-- 민원 접수 번호 -->
+    , #{peterNameV}				<!-- 민원 신청인 명 -->
+    , #{zipCodeC}				<!-- 민원 신청인 우편번호 -->
+    , #{addressV}				<!-- 민원 신청인 주소 -->
+    , #{emailV}					<!-- 민원 신청인 이메일 -->
+    , #{celNoV}					<!-- 민원 신청인 핸드폰번호 -->
+    , #{telNoV}					<!-- 민원 신청인 전화번호 -->
+    , #{petiTitleV}				<!-- 민원 신청 제목 -->
+    , #{petiReasonL}			<!-- 민원 신청 내용 -->
+    , #{openYnC}				<!-- 민원 공개 여부 -->
+    , #{petiRegD}				<!-- 민원 신청 일자 -->
+    , #{petiReasonAttachYnC}	<!-- 민원 신청 내용 첨부 여부 -->
+    , #{civilGistV}				<!-- 민원 요지 -->
+    , #{civilAbstractL}			<!-- 민원 처리 요약 -->
+    , #{pcdDeptV}				<!-- 처리 부서 코드 -->
+    , #{pcdDeptNmV}				<!-- 민원 처리 부서명 -->
+    , #{dutyIdV}				<!-- 민원 처리 담당자 명 -->
+    , #{pcdEmailV}				<!-- 담당자 이메일 -->
+    , #{pcdTelV}				<!-- 담당자 전화번호 -->
+    , #{pcdRstContL}			<!-- 민원 처리 결과 -->
+    , #{doRegD}					<!-- 민원 처리 완료 일자 -->
+    , #{pcdRstContAttachYnC}	<!-- 민원 처리 결과 첨부 여부 -->
+    , #{pcdAncCodeV}			<!-- 민원 실 처리 기관 코드 -->
+    , #{petiProcDurN}			<!-- 민원 처리 기간', -->
+    , #{petiEndD}				<!-- 처리 예정 일자 -->
+    , #{ancRegD}				<!-- 접수 일자 -->
+    , #{moreAgainV}				<!-- 한마디더 -->
+    , #{satisfyC}				<!-- 만족도 항목1 -->
+    , #{satisfy2C}				<!-- 만족도 항목2 -->
+    , #{satisfy3C}				<!-- 만족도 항목3 -->
+    , #{satisfyRegD}			<!-- 만족도 입력일 -->
+    , #{regD}					<!-- 등록 일자 -->
+    , #{sendYnC}				<!-- 송신 여부 -->
+    , #{sendD}					<!-- 송신 일자 -->
+    , #{applyD}					<!-- 적용 일자 -->
+    , #{applyGubunC}			<!-- 완료 구분 -->
+    , #{pcdGubunV}				<!-- 처리 구분1 -->
+    , #{pcdGubun2V}				<!-- 처리 구분2 -->
+    , #{pcdGubun3V}				<!-- 처리 구분3 -->
+    , #{petiPathGubunC}			<!-- 신청 경로 코드 -->
+    , #{originalFilename}		<!-- 원본 파일 명 -->
+    ,<include refid="utility.now" /><!-- 등록 일시 -->
+    , #{createdBy}				<!-- 등록자 -->
+)</insert>
+
+<insert id="insertFile" parameterType="cokr.xit.interfaces.smg.Petition">/* smgMapper.insertFile(국민신문고 수신 민원 첨부파일 등록) */
+INSERT INTO TB_ESB_INTERFACE_FILE (
+      INTERFACE_SEQ_N		<!-- 인터페이스 키 -->
+    
+    , PETI_FILE_SIZE_N		<!-- 민원 신청 첨부파일 크기 -->
+    , PETI_FILE_PATH1_V		<!-- 민원 신청 첨부파일명 1 -->
+    , PETI_FILE_PATH2_V		<!-- 민원 신청 첨부파일명 2 -->
+    , PETI_FILE_PATH3_V		<!-- 민원 신청 첨부파일명 3 -->
+    , PETI_FILE_PATH4_V		<!-- 민원 신청 첨부파일명 4 -->
+    , PETI_FILE_PATH5_V		<!-- 민원 신청 첨부파일명 5 -->
+    	
+    , PCD_FILE_SIZE_N		<!-- 민원 처리 첨부파일 크기 -->
+    , PCD_FILE_PATH1_V		<!-- 민원 처리 첨부파일명 1 -->
+    , PCD_FILE_PATH2_V		<!-- 민원 처리 첨부파일명 2 -->
+    , PCD_FILE_PATH3_V		<!-- 민원 처리 첨부파일명 3 -->
+    , PCD_FILE_PATH4_V		<!-- 민원 처리 첨부파일명 4 -->
+    , PCD_FILE_PATH5_V		<!-- 민원 처리 첨부파일명 5 -->
+    	
+    , STRG_ATCHFILE_NM1		<!-- 저장 첨부파일명 1 -->
+    , STRG_ATCHFILE_NM2		<!-- 저장 첨부파일명 2 -->
+    , STRG_ATCHFILE_NM3		<!-- 저장 첨부파일명 3 -->
+    , STRG_ATCHFILE_NM4		<!-- 저장 첨부파일명 4 -->
+    , STRG_ATCHFILE_NM5		<!-- 저장 첨부파일명 5 -->
+) VALUES (
+      #{interfaceSeqN}		<!-- 인터페이스 키 -->
+
+    , #{petiFileSizeN}		<!-- 민원 신청 첨부파일 크기 -->
+    , #{petiFilePath1V}		<!-- 민원 신청 첨부파일명 1 -->
+    , #{petiFilePath2V}		<!-- 민원 신청 첨부파일명 2 -->
+    , #{petiFilePath3V}		<!-- 민원 신청 첨부파일명 3 -->
+    , #{petiFilePath4V}		<!-- 민원 신청 첨부파일명 4 -->
+    , #{petiFilePath5V}		<!-- 민원 신청 첨부파일명 5 -->
+    	
+    , #{pcdFileSizeN}		<!-- 민원 처리 첨부파일 크기 -->
+    , #{pcdFilePath1V}		<!-- 민원 처리 첨부파일명 1 -->
+    , #{pcdFilePath1V}		<!-- 민원 처리 첨부파일명 2 -->
+    , #{pcdFilePath1V}		<!-- 민원 처리 첨부파일명 3 -->
+    , #{pcdFilePath1V}		<!-- 민원 처리 첨부파일명 4 -->
+    , #{pcdFilePath1V}		<!-- 민원 처리 첨부파일명 5 -->
+    	
+    , #{attachmentPath1}	<!-- 저장 첨부파일명 1 -->
+    , #{attachmentPath2}	<!-- 저장 첨부파일명 2 -->
+    , #{attachmentPath3}	<!-- 저장 첨부파일명 3 -->
+    , #{attachmentPath4}	<!-- 저장 첨부파일명 4 -->
+    , #{attachmentPath5}	<!-- 저장 첨부파일명 5 -->
+)</insert>
+
+<select id="selectReplies" parameterType="list" resultMap="petitionRow">/* smgMapper.selectReplies(국민신문고 답변 대상 조회) */
+SELECT A.INTERFACE_SEQ_N	<!-- 인터페이스키 -->
+     , A.SYS_GUBUN_C		<!-- 시스템구분 -->
+     , A.ANC_CODE_V			<!-- 기관코드 -->
+     , A.PETI_GUBUN_C		<!-- 민원구분 -->
+     , A.PETI_ANC_CODE_V	<!-- 민원기관코드 -->
+     , A.PETI_NO_C			<!-- 민원 신청 번호 -->
+     , A.CIVIL_NO_C			<!-- 민원 접수 번호 -->
+     , PETER_NAME_V			<!-- 민원 신청인 명 -->
+     , ZIP_CODE_C			<!-- 민원 신청인 우편 번호 -->
+     , ADDRESS_V			<!-- 민원 신청인 주소 -->
+     , PETI_TITLE_V			<!-- 민원 신청 제목 -->
+     , PETI_REASON_L		<!-- 민원 신청 내용 -->
+     , OPEN_YN_C			<!-- 민원 공개 여부 -->
+     , PETI_REG_D			<!-- 민원 신청일 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.CIVIL_GIST_V ELSE B.CIVIL_GIST_V END CIVIL_GIST_V		<!-- 민원요지 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.CIVIL_ABSTRACT_L ELSE B.CIVIL_ABSTRACT_L END CIVIL_ABSTRACT_L	<!-- 민원처리요약 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_DEPT_V ELSE B.PCD_DEPT_V END PCD_DEPT_V			<!-- 처리부서코드 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_DEPT_NM_V ELSE B.PCD_DEPT_NM_V END PCD_DEPT_NM_V	<!-- 민원 처리 부서명 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.DUTY_ID_V ELSE B.DUTY_ID_V END DUTY_ID_V				<!-- 민원 처리 담당자 명 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_EMAIL_V ELSE B.PCD_EMAIL_V END PCD_EMAIL_V			<!-- 담당자 이메일 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_TEL_V ELSE B.PCD_TEL_V END PCD_TEL_V				<!-- 담당자 전화번호 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_RST_CONT_L ELSE B.PCD_RST_CONT_L END PCD_RST_CONT_L<!-- 민원 처리 결과 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.DO_REG_D ELSE B.DO_REG_D END DO_REG_D					<!-- 민원 처리 완료 일자 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_RST_CONT_ATTACH_YN_C ELSE B.PCD_RST_CONT_ATTACH_YN_C END PCD_RST_CONT_ATTACH_YN_C	<!-- 민원 처리 결과 첨부 여부 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_ANC_CODE_V ELSE B.PCD_ANC_CODE_V END PCD_ANC_CODE_V<!-- 민원 실 처리 기관 코드 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.REG_D ELSE B.REG_D END REG_D							<!-- 등록일자 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.SEND_YN_C ELSE B.SEND_YN_C END SEND_YN_C				<!-- 송신여부 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.SEND_D ELSE B.SEND_D END SEND_D						<!-- 송신일자 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.APPLY_D ELSE B.APPLY_D END APPLY_D						<!-- 적용일자 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.APPLY_GUBUN_C ELSE B.APPLY_GUBUN_C END APPLY_GUBUN_C	<!-- 완료구분 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_GUBUN_V ELSE B.PCD_GUBUN_V END PCD_GUBUN_V			<!-- 처리구분1 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_GUBUN2_V ELSE B.PCD_GUBUN2_V END PCD_GUBUN2_V		<!-- 처리구분2 -->
+     , CASE A.PETI_GUBUN_C WHEN '180' THEN A.PCD_GUBUN3_V ELSE B.PCD_GUBUN3_V END PCD_GUBUN3_V		<!-- 처리구분3 -->
+     , A.TRSM_INTERFACE_SEQ_N <!-- 전송 인터페이스 키 -->
+  FROM TB_ESB_INTERFACE_TRSM A
+  LEFT OUTER JOIN TB_ESB_INTERFACE B ON A.INTERFACE_SEQ_N = B.INTERFACE_SEQ_N
+<if test='list == null'>WHERE A.APPLY_GUBUN_C = 'N'</if>
+<if test='list != null'>WHERE A.INTERFACE_SEQ_N IN (<foreach collection="list" item="item" separator=",">#{item}</foreach>)</if>
+ ORDER BY A.INTERFACE_SEQ_N
+</select>
+
+<insert id="insertReply" parameterType="map">/* smgMapper.insertReply(답변/반송 등록)*/
+INSERT INTO TB_ESB_INTERFACE_TRSM (
+       INTERFACE_SEQ_N			<!--인터페이스 키 -->
+     , SYS_GUBUN_C				<!--시스템 구분 -->
+     , ANC_CODE_V				<!--기관 코드 -->
+     , PETI_GUBUN_C				<!--민원 구분 -->
+     , PETI_ANC_CODE_V			<!--민원 기관 코드 -->
+     , PETI_NO_C				<!--민원 신청 번호 -->
+     , CIVIL_NO_C				<!--민원 접수 번호 -->
+     , CIVIL_GIST_V				<!--민원 요지 -->
+     , CIVIL_ABSTRACT_L			<!--민원 처리 요약 -->
+     , PCD_DEPT_V				<!--처리 부서 코드 -->
+     , PCD_DEPT_NM_V			<!--민원 처리 부서명 -->
+     , DUTY_ID_V				<!--민원 처리 담당자 명 -->
+     , PCD_EMAIL_V				<!--담당자 이메일 -->
+     , PCD_TEL_V				<!--담당자 전화번호 -->
+     , PCD_RST_CONT_L			<!--민원 처리 결과 -->
+     , DO_REG_D					<!--민원 처리 완료 일자 -->
+     , PCD_RST_CONT_ATTACH_YN_C	<!--민원 처리 결과 첨부 여부 -->
+     , PCD_ANC_CODE_V			<!--민원 실 처리 기관 코드 -->
+     , REG_D					<!--등록 일자 -->
+     , SEND_YN_C				<!--송신 여부 -->
+     , SEND_D					<!--송신 일자 -->
+     , APPLY_D					<!--적용 일자 -->
+     , APPLY_GUBUN_C			<!--완료 구분 -->
+     , PCD_GUBUN_V				<!--처리 구분1 -->
+     , PCD_GUBUN2_V				<!--처리 구분2 -->
+     , PCD_GUBUN3_V				<!--처리 구분3 -->
+     , TRSM_INTERFACE_SEQ_N		<!--전송 인터페이스 키 -->
+     , TRSM_STTS_CD				<!--전송 상태 -->
+     , TRSM_STTS_MSG			<!--전송 상태 메시지 -->
+     , REG_DT					<!--등록 일시 -->
+     , RGTR						<!--등록자 -->
+     , MDFCN_DT					<!--수정 일시 -->
+     , MDFR						<!--수정자 -->
+) VALUES (
+       #{reply.interfaceSeqN}		<!--인터페이스 키 -->
+     , #{reply.sysGubunC}			<!--시스템 구분 -->
+     , #{reply.ancCodeV}			<!--기관 코드 -->
+     , #{reply.petiGubunC}			<!--민원 구분 -->
+     , #{reply.petiAncCodeV}		<!--민원 기관 코드 -->
+     , #{reply.petiNoC}				<!--민원 신청 번호 -->
+     , #{reply.civilNoC}			<!--민원 접수 번호 -->
+     , #{reply.civilGistV}			<!--민원 요지 -->
+     , #{reply.civilAbstractL}		<!--민원 처리 요약 -->
+     , #{reply.pcdDeptV}			<!--처리 부서 코드 -->
+     , #{reply.pcdDeptNmV}			<!--민원 처리 부서명 -->
+     , #{reply.dutyIdV}				<!--민원 처리 담당자 명 -->
+     , #{reply.pcdEmailV}			<!--담당자 이메일 -->
+     , #{reply.pcdTelV}				<!--담당자 전화번호 -->
+     , #{reply.pcdRstContL}			<!--민원 처리 결과 -->
+     , #{reply.doRegD}				<!--민원 처리 완료 일자 -->
+     , #{reply.pcdRstContAttachYnC}	<!--민원 처리 결과 첨부 여부 -->
+     , #{reply.pcdAncCodeV}			<!--민원 실 처리 기관 코드 -->
+     , #{reply.regD}				<!--등록 일자 -->
+     , #{reply.sendYnC}				<!--송신 여부 -->
+     , #{reply.sendD}				<!--송신 일자 -->
+     , #{reply.applyD}				<!--적용 일자 -->
+     , #{reply.applyGubunC}			<!--완료 구분 -->
+     , #{reply.pcdGubunV}			<!--처리 구분1 -->
+     , #{reply.pcdGubun2V}			<!--처리 구분2 -->
+     , #{reply.pcdGubun3V}			<!--처리 구분3 -->
+     , #{reply.sendInterfaceSeqN}	<!--전송 인터페이스 키 -->
+     , #{reply.sendStatus}			<!--전송 상태 -->
+     , #{reply.sendStatusMsg}		<!--전송 상태 메시지 -->
+     ,<include refid="utility.now" />
+     , #{currentUser.id}		<!--등록자 -->
+     ,<include refid="utility.now" />
+     , #{currentUser.id}		<!--수정자 -->
+)</insert>
+
+<update id="updateSendStatus" parameterType="map">/* smgMapper.updateSendStatus(답변/반송 전송상태 업데이트) */
+UPDATE TB_ESB_INTERFACE_TRSM A
+     , (<foreach collection="replies" item="reply" separator="UNION">
+        SELECT #{reply.interfaceSeqN} INTERFACE_SEQ_N, #{reply.sendInterfaceSeqN} TRSM_INTERFACE_SEQ_N, #{reply.sendD} SEND_D, #{reply.applyD} APPLY_D, #{reply.applyGubunC} APPLY_GUBUN_C, #{reply.sendStatus} TRSM_STTS_CD, #{reply.sendStatusMsg} TRSM_STTS_MSG</foreach>
+       ) B
+   SET A.TRSM_INTERFACE_SEQ_N = B.TRSM_INTERFACE_SEQ_N
+     , A.SEND_D = B.SEND_D
+     , A.APPLY_D = B.APPLY_D
+     , A.APPLY_GUBUN_C = B.APPLY_GUBUN_C
+     , A.TRSM_STTS_CD = B.TRSM_STTS_CD
+     , A.TRSM_STTS_MSG = B.TRSM_STTS_MSG
+     , A.MDFCN_DT = #{now}
+     , A.MDFR = #{currentUser.id}
+ WHERE A.INTERFACE_SEQ_N = B.INTERFACE_SEQ_N</update>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/sql/mapper/interfaces/vehicleInfo-mapper.xml b/src/main/resources/sql/mapper/interfaces/vehicleInfo-mapper.xml
new file mode 100644
index 00000000..178be247
--- /dev/null
+++ b/src/main/resources/sql/mapper/interfaces/vehicleInfo-mapper.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cokr.xit.interfaces.lvis.dao.VehicleInfoMapper">
+
+<insert id="insertBasicInfo" parameterType="map">/* vehicleInfoMapper.insertBasicInfo(자동차 기본사항 조회 로그 등록) */
+INSERT INTO TB_BASIC_INFO_LOG (
+       LOG_ID
+     , PRYE                             <!-- 연식 -->
+     , REGIST_DE                        <!-- 등록일(변경일) -->
+     , ERSR_REGIST_SE_CODE              <!-- 말소등록구분코드 -->
+     , ERSR_REGIST_SE_NM                <!-- 말소등록구분명 -->
+     , ERSR_REGIST_DE                   <!-- 말소등록일 -->
+     , REGIST_DETAIL_CODE               <!-- 등록상세코드 -->
+     , DSPLVL                           <!-- 배기량 -->
+     , USE_STRNGHLD_LEGALDONG_CODE      <!-- 사용본거지법정동코드 -->
+     , USE_STRNGHLD_ADSTRD_CODE         <!-- 사용본거지행정동코드 -->
+     , USE_STRNGHLD_MNTN                <!-- 사용본거지산 -->
+     , USE_STRNGHLD_LNBR                <!-- 사용본거지번지 -->
+     , USE_STRNGHLD_HO                  <!-- 사용본거지호 -->
+     , USE_STRNGHLD_ADRES_NM            <!-- 사용본거지상세주소 -->
+     , USE_STRNGHLD_ROAD_NM_CODE        <!-- 사용본거지도로명코드 -->
+     , USGSRHLD_UNDGRND_BULD_SE_CODE    <!-- 사용본거지지하건물구분코드 -->
+     , USE_STRNGHLD_BULD_MAIN_NO        <!-- 사용본거지건물주요번호 -->
+     , USE_STRNGHLD_BULD_SUB_NO         <!-- 사용본거지건물부번호 -->
+     , MBER_SE_CODE                     <!-- 대표소유자회원구분코드 -->
+     , MBER_NM                          <!-- 대표소유자성명 -->
+     , MBER_SE_NO                       <!-- 대표소유자회원번호 -->
+     , TELNO                            <!-- 대표소유자전화번호 -->
+     , OWNER_LEGALDONG_CODE             <!-- 소유자법정동코드 -->
+     , OWNER_ADSTRD_CODE                <!-- 소유자행정동코드 -->
+     , OWNER_MNTN                       <!-- 소유자산 -->
+     , OWNER_LNBR                       <!-- 소유자번지 -->
+     , OWNER_HO                         <!-- 소유자호 -->
+     , OWNER_ADRES_NM                   <!-- 소유자상세주소 -->
+     , OWNER_ROAD_NM_CODE               <!-- 소유자도로명코드 -->
+     , OWNER_UNDGRND_BULD_SE_CODE       <!-- 소유자지하건물구분코드 -->
+     , OWNER_BULD_MAIN_NO               <!-- 소유자건물주요번호 -->
+     , OWNER_BULD_SUB_NO                <!-- 소유자건물부번호 -->
+     , OWNER_ADRES_FULL                 <!-- 소유자전체주소 -->
+     , AFTR_VHRNO                       <!-- 신차량번호 -->
+     , USE_FUEL_CODE                    <!-- 사용연료코드 -->
+     , PRPOS_SE_CODE                    <!-- 용도구분코드 -->
+     , MTRS_FOM_NM                      <!-- 원동기형식명 -->
+     , FRNT_VHRNO                       <!-- 이전차량번호 -->
+     , VHRNO                            <!-- 차량번호 -->
+     , VIN                              <!-- 차대번호 -->
+     , CNM                              <!-- 차명 -->
+     , VHCLE_TOT_WT                     <!-- 차량총중량 -->
+     , CAAG_ENDDE                       <!-- 차령만료일자 -->
+     , CHANGE_DE                        <!-- 차번호변경시기 -->
+     , VHCTY_ASORT_CODE                 <!-- 차종종별코드 -->
+     , VHCTY_TY_CODE                    <!-- 차종유형코드 -->
+     , VHCTY_SE_CODE                    <!-- 차종분류코드 -->
+     , MXMM_LDG                         <!-- 최대적재량 -->
+     , VHCTY_ASORT_NM                   <!-- 차종종별명 -->
+     , VHCTY_TY_NM                      <!-- 차종유형명 -->
+     , VHCTY_SE_NM                      <!-- 차종분류명 -->
+     , FRST_REGIST_DE                   <!-- 최초등록일 -->
+     , FOM_NM                           <!-- 형식 -->
+     , ACQS_DE                          <!-- 취득일자 -->
+     , ACQS_END_DE                      <!-- 취득종료일자 -->
+     , YBL_MD                           <!-- 제작년월일 -->
+     , TRANSR_REGIST_DE                 <!-- 이전등록일(양수일) -->
+     , SPCF_REGIST_STTUS_CODE           <!-- 제원등록상태코드 -->
+     , COLOR_NM                         <!-- 색상명 -->
+     , MRTG_CO                          <!-- 저당수 -->
+     , SEIZR_CO                         <!-- 압류건수 -->
+     , STMD_CO                          <!-- 구조변경수 -->
+     , NMPL_CSDY_AT                     <!-- 번호판영치여부 -->
+     , NMPL_CSDY_REMNR_DE               <!-- 번호판영치최고일 -->
+     , ORIGIN_SE_CODE                   <!-- 출처구분코드 -->
+     , NMPL_STNDRD_CODE                 <!-- 번호판규격코드 -->
+     , ACQS_AMOUNT                      <!-- 취득금액 -->
+     , INSPT_VALID_PD_BGNDE             <!-- 검사유효기간시작일 -->
+     , INSPT_VALID_PD_ENDDE             <!-- 검사유효기간종료일 -->
+     , CHCK_VALID_PD_BGNDE              <!-- 점검유효기간시작일 -->
+     , CHCK_VALID_PD_ENDDE              <!-- 점검유효기간종료일 -->
+     , USE_STRNGHLD_GRC_CODE            <!-- 사용본거지관청코드 -->
+     , TKCAR_PSCAP_CO                   <!-- 승차정원수 -->
+     , SPMNNO                           <!-- 제원관리번호 -->
+     , TRVL_DSTNC                       <!-- 주행거리 -->
+     , FRST_REGIST_RQRCNO               <!-- 최초등록접수번호 -->
+     , VLNT_ERSR_PRVNTC_NTICE_DE        <!-- 예고통지일 -->
+     , REGIST_INSTT_NM                  <!-- 등록기관명 -->
+     , PROCESS_IMPRTY_RESN_CODE         <!-- 처리불가사유코드 -->
+     , PROCESS_IMPRTY_RESN_DTLS         <!-- 처리불가사유명세 -->
+     , VIMS_PRPOS_SE_CODE               <!-- 용도구분코드 -->
+     , VIMS_VHCTY_ASORT_CODE            <!-- 차종종별코드 -->
+     , VIMS_VHCTY_TY_CODE               <!-- 차종유형코드 -->
+     , VIMS_VHCTY_SE_CODE               <!-- 차종분류코드 -->
+     , CBD_LT                           <!-- 차체길이 -->
+     , CBD_BT                           <!-- 차체너비 -->
+     , CBD_HG                           <!-- 차체높이 -->
+     , FRST_MXMM_LDG                    <!-- 최초최대적재량 -->
+) VALUES (
+      <include refid="utility.now" />
+     , #{prye}                          <!-- 연식 -->
+     , #{regist_de}                     <!-- 등록일(변경일) -->
+     , #{ersr_regist_se_code}           <!-- 말소등록구분코드 -->
+     , #{ersr_regist_se_nm}             <!-- 말소등록구분명 -->
+     , #{ersr_regist_de}                <!-- 말소등록일 -->
+     , #{regist_detail_code}            <!-- 등록상세코드 -->
+     , #{dsplvl}                        <!-- 배기량 -->
+     , #{use_strnghld_legaldong_code}   <!-- 사용본거지법정동코드 -->
+     , #{use_strnghld_adstrd_code}      <!-- 사용본거지행정동코드 -->
+     , #{use_strnghld_mntn}             <!-- 사용본거지산 -->
+     , #{use_strnghld_lnbr}             <!-- 사용본거지번지 -->
+     , #{use_strnghld_ho}               <!-- 사용본거지호 -->
+     , #{use_strnghld_adres_nm}         <!-- 사용본거지상세주소 -->
+     , #{use_strnghld_road_nm_code}     <!-- 사용본거지도로명코드 -->
+     , #{usgsrhld_undgrnd_buld_se_code} <!-- 사용본거지지하건물구분코드 -->
+     , #{use_strnghld_buld_main_no}     <!-- 사용본거지건물주요번호 -->
+     , #{use_strnghld_buld_sub_no}      <!-- 사용본거지건물부번호 -->
+     , #{mber_se_code}                  <!-- 대표소유자회원구분코드 -->
+     , #{mber_nm}                       <!-- 대표소유자성명 -->
+     , #{mber_se_no}                    <!-- 대표소유자회원번호 -->
+     , #{telno}                         <!-- 대표소유자전화번호 -->
+     , #{owner_legaldong_code}          <!-- 소유자법정동코드 -->
+     , #{owner_adstrd_code}             <!-- 소유자행정동코드 -->
+     , #{owner_mntn}                    <!-- 소유자산 -->
+     , #{owner_lnbr}                    <!-- 소유자번지 -->
+     , #{owner_ho}                      <!-- 소유자호 -->
+     , #{owner_adres_nm}                <!-- 소유자상세주소 -->
+     , #{owner_road_nm_code}            <!-- 소유자도로명코드 -->
+     , #{owner_undgrnd_buld_se_code}    <!-- 소유자지하건물구분코드 -->
+     , #{owner_buld_main_no}            <!-- 소유자건물주요번호 -->
+     , #{owner_buld_sub_no}             <!-- 소유자건물부번호 -->
+     , #{owner_adres_full}              <!-- 소유자전체주소 -->
+     , #{aftr_vhrno}                    <!-- 신차량번호 -->
+     , #{use_fuel_code}                 <!-- 사용연료코드 -->
+     , #{prpos_se_code}                 <!-- 용도구분코드 -->
+     , #{mtrs_fom_nm}                   <!-- 원동기형식명 -->
+     , #{frnt_vhrno}                    <!-- 이전차량번호 -->
+     , #{vhrno}                         <!-- 차량번호 -->
+     , #{vin}                           <!-- 차대번호 -->
+     , #{cnm}                           <!-- 차명 -->
+     , #{vhcle_tot_wt}                  <!-- 차량총중량 -->
+     , #{caag_endde}                    <!-- 차령만료일자 -->
+     , #{change_de}                     <!-- 차번호변경시기 -->
+     , #{vhcty_asort_code}              <!-- 차종종별코드 -->
+     , #{vhcty_ty_code}                 <!-- 차종유형코드 -->
+     , #{vhcty_se_code}                 <!-- 차종분류코드 -->
+     , #{mxmm_ldg}                      <!-- 최대적재량 -->
+     , #{vhcty_asort_nm}                <!-- 차종종별명 -->
+     , #{vhcty_ty_nm}                   <!-- 차종유형명 -->
+     , #{vhcty_se_nm}                   <!-- 차종분류명 -->
+     , #{frst_regist_de}                <!-- 최초등록일 -->
+     , #{fom_nm}                        <!-- 형식 -->
+     , #{acqs_de}                       <!-- 취득일자 -->
+     , #{acqs_end_de}                   <!-- 취득종료일자 -->
+     , #{ybl_md}                        <!-- 제작년월일 -->
+     , #{transr_regist_de}              <!-- 이전등록일(양수일) -->
+     , #{spcf_regist_sttus_code}        <!-- 제원등록상태코드 -->
+     , #{color_nm}                      <!-- 색상명 -->
+     , #{mrtg_co}                       <!-- 저당수 -->
+     , #{seizr_co}                      <!-- 압류건수 -->
+     , #{stmd_co}                       <!-- 구조변경수 -->
+     , #{nmpl_csdy_at}                  <!-- 번호판영치여부 -->
+     , #{nmpl_csdy_remnr_de}            <!-- 번호판영치최고일 -->
+     , #{origin_se_code}                <!-- 출처구분코드 -->
+     , #{nmpl_stndrd_code}              <!-- 번호판규격코드 -->
+     , #{acqs_amount}                   <!-- 취득금액 -->
+     , #{inspt_valid_pd_bgnde}          <!-- 검사유효기간시작일 -->
+     , #{inspt_valid_pd_endde}          <!-- 검사유효기간종료일 -->
+     , #{chck_valid_pd_bgnde}           <!-- 점검유효기간시작일 -->
+     , #{chck_valid_pd_endde}           <!-- 점검유효기간종료일 -->
+     , #{use_strnghld_grc_code}         <!-- 사용본거지관청코드 -->
+     , #{tkcar_pscap_co}                <!-- 승차정원수 -->
+     , #{spmnno}                        <!-- 제원관리번호 -->
+     , #{trvl_dstnc}                    <!-- 주행거리 -->
+     , #{frst_regist_rqrcno}            <!-- 최초등록접수번호 -->
+     , #{vlnt_ersr_prvntc_ntice_de}     <!-- 예고통지일 -->
+     , #{regist_instt_nm}               <!-- 등록기관명 -->
+     , #{process_imprty_resn_code}      <!-- 처리불가사유코드 -->
+     , #{process_imprty_resn_dtls}      <!-- 처리불가사유명세 -->
+     , #{vims_prpos_se_code}            <!-- 용도구분코드 -->
+     , #{vims_vhcty_asort_code}         <!-- 차종종별코드 -->
+     , #{vims_vhcty_ty_code}            <!-- 차종유형코드 -->
+     , #{vims_vhcty_se_code}            <!-- 차종분류코드 -->
+     , #{cbd_lt}                        <!-- 차체길이 -->
+     , #{cbd_bt}                        <!-- 차체너비 -->
+     , #{cbd_hg}                        <!-- 차체높이 -->
+     , #{frst_mxmm_ldg}                 <!-- 최초최대적재량 -->
+)</insert>
+
+</mapper>
\ No newline at end of file

From 0e12052c063d3c21ff33d1c32c21f1fe8f4e7ec7 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Tue, 1 Aug 2023 14:28:48 +0900
Subject: [PATCH 13/20] =?UTF-8?q?=EC=97=B0=EA=B3=84=20=EC=8A=A4=EC=BC=80?=
 =?UTF-8?q?=EC=A5=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/spring/context-scheduler.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/spring/context-scheduler.xml b/src/main/resources/spring/context-scheduler.xml
index 957d39da..321a181c 100644
--- a/src/main/resources/spring/context-scheduler.xml
+++ b/src/main/resources/spring/context-scheduler.xml
@@ -15,7 +15,7 @@
 	</bean>
 	<bean id="smgReceiverTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="smgReceiver" />
-		<property name="cronExpression" value="0 0/1 * * * ?" /> <!-- 10분마다 -->
+		<property name="cronExpression" value="0 0/10 * * * ?" /> <!-- 10분마다 -->
 	</bean>
 
 	<!-- 국민신문고 민원답변 전송 -->
@@ -25,7 +25,7 @@
 	</bean>
 	<bean id="smgSenderTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="smgSender" />
-		<property name="cronExpression" value="0 0/1 * * * ?" /> <!-- 10분마다 -->
+		<property name="cronExpression" value="0 0/10 * * * ?" /> <!-- 10분마다 -->
 	</bean>
 
 	<!-- epost 전자우편 신청 전송 -->
@@ -35,7 +35,7 @@
 	</bean>
 	<bean id="epostSenderTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="epostSender" />
-		<property name="cronExpression" value="0 0/1 0 * * ?" /> <!-- 10분마다 -->
+		<property name="cronExpression" value="0 0/10 0 * * ?" /> <!-- 10분마다 -->
 	</bean>
 
 	<!-- epost 전자우편 결과 수신 -->
@@ -45,8 +45,8 @@
 	</bean>
 	<bean id="epostReceiverTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="epostReceiver" />
-		<!--property name="cronExpression" value="0 30 0 * * ?" /> < 매일 00:30 -->
-		<property name="cronExpression" value="0 0/1 0 * * ?" /> <!-- 1분마다 -->
+		<property name="cronExpression" value="0 30 0 * * ?" /> <!-- 매일 00:30 -->
+		<!-- property name="cronExpression" value="0 0/1 0 * * ?" /> <1분마다 -->
 	</bean>
 
 	<bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">

From 1d177dfb7a8cbf8e98ae5f96a278bf74b209d580 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 1 Aug 2023 15:41:47 +0900
Subject: [PATCH 14/20] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=82=AC=EC=A7=84=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=97=85=EB=A1=9C=EB=93=9C=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

---
 src/main/java/cokr/xit/fims/crdn/Crdn.java    |  10 ++
 .../xit/fims/crdn/web/Crdn01Controller.java   |  20 +++
 .../xit/fims/crdn/web/Crdn05Controller.java   |   6 +-
 .../WEB-INF/jsp/fims/crdn/crdn01010-main.jsp  |   5 +-
 .../WEB-INF/jsp/fims/crdn/crdn01020-info.jsp  | 138 ++++++++++++------
 .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  |  14 +-
 src/main/webapp/WEB-INF/jsp/include/top.jsp   |   2 +-
 7 files changed, 139 insertions(+), 56 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java
index dfd3ea32..65f5825f 100644
--- a/src/main/java/cokr/xit/fims/crdn/Crdn.java
+++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java
@@ -12,6 +12,16 @@ import lombok.Setter;
 public class Crdn extends AbstractEntity {
 	public static String INF_TYPE = "100";
 
+	/**
+	 * 수정할 파일키 목록
+	 */
+	private String[] modifyFileKeyList;
+
+	/**
+	 * 삭제할 파일키 목록
+	 */
+	private String[] deleteFileKeyList;
+
 	/**
 	 * 수정 처리할 정보
 	 */
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
index 453aaded..d0e4c4f9 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
@@ -7,6 +7,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.code.CommonCode;
@@ -129,6 +130,8 @@ public class Crdn01Controller extends ApplicationController {
 		DataObject info = crdn01Service.getCivilComplaintReceiptInitialDataInfo(req);
 
 		mav.addObject("crdnInfo", json ? info : toJson(info));
+
+		mav.addObject("openerPageName", request.getParameter("openerPageName"));
 		return mav;
 	}
 
@@ -183,6 +186,23 @@ public class Crdn01Controller extends ApplicationController {
 			.addObject("saved", saved);
 	}
 
+	/**지정한 민원자료를 저장한다.
+	 * @param crdnId 단속대장 아이디
+	 * @return jsonView
+	 * <pre><code> {
+	 *     "affected": 저장된 정보수
+	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
+	 * }</code></pre>
+	 */
+	@RequestMapping(name="민원자료 저장", value="/020/save.do")
+	public ModelAndView saveCivilComplaint(Crdn crdn, MultipartFile[] newFileList, MultipartFile[] modifyFileList) {
+
+		boolean saved = true;// TODO : crdn01Service.saveCivilComplaint
+
+		return new ModelAndView("jsonView")
+			.addObject("saved", saved);
+	}
+
 	/** 민원내역 원본을 한글 파일로 작성한다.
 	 * @return hwp파일
 	 */
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 180bbc25..75269d3a 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
@@ -121,14 +121,14 @@ public class Crdn05Controller extends ApplicationController {
 	 * }</code></pre>
 	 */
 	@PostMapping(name="단속자료 수기 등록", value="/030/create.do")
-	public ModelAndView createCrdnDataByManual(Crdn crdn, MultipartFile[] uploadFileList) {
+	public ModelAndView createCrdnDataByManual(Crdn crdn, MultipartFile[] newFileList) {
 		boolean saved = false;
 
 		crdn.setCrdnRegSeCd("01");
 		crdn.setCrdnInptSeCd("03");//TODO : 사용자 기관의 시청,구청 구분
 
-		if(uploadFileList != null) {
-			List<FileInfo> fileInfoList = new FileInfoFactory().makeFileInfos(null, uploadFileList);
+		if(newFileList != null) {
+			List<FileInfo> fileInfoList = new FileInfoFactory().makeFileInfos(null, newFileList);
 			saved = crdn05Service.create(crdn, fileInfoList);
 		} else {
 			saved = crdn05Service.create(crdn);
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
index 7dd61604..02482bb2 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
@@ -296,7 +296,10 @@ $(document).ready(function(){
 		
 		ajax.get({
 			url : $P.crdnControl.urls.getInfo,
-			data : {"crdnId" : dataKey},
+			data : { 
+				"crdnId" : dataKey, 
+				"openerPageName" : "${pageName}" 
+			},
 			success : resp => {	
 				dialog.open({
 					id : dialogId,
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
index 6511f94f..39808873 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
@@ -253,7 +253,7 @@
 				<div class="col-md-6">
 					<div class="row justify-content-end">
 						<div class="col-sm-3">
-							<button type="button" id="btnInst--${pageName}" class="btn btn-primary">등록</button>
+							<button type="button" id="btnInst--${pageName}" class="btn btn-primary">저장</button>
 						</div>
 					</div>
 				</div>
@@ -263,7 +263,8 @@
 	</div>
 	<div class="card" style="width:500px;">
 		<form id="frmFile--${pageName}" method="post" enctype="multipart/form-data">
-			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple accept="image/*" hidden />
+			<input type="file" id="newFileList--${pageName}" name="newFileList" multiple accept="image/*" hidden />
+			<input type="file" id="modifyFileList--${pageName}" name="modifyFileList" multiple accept="image/*" hidden />
 		</form>
 		
 		<div class="col-md-12 d-flex justify-content-between">
@@ -273,7 +274,7 @@
 				<button type="button" id="btnDeleteExistPhoto--${pageName}" class="btn btn-blue">선택 사진 삭제</button>
 			</div>
 		</div>
-		<div id="display0--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
+		<div id="displayForExist--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
 		</div>
 
 		<form id="frmUploadSet--${pageName}" method="post" enctype="multipart/form-data">
@@ -287,7 +288,7 @@
 				<button type="button" id="btnCancelAddFile--${pageName}" class="btn btn-blue">선택 사진 삭제</button>
 			</div>
 		</div>
-		<div id="display--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
+		<div id="displayForNew--${pageName}" style="overflow-y: scroll;min-height: 40px;max-height: 340px;border-style: solid;">
 		</div>
 
 		
@@ -305,6 +306,8 @@ $(document).ready(function(){
 
 	var $P = pageObject["${pageName}"];
 
+	$P.existFileArr = [];
+	
 	$P.captureFileArr = [];
 	$P.localUploadArr = [];
 	$P.numberPlateArr = [];
@@ -317,7 +320,7 @@ $(document).ready(function(){
 	$P.uploadSet = uploadSupport("#inputUploadSet--${pageName}");
 
 	$P.crdnControl = new DatasetControl({
-	    urls : { load : "", create : wctx.url("/${taskSeCd}/crdn/crdn01/020/save.do") },
+	    urls : { load : "", update : wctx.url("/${taskSeCd}/crdn/crdn01/020/save.do") },
 	    keymapper:info => info ? info.CRDN_ID : "",
 	    dataGetter:obj => obj.crdnInfo,
 	    formats: {
@@ -337,21 +340,31 @@ $(document).ready(function(){
 		    formData.append(key,value);
 		}
 		
-		if(formData.get("uploadFileList").size == 0){
-			formData.delete("uploadFileList");
-		}
+		formData.delete("newFileList");
+		formData.delete("modifyFileList");
 		
 		if($P.localUploadArr.length > 0){
-			$P.localUploadArr.forEach(item => formData.append("uploadFileList",item));
+			$P.localUploadArr.forEach(item => formData.append("newFileList",item));
 		}
 		if($P.numberPlateArr.length > 0){
-			$P.numberPlateArr.forEach(item => formData.append("uploadFileList",item));
+			$P.numberPlateArr.forEach(item => formData.append("newFileList",item));
 		}
 		if($P.captureFileArr.length > 0){
-			$P.captureFileArr.forEach(item => formData.append("uploadFileList",item));
+			$P.captureFileArr.forEach(item => formData.append("newFileList",item));
 		}
 		
-		//TODO : 편집된 파일, 삭제 사진 키값
+
+		
+		if($P.existFileArr.length > 0){
+			for(var i=0; i < $P.existFileArr.length; i++){
+				if($P.existFileArr[i].status == "delete"){
+					formData.append("deleteFileKeyList", $P.existFileArr[i].FILE_ID);
+				} else if($P.existFileArr[i].status == "modified"){
+					formData.append("modifyFileKeyList", $P.existFileArr[i].FILE_ID);
+					formData.append("modifyFileList", $P.existFileArr[i]);
+				}
+			}
+		}
 		
 		ajax.post({
 			url:!create ? $P.crdnControl.urls.update : $P.crdnControl.urls.create,
@@ -371,14 +384,14 @@ $(document).ready(function(){
 		var files = $P.uploadSet.getDataset();
 		files.forEach(item => $P.localUploadArr.push(item));
 		
-		$P.fnDisplay(); 
+		$P.fnDisplay(false); 
 	};
 	$P.uploadSet.onRemove = () => { };
 
 	$P.crdnControl.onSave = (resp) => {
 		if (resp.saved) {
 			dialog.alert("저장됐습니다.");
-			dialog.close("manualdialog");
+			dialog.close("cvlcptInitialDataEditDialog--${openerPageName}");
 		}
 	};
 	/**************************************************************************
@@ -387,9 +400,13 @@ $(document).ready(function(){
 	$P.fnMakeImgForExistFile = (fileArr) => {
 		var tagsText = "";
 		
-		for(var index = 0; index < fileArr.length; index++){
+		for(var index = 0, j = 0; index < fileArr.length; index++){
 			var item = fileArr[index];
 			
+			if(item.status == "delete"){
+				continue;
+			}
+			
 			tagsText += "<label class='mx-2'>";
 			tagsText += "<input type='radio' name='existPhoto' class='form-check-input' value='"+item.FILE_ID +"' ";
 			if(index == 0){
@@ -399,9 +416,11 @@ $(document).ready(function(){
 			tagsText += "<img src='"+ item.URL +"' width='200' height='200' />";
 			tagsText += "</label>";
 				
-			if(index % 2 == 1){
-				tagsText += "<br />"
+			if(j % 2 == 1){
+				tagsText += "<br />";
 			}
+			
+			j++;
 		}
 
 		return tagsText;
@@ -421,19 +440,31 @@ $(document).ready(function(){
 			tagsText += "</label>";
 				
 			if(index % 2 == 1){
-				tagsText += "<br />"
+				tagsText += "<br />";
 			}
 		}
 
 		return tagsText;
 	}
 	 
-	$P.fnDisplay = () => {
-		var displayArea = document.querySelector("#display--${pageName}");
-				
-		var concatArr = $P.localUploadArr.concat($P.numberPlateArr).concat($P.captureFileArr);
-		var tagsText = $P.fnMakeImgForNewFile(concatArr);
-		displayArea.innerHTML = tagsText;
+	$P.fnDisplay = (isExist) => {
+		if(isExist){
+			var displayArea = document.querySelector("#displayForExist--${pageName}");
+			var tagsText = $P.fnMakeImgForExistFile($P.existFileArr);
+			
+			if(tagsText == ""){
+				displayArea.innerHTML = "등록된 사진이 없습니다.";
+				$("#btnEditPhoto--crdn01020-info").hide();
+			} else {
+				displayArea.innerHTML = tagsText;
+				$("#btnEditPhoto--crdn01020-info").show();
+			}
+		} else {
+			var displayArea = document.querySelector("#displayForNew--${pageName}");		
+			var concatArr = $P.localUploadArr.concat($P.numberPlateArr).concat($P.captureFileArr);
+			var tagsText = $P.fnMakeImgForNewFile(concatArr);
+			displayArea.innerHTML = tagsText;
+		}
 	};
 
 	$P.fnSave = () => {
@@ -471,7 +502,7 @@ $(document).ready(function(){
 				file.url = (window.URL || window.webkitURL).createObjectURL(file);
 				$P.captureFileArr.push(file);
 				if(index === array.length - 1){ 
-					$P.fnDisplay();
+					$P.fnDisplay(false);
 				}
 			});
 		});
@@ -485,14 +516,19 @@ $(document).ready(function(){
 		
 		if(isNumberPlate){
 			$P.numberPlateArr.push(modifiedFile);
-			$P.fnDisplay();
+			$P.fnDisplay(false);
 		} else {
-			// TODO : 편집된사진 표시
-		}
-
-		console.log(originalFileInfo);
-
+			$P.existFileArr.forEach(function(item,index){
+				if(item.FILE_ID == originalFileInfo.FILE_ID){
+					modifiedFile.URL = modifiedFile.url;
+					modifiedFile.FILE_ID = originalFileInfo.FILE_ID;
+					modifiedFile.status = "modified";
+					$P.existFileArr.splice(index, 1, modifiedFile);
+				};
+			});
 		
+			$P.fnDisplay(true);
+		}	
 	}
 	/**************************************************************************
 	 * element.on
@@ -511,7 +547,7 @@ $(document).ready(function(){
 		);
 	});
 	$("#btnEditPhoto--${pageName}").on('click', () => {
-		var checked = $("#display0--${pageName}").find("[name='existPhoto']:checked");
+		var checked = $("#displayForExist--${pageName}").find("[name='existPhoto']:checked");
 		if(checked.length < 1){
 			alert("선택된 사진이 없습니다.");
 			return;
@@ -526,11 +562,26 @@ $(document).ready(function(){
 	});
 
 	$("#btnDeleteExistPhoto--${pageName}").on('click', () => {
-		//기 등록 사진 삭제
+		
+		var checked = $("#displayForExist--${pageName}").find("[name='existPhoto']:checked");
+		if(checked.length < 1){
+			alert("선택된 사진이 없습니다.");
+			return;
+		}
+		
+		var target = checked[0].value;
+		
+		$P.existFileArr.forEach(function(item){
+			if(item.FILE_ID == target){
+				item.status = "delete";
+			}
+		});
+		
+		$P.fnDisplay(true);
 	});
 	
 	$("#btnCancelAddFile--${pageName}").on('click', () => {
-		var checked = $("#display--${pageName}").find("[name='newPhoto']:checked");
+		var checked = $("#displayForNew--${pageName}").find("[name='newPhoto']:checked");
 		if(checked.length < 1){
 			alert("선택된 사진이 없습니다.");
 			return;
@@ -545,7 +596,7 @@ $(document).ready(function(){
 		$P.localUploadArr = $P.localUploadArr.filter(item => checkedArr.indexOf(item.id) == -1);
 		$P.numberPlateArr = $P.numberPlateArr.filter(item => checkedArr.indexOf(item.id) == -1);
 
-		$P.fnDisplay();
+		$P.fnDisplay(false);
 	});
 	
 	/**************************************************************************
@@ -585,7 +636,9 @@ $(document).ready(function(){
 	
 	//보안모드
     fn_securityModeToggle($("#securityMode--top").is(":checked"));
-
+    
+	
+    
 	var crdnInfo = ${crdnInfo};
 	crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN);
 	$P.crdnControl.setData([crdnInfo]);
@@ -595,14 +648,13 @@ $(document).ready(function(){
 	}
 	
 	if(crdnInfo.fileList){
-		var tagsText = $P.fnMakeImgForExistFile(crdnInfo.fileList);
-		$("#display0--${pageName}").append(tagsText);
-	} else {
-		
-		$("#display0--${pageName}").append("등록된 사진이 없습니다.");
-		$("#btnEditPhoto--crdn01020-info").hide();
-		
+		crdnInfo.fileList.forEach(function(item){
+			item.status = "";
+			$P.existFileArr.push(item);
+		});	
 	}
+	
+	$P.fnDisplay(true);
 });
 
 
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 aa641cae..4cdee8dc 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
@@ -237,7 +237,7 @@
 	</div>
 	<div class="card" style="width:400px;">
 		<form id="frmFile--${pageName}" method="post" enctype="multipart/form-data">
-			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple accept="image/*" hidden />
+			<input type="file" id="newFileList--${pageName}" name="newFileList" multiple accept="image/*" hidden />
 		</form>
 		
 		<form id="frmUploadSet--${pageName}" method="post" enctype="multipart/form-data">
@@ -297,16 +297,14 @@ $(document).ready(function(){
 		    formData.append(key,value);
 		}
 		
-		if(formData.get("uploadFileList").size == 0){
-			formData.delete("uploadFileList");
-		}
-		
+		formData.delete("newFileList");
+
 		if($P.localUploadArr.length > 0){
-			$P.localUploadArr.forEach(item => formData.append("uploadFileList",item));
+			$P.localUploadArr.forEach(item => formData.append("newFileList",item));
 		}
 		
 		if($P.captureFileArr.length > 0){
-			$P.captureFileArr.forEach(item => formData.append("uploadFileList",item));
+			$P.captureFileArr.forEach(item => formData.append("newFileList",item));
 		}
 		
 		ajax.post({
@@ -349,7 +347,7 @@ $(document).ready(function(){
 			tagsText += "</label>";
 				
 			if(index % 2 == 1){
-				tagsText += "<br />"
+				tagsText += "<br />";
 			}
 		}
 
diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp
index ae1b0735..a09921ec 100644
--- a/src/main/webapp/WEB-INF/jsp/include/top.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp
@@ -40,7 +40,7 @@
         </label>
       </div>
       <button type="button" class="btn btn-outline-dark">
-        민원관리
+        종합민원관리
       </button>
       <button type="button" class="btn btn-outline-dark">
         일정관리

From 2b3887564f3e12e176ba24fb1424e6c0f647c0c0 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 1 Aug 2023 17:06:00 +0900
Subject: [PATCH 15/20] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=82=AC=EC=A7=84=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cokr/xit/fims/crdn/Crdn.java    |  5 +++
 .../cokr/xit/fims/crdn/dao/Crdn01Mapper.java  |  6 ++++
 .../cokr/xit/fims/crdn/dao/Crdn06Mapper.java  |  7 ++++
 .../crdn/service/bean/Crdn01ServiceBean.java  | 33 +++++++++++++++++++
 .../fims/crdn/service/bean/Crdn06Bean.java    |  2 +-
 .../xit/fims/crdn/web/Crdn01Controller.java   | 33 ++++++++++++++++++-
 .../sql/mapper/fims/crdn/crdn06-mapper.xml    | 10 +++++-
 .../WEB-INF/jsp/fims/crdn/crdn01020-info.jsp  |  4 +--
 8 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java
index 65f5825f..a3e6093d 100644
--- a/src/main/java/cokr/xit/fims/crdn/Crdn.java
+++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java
@@ -22,6 +22,11 @@ public class Crdn extends AbstractEntity {
 	 */
 	private String[] deleteFileKeyList;
 
+	/**
+	 * 파일 변경 건수
+	 */
+	private int fileChgCnt;
+
 	/**
 	 * 수정 처리할 정보
 	 */
diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java
index b9369a1b..c27b3161 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java
@@ -69,4 +69,10 @@ public interface Crdn01Mapper extends AbstractMapper {
 	 */
 	DataObject selectCivilComplaintReceiptInitialDataInfo(CrdnQuery req);
 
+	/** 민원접수 초기자료를 수정한다. TODO : mybatis작성
+	 * @param crdn 민원정보
+	 * @return 저장된 정보 수
+	 */
+	int saveCivilComplaint(Crdn crdn);
+
 }
diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java
index 55cf9e03..f0090458 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java
@@ -66,5 +66,12 @@ public interface Crdn06Mapper extends AbstractMapper {
 
 	List<DataObject> selectCrackdowns(CrdnQuery req);
 
+	/**단속정보를 변경한다.<br />
+	 * {@link cokr.xit.fims.crdn.service.bean.Crdn06Bean#update(Crdn)} 참고
+	 * @param crdn 단속정보
+	 * @return 저장된 정보수
+	 */
+	int update(Crdn crdn);
+
 
 }
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
index adc457b3..5b736b2d 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
@@ -12,8 +12,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.servlet.ModelAndView;
 
+import cokr.xit.base.file.FileInfo;
 import cokr.xit.base.file.service.FileQuery;
 import cokr.xit.base.file.service.FileService;
+import cokr.xit.base.file.service.bean.FileBean;
 import cokr.xit.fims.cmmn.CmmnUtil;
 import cokr.xit.fims.cmmn.hwp.AddingParagraphBetweenHWPFile;
 import cokr.xit.fims.cmmn.hwp.InsertingImageCell;
@@ -40,10 +42,16 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic
 	@Resource(name="crdn01Mapper")
 	protected Crdn01Mapper crdn01Mapper;
 
+	@Resource(name="fileBean")
+	private FileBean fileBean;
+
 	/** 민원관리 Bean */
 	@Resource(name="crdn01Bean")
 	protected Crdn01Bean crdn01Bean;
 
+	@Resource(name="crdn06Bean")
+	protected Crdn06Bean crdn06Bean;
+
 	@Override
 	public List<DataObject> getCrackdownList(CrdnQuery req) {
 
@@ -200,6 +208,31 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic
 		return dataObject;
 	}
 
+	public boolean saveCivilComplaint(Crdn crdn, List<FileInfo> newFileInfoList) {
+
+		int fileInsertEffected = 0;
+		int fileDeleteEffected = 0;
+
+		if(newFileInfoList != null && !newFileInfoList.isEmpty()) {
+			fileInsertEffected = fileBean.create(newFileInfoList);
+		}
+
+		if(crdn.getDeleteFileKeyList() != null) {
+			fileDeleteEffected = fileBean.remove(crdn.getDeleteFileKeyList());
+		}
+
+		crdn.setFileChgCnt(fileInsertEffected - fileDeleteEffected);
+
+		return saveCivilComplaint(crdn);
+
+	}
+
+	public boolean saveCivilComplaint(Crdn crdn) {
+		//TODO : crdn01Mapper.saveCivilComplaint(crdn);
+
+		return crdn06Bean.update(crdn);
+	}
+
 
 
 }
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java
index 8a1b8ebb..699de2b1 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java
@@ -29,7 +29,7 @@ public class Crdn06Bean extends AbstractComponent {
 			case "tagInformationUndefinedData":
 				return crdn06Mapper.updateTagInformation(crdn) == 1 ? true : false;
 			default:
-				return false; //crdn06Mapper.update(crdn);
+				return crdn06Mapper.update(crdn) == 1 ? true : false;
 		}
 	}
 
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
index d0e4c4f9..988dd5ea 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
@@ -1,7 +1,9 @@
 package cokr.xit.fims.crdn.web;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -11,6 +13,9 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.file.FileInfo;
+import cokr.xit.base.file.FileInfo.Relation;
+import cokr.xit.base.file.web.FileInfoFactory;
 import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
@@ -197,7 +202,33 @@ public class Crdn01Controller extends ApplicationController {
 	@RequestMapping(name="민원자료 저장", value="/020/save.do")
 	public ModelAndView saveCivilComplaint(Crdn crdn, MultipartFile[] newFileList, MultipartFile[] modifyFileList) {
 
-		boolean saved = true;// TODO : crdn01Service.saveCivilComplaint
+		boolean saved = false;
+
+		List<FileInfo> newFileInfoList = new ArrayList<FileInfo>();
+		if(newFileList != null || modifyFileList != null) {
+
+			Relation relation = new Relation();
+			relation.setInfoType(crdn.INF_TYPE);
+			relation.setInfoKey(crdn.getCrdnId());
+
+			if(newFileList != null) {
+				newFileInfoList = new FileInfoFactory().makeFileInfos(relation, newFileList);
+			}
+			if(modifyFileList != null) {
+				newFileInfoList.addAll(new FileInfoFactory().makeFileInfos(relation, modifyFileList));
+
+				if(crdn.getDeleteFileKeyList() == null) {
+					crdn.setDeleteFileKeyList(crdn.getModifyFileKeyList());
+				} else {
+					String[] arr1 = crdn.getDeleteFileKeyList();
+					String[] arr2 = crdn.getModifyFileKeyList();
+			        String[] sumArr = Stream.of(arr1, arr2).flatMap(Stream::of).toArray(String[]::new);
+			        crdn.setDeleteFileKeyList(sumArr);
+				}
+			}
+		}
+
+		saved = crdn01Service.saveCivilComplaint(crdn, newFileInfoList);
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index 7ffa445f..6dbd61e6 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -461,6 +461,14 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 	<include refid="selectCrackdown"/>
 </select>
 
-
+<update id="update" parameterType="cokr.xit.fims.crdn.Crdn">
+    /* 단속정보 수정(crdn06Mapper.update) */
+    UPDATE TB_CRDN
+       SET ATCH_FILE_CNT = ATCH_FILE_CNT + (#{fileChgCnt})
+       <!-- TODO : 컬럼 추가 -->
+         , MDFCN_DT = <include refid="utility.now" /> /* 수정일시 */
+         , MDFR = #{modifiedBy}                   /* 수정자 */
+     WHERE CRDN_ID = #{crdnId}                   /* 단속 ID */
+</update>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
index 39808873..1fe6e236 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
@@ -36,11 +36,11 @@
 		            	placeholder="시:분:초" />
 				</div>
 				<div class="col-md-4">
-					<label for="vhrno--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end required">
+					<label for="vhrno--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">
 						차량번호
 					</label>
 					<input type="text" id="vhrno--${pageName}" name="vhrno" data-map="VHRNO" class="form-control" 
-						data-maxlengthb="30" required />
+						data-maxlengthb="30" />
 				</div>
 				<div class="col-md-6">
 					<label for="vltnCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">

From cfa42eb9cccfeccef2fe11e08daba47c4ca97609 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 1 Aug 2023 18:03:45 +0900
Subject: [PATCH 16/20] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=9E=90=EB=A3=8C?=
 =?UTF-8?q?=EA=B2=80=EC=82=AC=20=ED=99=94=EB=A9=B4=20=EB=8F=99=EC=A0=81=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/mapper/fims/crdn/crdn06-mapper.xml    | 41 +++++++++-
 .../WEB-INF/jsp/fims/crdn/crdn02010-main.jsp  |  2 +-
 .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp  | 76 +++++++++++++------
 3 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index 6dbd61e6..ecfcfbcd 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -274,7 +274,24 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
     </if>
 </if>
 <if test="by != null and by != '' and term != null">
-
+	<choose>
+		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
+			<include refid="dynamicSearch.start" />
+			<choose>
+				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+				<when test="by == 'vhrno'">C.VHRNO</when>
+				<when test="by == 'crdnStdgNm'">C.CRDN_STDG_NM</when>
+				<when test="by == 'crdnPlc'">C.CRDN_PLC</when>
+				<when test="by == 'atchFileCnt'">C.ATCH_FILE_CNT</when>
+				<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
+				<when test="by == 'ffnlgAmt'">C.FFNLG_AMT</when>
+				<when test="by == 'crdnInptSeCd'">C.CRDN_INPT_SE_CD</when>
+			</choose>
+			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
+		</when>
+		<otherwise>
+		</otherwise>
+	</choose>
 </if>
 
 <include refid="utility.orderBy" />
@@ -296,6 +313,8 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST        <!-- 단속 ID -->
      </choose>
      , COUNT(*) AS CRDN_CNT                           <!-- 단속건수 -->
   FROM TB_CRDN C
+  LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID)
+  LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID)
  WHERE C.DEL_YN = 'N'
    AND C.TASK_SE_CD = #{taskSeCd}
    AND C.VHRNO != ''
@@ -310,7 +329,25 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST        <!-- 단속 ID -->
 <if test="vhrno != null">AND C.VHRNO = #{vhrno}</if>
 <if test="schExclEnd == 'on'">AND C.CRDN_STTS_CD != '81'</if>
 <if test="by != null and by != '' and term != null">
-
+	<choose>
+		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
+			<include refid="dynamicSearch.start" />
+			<choose>
+				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+				<when test="by == 'crdnInptSeCd'">C.CRDN_INPT_SE_CD</when>
+				<when test="by == 'teamNm'">TI.TEAM_NM</when>
+				<when test="by == 'vhrno'">C.VHRNO</when>
+				<when test="by == 'crdnStdgNm'">C.CRDN_STDG_NM</when>
+				<when test="by == 'crdnPlc'">C.CRDN_PLC</when>
+				<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
+				<when test="by == 'ffnlgAmt'">C.FFNLG_AMT</when>
+				<when test="by == 'rtpyrNm'">P.RTPYR_NM</when>
+			</choose>
+			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
+		</when>
+		<otherwise>
+		</otherwise>
+	</choose>
 </if>
 GROUP BY C.VHRNO<if test="schOnlySamePlace == 'on'">, C.CRDN_STDG_NM </if>
 HAVING COUNT(*) <![CDATA[ >= ]]>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
index 2c48c413..9d4eec97 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
@@ -1,3 +1,3 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
-<c:set var="pageKorName" scope="request">민원(새올) 개별 등록</c:set>
\ No newline at end of file
+<c:set var="pageKorName" scope="request">민원 개별 등록</c:set>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 8a3e3be6..00282104 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -103,6 +103,8 @@
 				            	<div class="col-6">
 				            		<input type="hidden" id="by--${pageName}" name="by" />
 									<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
+									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
+									<input type="hidden" id="subOption--${pageName}" name="subOption" />
 									<input type="text" id="term--${pageName}" name="term" class="form-control" />
 				            	</div>
 					            <div class="col-6">
@@ -165,20 +167,30 @@
 								<table id="photoInspection_Table_0--${pageName}"
 									class="datatables-ajax table table-bordered dataTable no-footer">
 									<thead>
-										<tr>
+										<tr data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
+											data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 											<th style="min-width: 80px;">No.</th>
-											<th style="min-width: 160px;">단속일시</th>
-											<th style="min-width: 80px;">차량번호</th>
-											<th style="min-width: 80px;">위반건수</th>
+											<th onclick="searchFromGridTitle('CRDN_YMD','단속일자','ymd','');"
+											style="min-width: 160px;">단속일시</th>
+											<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
+											style="min-width: 80px;">차량번호</th>
+											<th style="min-width: 80px;" class="text-orange">위반건수</th>
 											<th style="min-width: 80px;" class="text-orange">검사결과</th>
 											<th style="min-width: 250px;" class="text-orange">처리방법</th>
-											<th style="min-width: 80px;">위반동</th>
-											<th style="min-width: 300px;">위반장소</th>
-											<th style="min-width: 80px;">사진매수</th>
-											<th style="min-width: 80px;">처리상태</th>
-											<th style="min-width: 80px;">원금액</th>
-											<th style="min-width: 80px;">감경금액</th>
-											<th style="min-width: 80px;">자료출처</th>
+											<th onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText,'match','perfect');"
+											style="min-width: 80px;">위반동</th>
+											<th onclick="searchFromGridTitle('CRDN_PLC',this.innerText,'match','part');"
+											style="min-width: 300px;">위반장소</th>
+											<th onclick="searchFromGridTitle('ATCH_FILE_CNT',this.innerText,'match','perfect');"
+											style="min-width: 80px;">사진매수</th>
+											<th onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');"
+											style="min-width: 80px;">처리상태</th>
+											<th onclick="searchFromGridTitle('FFNLG_AMT',this.innerText,'match','perfect');"
+											style="min-width: 80px;">원금액</th>
+											<th onclick="searchFromGridTitle('UNKNOWN',this.innerText,'match','perfect');"
+											style="min-width: 80px;">감경금액</th>
+											<th onclick="searchFromGridTitle('CRDN_INPT_SE_CD',this.innerText,'codeValue','FIM003');"
+											style="min-width: 80px;">자료출처</th>
 										</tr>
 				                    </thead>
 				                    <tbody id="photoInspectionTbody--${pageName}"></tbody>
@@ -233,10 +245,14 @@
 									<table id="sameVehicleInspectionMain_Table_0--${pageName}"
 										class="datatables-ajax table table-bordered dataTable no-footer">
 										<thead>
-											<tr>
-												<th>차량번호</th>
-												<th>단속동</th>
-												<th>단속건수</th>
+											<tr data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
+												data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
+												<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
+												>차량번호</th>
+												<th onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText,'match','perfect');"
+												>단속동</th>
+												<th class="text-orange"
+												>단속건수</th>
 											</tr>
 					                    </thead>
 					                    <tbody id="sameVehicleInspectionMainTbody--${pageName}"></tbody>
@@ -264,16 +280,26 @@
 									<table id="sameVehicleInspectionSub_Table_0--${pageName}"
 										class="datatables-ajax table table-bordered dataTable no-footer">
 										<thead>
-											<tr>
-												<th>단속일시</th>
-												<th>자료출처</th>
-												<th>단속조</th>
-												<th>차량번호</th>
-												<th>단속동</th>
-												<th>단속장소</th>
-												<th>처리상태</th>
-												<th>금액</th>
-												<th>성명</th>
+											<tr data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
+												data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
+												<th onclick="searchFromGridTitle('CRDN_YMD','단속일자','ymd','');"
+												>단속일시</th>
+												<th onclick="searchFromGridTitle('CRDN_INPT_SE_CD',this.innerText,'codeValue','FIM003');"
+												>자료출처</th>
+												<th onclick="searchFromGridTitle('TEAM_NM',this.innerText,'match','perfect');"
+												>단속조</th>
+												<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
+												>차량번호</th>
+												<th onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText,'match','perfect');"
+												>단속동</th>
+												<th onclick="searchFromGridTitle('CRDN_PLC',this.innerText,'match','part');"
+												>단속장소</th>
+												<th onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');"
+												>처리상태</th>
+												<th onclick="searchFromGridTitle('FFNLG_AMT',this.innerText,'match','perfect');"
+												>금액</th>
+												<th onclick="searchFromGridTitle('RTPYR_NM',this.innerText,'match','part');"
+												>성명</th>
 												<th class="privacy">주민번호(전체)</th>
 												<th class="privacy-mask">주민번호(마스크)</th>
 											</tr>

From 4964e183e658f137235999264254cd203cc664d5 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Tue, 1 Aug 2023 18:45:10 +0900
Subject: [PATCH 17/20] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=97=B0=EA=B3=84?=
 =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/intf-conf/file-job.conf         | 12 ++++++------
 src/main/resources/spring/context-scheduler.xml    |  8 ++++----
 src/main/resources/sql/mapper/base/file-mapper.xml | 13 +++++++------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/intf-conf/file-job.conf b/src/main/resources/intf-conf/file-job.conf
index 74d978c2..65338bfc 100644
--- a/src/main/resources/intf-conf/file-job.conf
+++ b/src/main/resources/intf-conf/file-job.conf
@@ -1,11 +1,11 @@
 {
 	"dirs": {
-		"receive": "C:\\workspace\\ESB_AGENT\\RCV",         /* 수신 파일 최상위 디렉토리 */
-		"send": "C:\\workspace\\ESB_AGENT\\SND",            /* 전송 파일 최상위 디렉토리 */
+		"receive": "files/ESB_AGENT/RCV",         /* 수신 파일 최상위 디렉토리 */
+		"send": "files/ESB_AGENT/SND",            /* 전송 파일 최상위 디렉토리 */
 
-		"working": "C:\\workspace\\xit\\filesite\\work",    /* 파일 작업 최상위 디렉토리 */
-		"success": "C:\\workspace\\xit\\filesite\\success", /* 작업 완료한 파일의 최상위 디렉토리 */
-		"fail": "C:\\workspace\\xit\\filesite\\fail"        /* 작업 실패한 파일의 최상위 디렉토리 */
+		"working": "files/interface/work",    /* 파일 작업 최상위 디렉토리 */
+		"success": "files/interface/success", /* 작업 완료한 파일의 최상위 디렉토리 */
+		"fail": "files/interface/fail"        /* 작업 실패한 파일의 최상위 디렉토리 */
 	},
 
 	"dirCodes": {
@@ -40,7 +40,7 @@
 			"rceptId": "40219",  /* 접수우체국 국기호 */
 			"expiryDays": 10,    /* 배달 만료 일수 */
 			
-			"attachmentDir": "C:\\workspace\\xit\\filesite\\attachment\\epost", /* 원본 첨부파일 디렉토리 경로 */
+			"attachmentDir": "files/interface/attachment/epost", /* 원본 첨부파일 디렉토리 경로 */
 			"txtFilename": "POSDF5$send_{yyyyMMddHHmmssSSS}.txt",
 			"zipFilename": "POSDF5${conKey}.zip"
 		},
diff --git a/src/main/resources/spring/context-scheduler.xml b/src/main/resources/spring/context-scheduler.xml
index 321a181c..ad5f2fc0 100644
--- a/src/main/resources/spring/context-scheduler.xml
+++ b/src/main/resources/spring/context-scheduler.xml
@@ -15,7 +15,7 @@
 	</bean>
 	<bean id="smgReceiverTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="smgReceiver" />
-		<property name="cronExpression" value="0 0/10 * * * ?" /> <!-- 10분마다 -->
+		<property name="cronExpression" value="0 0/1 * * * ?" /> <!-- 1분마다 -->
 	</bean>
 
 	<!-- 국민신문고 민원답변 전송 -->
@@ -25,7 +25,7 @@
 	</bean>
 	<bean id="smgSenderTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="smgSender" />
-		<property name="cronExpression" value="0 0/10 * * * ?" /> <!-- 10분마다 -->
+		<property name="cronExpression" value="0 0/1 * * * ?" /> <!-- 1분마다 -->
 	</bean>
 
 	<!-- epost 전자우편 신청 전송 -->
@@ -35,7 +35,7 @@
 	</bean>
 	<bean id="epostSenderTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="epostSender" />
-		<property name="cronExpression" value="0 0/10 0 * * ?" /> <!-- 10분마다 -->
+		<property name="cronExpression" value="0 0/1 0 * * ?" /> <!-- 1분마다 -->
 	</bean>
 
 	<!-- epost 전자우편 결과 수신 -->
@@ -45,7 +45,7 @@
 	</bean>
 	<bean id="epostReceiverTrigger"  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="epostReceiver" />
-		<property name="cronExpression" value="0 30 0 * * ?" /> <!-- 매일 00:30 -->
+		<property name="cronExpression" value="0 30 6 * * ?" /> <!-- 매일 06:30 -->
 		<!-- property name="cronExpression" value="0 0/1 0 * * ?" /> <1분마다 -->
 	</bean>
 
diff --git a/src/main/resources/sql/mapper/base/file-mapper.xml b/src/main/resources/sql/mapper/base/file-mapper.xml
index 01066d19..55f5dc6b 100644
--- a/src/main/resources/sql/mapper/base/file-mapper.xml
+++ b/src/main/resources/sql/mapper/base/file-mapper.xml
@@ -22,12 +22,13 @@
 <sql id="fileDirs">SELECT INF_TYPE
      , CONCAT('files/', DIR, DATE_FORMAT(CURRENT_DATE, '/%Y/%m/%d/')) DIR
   FROM (
-	   SELECT '010' INF_TYPE, 'smg' DIR UNION       <!-- 국민 신문고 -->
-	   SELECT '020' INF_TYPE, 'saeol' DIR UNION     <!-- 세올 -->
-	   SELECT '030' INF_TYPE, 'epost' DIR UNION     <!-- epost -->
-	   SELECT '100' INF_TYPE, 'violation' DIR UNION <!-- 단속 정보 -->
-	   SELECT '110' INF_TYPE, 'opinion' DIR UNION   <!-- 의견 진술 -->
-	   SELECT '190' INF_TYPE, 'capture' DIR         <!-- 캡쳐용 동영상 -->
+	   SELECT '010' INF_TYPE, 'interface/attachment/smg' DIR UNION       <!-- 국민 신문고 -->
+	   SELECT '020' INF_TYPE, 'interface/attachment/saeol' DIR UNION     <!-- 세올 -->
+	   SELECT '030' INF_TYPE, 'interface/attachment/epost' DIR UNION     <!-- epost -->
+
+	   SELECT '100' INF_TYPE, 'attachment/violation' DIR UNION <!-- 단속 정보 -->
+	   SELECT '110' INF_TYPE, 'attachment/opinion' DIR UNION   <!-- 의견 진술 -->
+	   SELECT '190' INF_TYPE, 'attachment/capture' DIR         <!-- 캡쳐용 동영상 -->
        ) FILE_DIRS</sql>
 
 <sql id="selectFiles">

From 15de49ca58b72929f83676c799e42c18a4ae4ea1 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 2 Aug 2023 10:58:08 +0900
Subject: [PATCH 18/20] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EB=8F=99=EC=98=81?=
 =?UTF-8?q?=EC=83=81=ED=8C=8C=EC=9D=BC=20inf=5Ftype,=20inf=5Fkey=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/crdn/CrdnQuery.java    |  6 +-
 .../crdn/service/bean/Crdn01ServiceBean.java  | 44 +++++++++---
 src/main/java/cokr/xit/fims/sprt/Sprt.java    |  4 ++
 .../xit/fims/sprt/service/Sprt03Service.java  | 18 +++++
 .../sprt/service/bean/Sprt03ServiceBean.java  | 67 +++++++++++++++++++
 .../xit/fims/sprt/web/Sprt03Controller.java   | 25 ++-----
 .../sql/mapper/fims/crdn/crdn01-mapper.xml    |  2 +
 7 files changed, 133 insertions(+), 33 deletions(-)
 create mode 100644 src/main/java/cokr/xit/fims/sprt/service/Sprt03Service.java
 create mode 100644 src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java

diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
index a30198f3..4276d2f2 100644
--- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
+++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
@@ -16,19 +16,17 @@ public class CrdnQuery extends CmmnQuery {
 
 	private static final long serialVersionUID = 1L;
 
-
 	private String view;
 	private String grid;
+	private String inspectionDataType;
 
 	private String currentUserId;
 	private String currentInstitute;
-	private String inspectionDataType;
+
 	private String crdnId;
 	private String[] crdnIDs;
 
-
 	private String vhrno;
-
 	private String cvlcptPrcsPicNm;
 	private String schCvlcptRcptYmdFrom;
 	private String schCvlcptRcptYmdTo;
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
index 5b736b2d..afb4b984 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
@@ -5,9 +5,11 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import org.assertj.core.util.Arrays;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.servlet.ModelAndView;
@@ -23,6 +25,7 @@ import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.dao.Crdn01Mapper;
 import cokr.xit.fims.crdn.service.CrdnService;
+import cokr.xit.fims.sprt.Sprt;
 import cokr.xit.foundation.component.AbstractServiceBean;
 import cokr.xit.foundation.data.DataObject;
 import kr.dogfoot.hwplib.object.HWPFile;
@@ -146,6 +149,10 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic
 
 				List<DataObject> fileInfoList = fileService.getFileList(fileQuery);
 
+				fileInfoList = fileInfoList.stream()
+						.filter(fileInfo -> fileInfo.string("MIME_TYPE").startsWith("image"))
+						.collect(Collectors.toList());
+
 				if(fileInfoList != null && fileInfoList.size() > 0) {
 					int photoCnt = fileInfoList.size();
 					int PHOTO_COUNT_PER_PAGE = 4;
@@ -185,24 +192,41 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic
 	}
 
 	public DataObject getCivilComplaintReceiptInitialDataInfo(CrdnQuery req) {
+
+		//민원조회
 		DataObject dataObject = crdn01Mapper.selectCivilComplaintReceiptInitialDataInfo(req);
 
+		//첨부파일 조회
 		FileQuery fileQuery = new FileQuery();
-		fileQuery.setInfoKeys(dataObject.string("CRDN_ID"));
-		fileQuery.setInfoType("190");
+		fileQuery.setInfoType(Crdn.INF_TYPE);
 		List<DataObject> fileList = fileService.getFileList(fileQuery);
 		if(fileList != null && !fileList.isEmpty()) {
-			dataObject.set("videoExist", "Y");
-		} else {
-			dataObject.set("videoExist", "N");
+			dataObject.set("fileList", fileList);
 		}
 
+		//동영상 존재 여부 확인
+		dataObject.set("videoExist", "N");
+		String linkTblNm = dataObject.string("LINK_TBL_NM");
+		if(!linkTblNm.equals("")) {
+
+			if(linkTblNm.equals("TB_ESB_INTERFACE")) {
+				fileQuery.setInfoType("010");
+			} else if(linkTblNm.equals("TB_SAEOL")) {
+				fileQuery.setInfoType("020");
+			} else {
+				throw new RuntimeException("파일 조회 중 오류가 발생하였습니다.");
+			}
 
-		fileQuery.setInfoType(Crdn.INF_TYPE);
-		fileList = fileService.getFileList(fileQuery);
-
-		if(fileList != null && !fileList.isEmpty()) {
-			dataObject.set("fileList", fileList);
+			fileQuery.setInfoKeys(dataObject.string("LINK_ID"));
+			List<DataObject> linkFileList = fileService.getFileList(fileQuery);
+			if(linkFileList != null && !linkFileList.isEmpty()) {
+				for(int i=0; i < linkFileList.size(); i++) {
+					String mimeType = linkFileList.get(i).string("MIME_TYPE");
+					if(Arrays.asList(Sprt.VIDEO_MIME_TYPE).contains(mimeType)) {
+						dataObject.set("videoExist", "Y");
+					}
+				}
+			}
 		}
 
 		return dataObject;
diff --git a/src/main/java/cokr/xit/fims/sprt/Sprt.java b/src/main/java/cokr/xit/fims/sprt/Sprt.java
index 851c9315..289a4665 100644
--- a/src/main/java/cokr/xit/fims/sprt/Sprt.java
+++ b/src/main/java/cokr/xit/fims/sprt/Sprt.java
@@ -11,4 +11,8 @@ import lombok.Setter;
 @Setter
 public class Sprt extends AbstractEntity {
 
+	public static String[] VIDEO_MIME_TYPE = {
+		"video/mp4", "video/webm", "video/ogg"
+	};
+
 }
diff --git a/src/main/java/cokr/xit/fims/sprt/service/Sprt03Service.java b/src/main/java/cokr/xit/fims/sprt/service/Sprt03Service.java
new file mode 100644
index 00000000..d870f173
--- /dev/null
+++ b/src/main/java/cokr/xit/fims/sprt/service/Sprt03Service.java
@@ -0,0 +1,18 @@
+package cokr.xit.fims.sprt.service;
+
+import cokr.xit.foundation.data.DataObject;
+
+/**미디어 업무지원 서비스를 제공한다.
+ * <ul><li>{@link #getVideoInfo(SprtQuery) 동영상 정보 조회}</li>
+ * </ul>
+ * @author leebj
+ */
+public interface Sprt03Service {
+
+	/**지정하는 단속아이디의 동영상 정보를 반환한다.
+	 * @param crdnId 단속 아이디
+	 * @return 동영상 정보
+	 */
+	DataObject getVideoInfo(String crdnId);
+
+}
diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java
new file mode 100644
index 00000000..1fb08c41
--- /dev/null
+++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java
@@ -0,0 +1,67 @@
+package cokr.xit.fims.sprt.service.bean;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.assertj.core.util.Arrays;
+import org.springframework.stereotype.Service;
+
+import cokr.xit.base.file.service.FileQuery;
+import cokr.xit.base.file.service.FileService;
+import cokr.xit.fims.crdn.CrdnQuery;
+import cokr.xit.fims.crdn.dao.Crdn01Mapper;
+import cokr.xit.fims.sprt.Sprt;
+import cokr.xit.fims.sprt.service.Sprt03Service;
+import cokr.xit.foundation.component.AbstractServiceBean;
+import cokr.xit.foundation.data.DataObject;
+
+/**미디어 업무지원 서비스 인터페이스의 구현체
+ * @author leebj
+ */
+@Service("sprt03Service")
+public class Sprt03ServiceBean extends AbstractServiceBean implements Sprt03Service {
+
+	@Resource(name = "crdn01Mapper")
+	private Crdn01Mapper crdn01Mapper;
+
+	@Resource(name="fileService")
+	FileService fileService;
+
+	@Override
+	public DataObject getVideoInfo(String crdnId) {
+		DataObject fileInfo = new DataObject();
+
+		CrdnQuery crdnQuery = new CrdnQuery();
+		crdnQuery.setCrdnId(crdnId);
+		DataObject cvlcptInfo = crdn01Mapper.selectCivilComplaintReceiptInitialDataInfo(crdnQuery);
+		String linkTblNm = cvlcptInfo.string("LINK_TBL_NM");
+		if(!linkTblNm.equals("")) {
+			FileQuery fileQuery = new FileQuery();
+
+			if(linkTblNm.equals("TB_ESB_INTERFACE")) {
+				fileQuery.setInfoType("010");
+			} else if(linkTblNm.equals("TB_SAEOL")) {
+				fileQuery.setInfoType("020");
+			} else {
+				throw new RuntimeException("파일 조회 중 오류가 발생하였습니다.");
+			}
+			fileQuery.setInfoKeys(cvlcptInfo.string("LINK_ID"));
+
+			List<DataObject> fileList = fileService.getFileList(fileQuery);
+			if(fileList != null && !fileList.isEmpty()) {
+				for(int i=0; i < fileList.size() ;i++) {
+					DataObject file = fileList.get(i);
+					String mimeType = file.string("MIME_TYPE");
+					if(Arrays.asList(Sprt.VIDEO_MIME_TYPE).contains(mimeType)){
+						fileInfo = file;
+						break;
+					}
+				}
+			}
+		}
+
+		return fileInfo;
+	}
+
+}
diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java
index dcf8e851..025cfc15 100644
--- a/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java
+++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java
@@ -4,12 +4,12 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
-import org.assertj.core.util.Arrays;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.file.service.FileQuery;
 import cokr.xit.base.file.service.FileService;
 import cokr.xit.base.web.ApplicationController;
+import cokr.xit.fims.sprt.service.Sprt03Service;
 import cokr.xit.foundation.data.DataObject;
 
 public class Sprt03Controller extends ApplicationController {
@@ -17,10 +17,8 @@ public class Sprt03Controller extends ApplicationController {
 	@Resource(name="fileService")
 	FileService fileService;
 
-	public String VIDEO_INF_TYPE = "190";
-	public String[] VIDEO_MIME_TYPE = {
-		"video/mp4", "video/webm", "video/ogg"
-	};
+	@Resource(name="sprt03Service")
+	Sprt03Service sprt03Service;
 
 	/** 동영상 재생 메인화면을 연다.
 	 * @return fims/sprt/sprt03010-main
@@ -33,20 +31,9 @@ public class Sprt03Controller extends ApplicationController {
 
 		if(crdnId != null && !crdnId.equals("")) {
 			mav.addObject("crdnId", crdnId);
-
-			FileQuery fileQuery = new FileQuery();
-			fileQuery.setInfoKeys(crdnId);
-			fileQuery.setInfoType(VIDEO_INF_TYPE);
-			List<DataObject> fileList = fileService.getFileList(fileQuery);
-			if(fileList != null && !fileList.isEmpty()) {
-				for(int i=0; i < fileList.size() ;i++) {
-					DataObject file = fileList.get(i);
-					String mimeType = file.string("MIME_TYPE");
-					if(Arrays.asList(VIDEO_MIME_TYPE).contains(mimeType)){
-						mav.addObject("fileInfo", toJson(file));
-						break;
-					}
-				}
+			DataObject file = sprt03Service.getVideoInfo(crdnId);
+			if(!file.isEmpty()) {
+				mav.addObject("fileInfo", toJson(file));
 			}
 		}
 
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
index 8926ddd2..b0d63895 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
@@ -350,6 +350,8 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
      , C.VHCL_COLOR             <!-- 차량색상 -->
      , C.USE_FUEL_CD            <!-- 사용 연료 코드 -->
      , C.VIN                    <!-- 차대번호 -->
+     , C.LINK_TBL_NM           <!-- 연계 테이블 명 -->
+     , C.LINK_ID               <!-- 연계 아이디 -->
   FROM TB_CRDN C
   INNER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID AND CC.DEL_YN = 'N')
   LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID)

From 8b71650c2dfee5180a0b23f08a1bdceb2a584fbe Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 2 Aug 2023 11:25:01 +0900
Subject: [PATCH 19/20] =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
index afb4b984..9f0bcb4a 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java
@@ -199,6 +199,7 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic
 		//첨부파일 조회
 		FileQuery fileQuery = new FileQuery();
 		fileQuery.setInfoType(Crdn.INF_TYPE);
+		fileQuery.setInfoKeys(req.getCrdnId());
 		List<DataObject> fileList = fileService.getFileList(fileQuery);
 		if(fileList != null && !fileList.isEmpty()) {
 			dataObject.set("fileList", fileList);

From 9f222420f746ce407a383c148cebf2d6b9b86f02 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 2 Aug 2023 13:22:58 +0900
Subject: [PATCH 20/20] =?UTF-8?q?1.=20=EC=83=81=EC=84=B8=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=20=EC=95=84=EC=9D=B4=EC=BD=98=20=ED=86=A0?=
 =?UTF-8?q?=EA=B8=80=20=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80=202.=20?=
 =?UTF-8?q?=EC=B9=B4=EB=A9=9C=ED=91=9C=EA=B8=B0=EB=B2=95->=EC=BC=80?=
 =?UTF-8?q?=EB=B0=A5=ED=91=9C=EA=B8=B0=EB=B2=95=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/crdn/CrdnQuery.java    | 29 +++++++++++++------
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  |  3 +-
 .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp  |  3 +-
 src/main/webapp/WEB-INF/jsp/include/tail.jsp  |  2 +-
 .../js/fims/framework/cmm/cmmUtil.js          |  8 +++++
 ...initDatepicker.js => initAfterPageLoad.js} | 13 ++++++++-
 6 files changed, 45 insertions(+), 13 deletions(-)
 rename src/main/webapp/resources/js/fims/framework/cmm/{initDatepicker.js => initAfterPageLoad.js} (54%)

diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
index 4276d2f2..5bc7a1e5 100644
--- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
+++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
@@ -16,38 +16,49 @@ public class CrdnQuery extends CmmnQuery {
 
 	private static final long serialVersionUID = 1L;
 
+	//조회유형
 	private String view;
 	private String grid;
 	private String inspectionDataType;
 
+	//현재정보
 	private String currentUserId;
 	private String currentInstitute;
 
+	//ID
 	private String crdnId;
 	private String[] crdnIDs;
+	private String amtDcsnCdGroupId;
+	private String dtlAmtDcsnCdGroupId;
 
-	private String vhrno;
-	private String cvlcptPrcsPicNm;
+	//날짜
+	private String aplcnYmd;
 	private String schCvlcptRcptYmdFrom;
 	private String schCvlcptRcptYmdTo;
 	private String schRductYmdFrom;
 	private String schRductYmdTo;
 	private String schCrdnYmdFrom;
 	private String schCrdnYmdTo;
+
+	//from, to
 	private Integer schCrdnCntFrom;
 	private Integer schCrdnCntTo;
+
+	//코드
+	private String amtDcsnCd;
+	private String dtlAmtDcsnCd;
+	private String crdnInptSeCd;
+	private String cvlcptPrcsCd;
+
+	//포함, 제외, 특정 자료
 	private String schOnlySamePlace;
 	private String schOnlyUnpay;
 	private String schExclEnd;
 	private String schExclTimeout;
-	private String crdnInptSeCd;
-	private String cvlcptPrcsCd;
 
-	private String aplcnYmd;
-	private String amtDcsnCdGroupId;
-	private String amtDcsnCd;
-	private String dtlAmtDcsnCdGroupId;
-	private String dtlAmtDcsnCd;
+	//기타
+	private String vhrno;
+	private String cvlcptPrcsPicNm;
 
 	public String getView() {
 		return ifEmpty(view, () -> null);
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
index 4d094f2f..87a834a9 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
@@ -392,7 +392,8 @@ $(document).ready(function(){
 	 * 초기화
 	 **************************************************************************/
     initDatepicker("frmSearch--${pageName}"); //달력 초기화
-
+    initDetailSearchButton("frmSearch--${pageName}");
+    
     var defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val();
 	$("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked",true);
 	$P.fnResetAndChangeBiz(defaultBizValue);
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 00282104..996611ca 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -717,7 +717,8 @@ $(document).ready(function(){
 	 * 초기화
 	 **************************************************************************/
     initDatepicker("frmSearch--${pageName}"); //달력 초기화
-
+    initDetailSearchButton("frmSearch--${pageName}");
+    
     var defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val();
 	$("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked",true);
 	$P.fnResetAndChangeBiz(defaultBizValue);
diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
index 8a744695..129609e7 100644
--- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
@@ -51,7 +51,7 @@
 
 <!-- 데이트픽커 -->
 <script src="<c:url value="/resources/lib/fims/framework/datepicker/datepicker.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/fims/framework/cmm/initDatepicker.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/js/fims/framework/cmm/initAfterPageLoad.js?${ver}"/>"></script>
 <!-- 검색 유틸 -->
 <script src="<c:url value="/resources/js/fims/framework/cmm/searchUtil.js"/>?${ver}"></script>
 
diff --git a/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js b/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js
index 14a65c4c..8b68f242 100644
--- a/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js
+++ b/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js
@@ -262,3 +262,11 @@ function snakeToCamel(text){
 	}
 	return text;
 }
+
+/**
+ * 카멜 표기법을 케밥 표기법으로 변경한다.
+ * @return 치환된 문자열
+ */
+function camelToKebab(text){
+	return text.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+}
diff --git a/src/main/webapp/resources/js/fims/framework/cmm/initDatepicker.js b/src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js
similarity index 54%
rename from src/main/webapp/resources/js/fims/framework/cmm/initDatepicker.js
rename to src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js
index e2b550a4..8259e0b1 100644
--- a/src/main/webapp/resources/js/fims/framework/cmm/initDatepicker.js
+++ b/src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js
@@ -14,4 +14,15 @@ function initDatepicker(elementId){
     });
 
 }
-	
\ No newline at end of file
+
+function initDetailSearchButton(elementId){
+	
+	var executionArea = $("#"+elementId);
+	
+	/*--------------------- 상세검색 버튼 제어  ---------------------*/
+    executionArea.find(".btn-open-detail").on("click", function() {
+        $(this).find('i').toggleClass('bx-chevron-down');
+        $(this).find('i').toggleClass('bx-chevron-up');
+    });
+
+}
\ No newline at end of file