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) { - -

사건기록 열람·발급

+
+

기록발급