From 0e2c3f02195fbdb52d4a36083e51fe494309f1b5 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Sun, 5 Mar 2023 18:11:05 +0900 Subject: [PATCH 1/9] =?UTF-8?q?refactor:=20=ED=8C=8C=EC=9D=BC=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC=20-=20tiles=20=EC=84=A4=EC=A0=95=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=EC=A4=91=EB=B3=B5=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/framework/XitIncludeBase.jsp | 209 --------- .../jsp/framework/XitIncludeMenuPath.jsp | 24 -- .../framework/layouts/tiles/base/footer.jsp | 7 - .../framework/layouts/tiles/base/header.jsp | 400 ------------------ .../layouts/tiles/base/layout-tiles-base.jsp | 74 ---- .../jsp/framework/layouts/tiles/base/left.jsp | 68 --- .../WEB-INF/tiles/layout-tiles-defs.xml | 4 +- 7 files changed, 2 insertions(+), 784 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/jsp/framework/XitIncludeBase.jsp delete mode 100644 src/main/webapp/WEB-INF/jsp/framework/XitIncludeMenuPath.jsp delete mode 100644 src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/footer.jsp delete mode 100644 src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/header.jsp delete mode 100644 src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/layout-tiles-base.jsp delete mode 100644 src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/left.jsp diff --git a/src/main/webapp/WEB-INF/jsp/framework/XitIncludeBase.jsp b/src/main/webapp/WEB-INF/jsp/framework/XitIncludeBase.jsp deleted file mode 100644 index c6cecdb1..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/XitIncludeBase.jsp +++ /dev/null @@ -1,209 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - -<%-- --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - - - - - - - - - - -<%-- --%> - - - diff --git a/src/main/webapp/WEB-INF/jsp/framework/XitIncludeMenuPath.jsp b/src/main/webapp/WEB-INF/jsp/framework/XitIncludeMenuPath.jsp deleted file mode 100644 index f202c853..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/XitIncludeMenuPath.jsp +++ /dev/null @@ -1,24 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - -
-
-
    -
  • HOME
  • -
  • >
  • - - - - -
  • -
    - -
  • -
  • >
  • -
    -
    -
    -
-
-
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/footer.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/footer.jsp deleted file mode 100644 index 1513a309..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/footer.jsp +++ /dev/null @@ -1,7 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - -Copyright © 2002.02.02. XIT All rights reserved. - - 시스템문의 - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/header.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/header.jsp deleted file mode 100644 index 7a64d040..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/header.jsp +++ /dev/null @@ -1,400 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%String uri = request.getRequestURI();%> - - - - -
- -
-
- -
- - -
- <%--
" />
--%> - -
-
- -
-
    -
  • " />
  • -
- -
-
-
- -
- - -
- - - - - - -<%--
--%> -
-
-
- -
- - -<%-- 사이드메뉴 펼치기 --%> - 사이드메뉴 펼치기 -
-
- - - -
-

전체메뉴보기 전체메뉴 닫기

-
- -
-
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/layout-tiles-base.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/layout-tiles-base.jsp deleted file mode 100644 index 4e1790e2..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/layout-tiles-base.jsp +++ /dev/null @@ -1,74 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> - - -<%--<%@include file="/WEB-INF/jsp/framework/XitIncludeBase.jsp" %>--%> - - - - - - FIMS - <%@include file="/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp" %> - - - - - - - - - - - - - - - - - - -
- - - - - - -
- -<%-- --%> - -
-

${urlInfoMap.menuName}

