From d05cdf8de24c996ba3fe8e07e5c5bfd13bdb4d0c Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 20 Jun 2023 09:40:57 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=206.19?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95=EC=9A=94=EC=B2=AD=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EC=88=98=EC=A0=95=20=EC=A4=91=20=20=09-=20=09?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=9D=B8=20=ED=94=BC=EC=8B=A0=EC=B2=AD?= =?UTF-8?q?=EC=9D=B8=20=EB=B2=95=EC=9D=B8=20=EA=B0=9C=EC=9D=B8=EC=82=AC?= =?UTF-8?q?=EC=97=85=EC=9E=90=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=09=09?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EB=AA=A9=EB=A1=9D,=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D,=20=EC=8B=A0=EC=B2=AD=EC=84=9C=20=EB=8B=A8?= =?UTF-8?q?=EC=B2=B4=EB=AA=85=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/web/MainController.java | 4 ++- .../kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml | 15 ++++++++++- .../kccadr/adjReqMgr/adjReqMgrRegDetail.jsp | 23 +++++++++++++++- .../jsp/web/kccadr/adjstExp/mainExpPage.jsp | 10 +++---- .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 26 ++++++++++++++++--- 5 files changed, 66 insertions(+), 12 deletions(-) diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 8b619908..d2c91ae0 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -436,7 +436,9 @@ public class MainController { List vo = bbsMngService.selectMainBoardRecent(boardVO); //게시글 내용 html 태그 삭제 for(int i=0; i]*)?(\\s)*(/)?>", "").split("<")[0]); + System.out.println("before count "+ i + " :: " + vo.get(i).getNttCn()); +// vo.get(i).setNttCn(vo.get(i).getNttCn().replaceAll("<(/)?([a-zA-Z]*)(\\s[a-zA-Z]*=[^>]*)?(\\s)*(/)?>", "").split("<")[0]); + System.out.println("after count "+ i + " :: " + vo.get(i).getNttCn()); } model.addAttribute("bbsList", vo); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml index af5da6a9..afeb2f61 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml @@ -291,7 +291,20 @@ WHEN COUNT(*) 1 THEN GROUP_CONCAT(RPPL_NM SEPARATOR ',') ELSE RPPL_NM || '외' || (COUNT(*)-1) || '명' END RPPL_NMS - FROM ADR_RPPL S1 + FROM (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm + FROM ADR_RPPL ttt1 + ) + S1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND S1.RPPL_TY = '20' diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp index 2329395b..40cc4550 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp @@ -452,8 +452,29 @@

피신청인

- + + + + + + + + + + + + + + + +

피신청인 대표자명

+ + + + + +

주소

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp index 24e0a74f..5d1933f8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp @@ -104,12 +104,12 @@ function goExpPage(num) { frm.searchStatus.value = ''; } else if(num==4) - {// 열랍 발급 + {// 기록 열람 goUrl = ""; frm.searchStatus.value = 'C'; } else if(num==5) - {// 열랍 발급 + {// 조정결과 goUrl = ""; frm.searchStatus.value = 'C'; } @@ -231,7 +231,7 @@ function goExpPage(num) {

(정보입력, 불러오기, 제출하기 기능 제공)

- + @@ -268,8 +268,8 @@ function goExpPage(num) { - -

사건기록 열람·발급

+ +

기록발급

diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 898b3669..36ee054b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -1,6 +1,15 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%pageContext.setAttribute("crlf", "\r\n"); %> +<%pageContext.setAttribute("crlt", "<"); %> +<%pageContext.setAttribute("crgt", ">"); %> +<% + response.setHeader("Cache-Control","no-store"); + response.setHeader("Pragma","no-cache"); + response.setDateHeader("Expires",0); + if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); +%> @@ -178,8 +187,8 @@ function fn_egov_inqire_notice(bbsId, nttId) {

진행상황

 - -

열람·발급

+ +

기록발급

문의게시판

@@ -237,11 +246,20 @@ function fn_egov_inqire_notice(bbsId, nttId) {
  • ', '');">

    - · + + + · + + +

    -

    +<%--

    --%> +
    +<%--
    --%> + +