- - <%@include file="/WEB-INF/jsp/framework/XitIncludeMenuPath.jsp" %> -
-
-
- -
-
-
- - - - - -
- - - - - diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/left.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/left.jsp deleted file mode 100644 index c0bec3d6..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/base/left.jsp +++ /dev/null @@ -1,68 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - - -
-
-
- -
- - 사이드메뉴 펼치기 -
-
- diff --git a/src/main/webapp/WEB-INF/tiles/layout-tiles-defs.xml b/src/main/webapp/WEB-INF/tiles/layout-tiles-defs.xml index 2b4d8476..6c286f57 100644 --- a/src/main/webapp/WEB-INF/tiles/layout-tiles-defs.xml +++ b/src/main/webapp/WEB-INF/tiles/layout-tiles-defs.xml @@ -20,12 +20,12 @@ - + From b229e835a87e5b832ee5357ba66052db61935407 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Sun, 5 Mar 2023 18:12:30 +0900 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=EC=8B=9C=EB=AF=BC=EC=8B=A0=EA=B3=A0?= =?UTF-8?q?=20=EB=8B=A8=EC=86=8D=ED=8C=8C=EC=9D=BC=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=8B=9C=20=EC=8B=9C=EB=AF=BC=EC=8B=A0=EA=B3=A0=20=EB=8B=A8?= =?UTF-8?q?=EC=9C=84=EB=A1=9C=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20loading=20?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml index 98b75a52..9e6b775c 100644 --- a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml @@ -463,11 +463,20 @@ -- 시민신고(국민신문고) - AND tcfm.file_job_id = (SELECT CONCAT(interface_seq_n, ctzn_sttemnt_detail_sn) - FROM tb_ec_ctzn_sttemnt_detail - WHERE reglt_id = #{regltId}) + AND tcfm.file_job_id LIKE (SELECT CONCAT(interface_seq_n, '%') + FROM tb_ec_ctzn_sttemnt_detail + WHERE reglt_id = #{regltId}) ORDER BY tcfd.orginl_file_nm + + + From c6c253a2b288f61059e5a50850724b32f85a49a2 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Sun, 5 Mar 2023 19:00:06 +0900 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=EB=8B=A8=EC=86=8D=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20>=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=20=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD=20=20=20=20?= =?UTF-8?q?=20=20=EB=8B=A8=EC=86=8D=EA=B4=80=EB=A6=AC=20>=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=EC=9E=90=EB=A3=8C=20=ED=8E=B8=EC=A7=91=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=9E=90=EB=A3=8C=ED=82=A4=EA=B0=92=20=ED=91=9C?= =?UTF-8?q?=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/cmm/cmm-fims-crackdown-mysql-mapper.xml | 2 +- .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 4 ++-- .../jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp | 12 +++++++++++- .../jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 3 ++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml index 8f46a801..ace66d2b 100644 --- a/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml @@ -116,7 +116,7 @@ AND trr.regist_se_code = #{registSeCode} - ORDER BY trr.sys_code, trr.reglt_se_code, trr.reglt_de, trr.vhcle_no, trr.reglt_begin_time + ORDER BY trr.sys_code, trr.reglt_se_code, teerc.extrl_reglt_cntc_id, tecsd.interface_seq_n, trr.reglt_de, trr.vhcle_no, trr.reglt_begin_time diff --git a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml index 9e6b775c..f92bbe83 100644 --- a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml @@ -462,8 +462,8 @@ WHERE reglt_id = #{regltId}) - -- 시민신고(국민신문고) - AND tcfm.file_job_id LIKE (SELECT CONCAT(interface_seq_n, '%') + -- 시민신고(국민신문고) : 초기자료 편집인 경우 시민신고 이미지 전체, 그외는 해당 차량 단속이미지만 선택 + AND tcfm.file_job_id LIKE (SELECT CONCAT(interface_seq_n, IF(#{regltProcessSttusCode} = '01', '%', ctzn_sttemnt_detail_sn)) FROM tb_ec_ctzn_sttemnt_detail WHERE reglt_id = #{regltId}) diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp index 6119375c..b74d3857 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp @@ -1,4 +1,4 @@ -<%-- +<%@ page import="kr.xit.fims.biz.FimsConst" %><%-- ================================================================================ File : /fims/biz/cmm/cmmCrackdownMgtPopup.jsp Name : 단속 데이타 처리 - 단속관리>단속현황관리 @@ -12,6 +12,7 @@ Date Author Description --%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%> +