diff --git a/pom.xml b/pom.xml index 4b9a8ac..f42151c 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ - 5.3.20 - 4.1.0 + 5.3.27 + 4.2.0 @@ -71,15 +71,15 @@ ${org.egovframe.rte.version} - org.egovframe.rte - org.egovframe.rte.fdl.crypto - ${org.egovframe.rte.version} - + org.egovframe.rte + org.egovframe.rte.fdl.crypto + ${org.egovframe.rte.version} + javax.servlet javax.servlet-api - 3.1.0 + 4.0.1 provided @@ -122,13 +122,14 @@ org.apache.commons commons-compress - 1.21 + 1.23.0 org.hsqldb hsqldb - 2.5.2 + 2.7.2 + jdk8 @@ -136,10 +137,9 @@ mysql mysql-connector-java - 8.0.29 + 8.0.33 - - com.googlecode.log4jdbc log4jdbc @@ -205,8 +204,20 @@ com.ibm.icu icu4j - 71.1 + 73.2 + + + org.eclipse + yasson + 1.0.2 + + + org.glassfish + javax.json + 1.1.3 + + @@ -215,26 +226,24 @@ sht_webapp - + org.codehaus.cargo cargo-maven3-plugin - 1.9.13 + 1.10.7 tomcat8x embedded - - 8080 - + org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 1.8 1.8 @@ -266,7 +275,7 @@ org.hsqldb hsqldb - 2.5.2 + 2.7.2 @@ -280,7 +289,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.17.0 + 3.21.0 @@ -289,7 +298,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.1.2 true once @@ -312,7 +321,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.5.0 @@ -322,7 +331,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.3.0 + 3.4.4 sunlink diff --git a/src/main/java/egovframework/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/egovframework/let/cop/bbs/web/EgovBBSManageController.java index b8cd3f5..0bb40c0 100644 --- a/src/main/java/egovframework/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/egovframework/let/cop/bbs/web/EgovBBSManageController.java @@ -134,7 +134,7 @@ public String selectBoardArticles(HttpSession session, @RequestParam(value="menuNo", required=false) String menuNo, @ModelAttribute("searchVO") BoardVO boardVO, ModelMap model) throws Exception { - + // 선택된 메뉴정보를 세션으로 등록한다. if (menuNo!=null && !menuNo.equals("")){ session.setAttribute("menuNo",menuNo); diff --git a/src/main/java/egovframework/let/cop/smt/sim/web/EgovIndvdlSchdulManageController.java b/src/main/java/egovframework/let/cop/smt/sim/web/EgovIndvdlSchdulManageController.java index 3136058..a5a49e5 100644 --- a/src/main/java/egovframework/let/cop/smt/sim/web/EgovIndvdlSchdulManageController.java +++ b/src/main/java/egovframework/let/cop/smt/sim/web/EgovIndvdlSchdulManageController.java @@ -88,11 +88,18 @@ public class EgovIndvdlSchdulManageController { */ @RequestMapping(value="/cop/smt/sim/EgovIndvdlSchdulManageDailyList.do") public String EgovIndvdlSchdulManageDailyList( + HttpSession session, + @RequestParam(value="menuNo", required=false) String menuNo, @ModelAttribute("searchVO") ComDefaultVO searchVO, @RequestParam Map commandMap, IndvdlSchdulManageVO indvdlSchdulManageVO, ModelMap model) throws Exception { + + // 선택된 메뉴정보를 세션으로 등록한다. + if (menuNo!=null && !menuNo.equals("")){ + session.setAttribute("menuNo",menuNo); + } //일정구분 검색 유지 model.addAttribute("searchKeyword", commandMap.get("searchKeyword") == null ? "" : (String)commandMap.get("searchKeyword")); @@ -151,11 +158,18 @@ public String EgovIndvdlSchdulManageDailyList( */ @RequestMapping(value="/cop/smt/sim/EgovIndvdlSchdulManageWeekList.do") public String EgovIndvdlSchdulManageWeekList( + HttpSession session, + @RequestParam(value="menuNo", required=false) String menuNo, @ModelAttribute("searchVO") ComDefaultVO searchVO, @RequestParam Map commandMap, IndvdlSchdulManageVO indvdlSchdulManageVO, ModelMap model) throws Exception { + + // 선택된 메뉴정보를 세션으로 등록한다. + if (menuNo!=null && !menuNo.equals("")){ + session.setAttribute("menuNo",menuNo); + } //일정구분 검색 유지 model.addAttribute("searchKeyword", commandMap.get("searchKeyword") == null ? "" : (String)commandMap.get("searchKeyword")); diff --git a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_altibase.xml b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_altibase.xml index 22e2b4a..a6f9561 100644 --- a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_altibase.xml +++ b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_altibase.xml @@ -90,7 +90,8 @@ A.FRST_REGISTER_ID, A.LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, - A.REPTIT_SE_CODE + A.REPTIT_SE_CODE, + (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) USER_NM FROM LETTNSCHDULINFO A WHERE 1=1 AND A.SCHDUL_KND_CODE = '2' @@ -108,9 +109,9 @@ AND ( - ( SUBSTR(A.SCHDUL_BEGINDE,1,8) > #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) + ( SUBSTR(A.SCHDUL_BEGINDE,1,8) >= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) OR - ( SUBSTR(A.SCHDUL_ENDDE,1,8) > #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) + ( SUBSTR(A.SCHDUL_ENDDE,1,8) >= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) ) diff --git a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_cubrid.xml b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_cubrid.xml index d5923f4..b47643a 100644 --- a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_cubrid.xml +++ b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_cubrid.xml @@ -90,7 +90,8 @@ A.FRST_REGISTER_ID, A.LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, - A.REPTIT_SE_CODE + A.REPTIT_SE_CODE, + (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) USER_NM FROM LETTNSCHDULINFO A WHERE 1=1 AND A.SCHDUL_KND_CODE = '2' @@ -108,9 +109,9 @@ AND ( - ( SUBSTR(A.SCHDUL_BEGINDE,1,8) > #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) + ( SUBSTR(A.SCHDUL_BEGINDE,1,8) >= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) OR - ( SUBSTR(A.SCHDUL_ENDDE,1,8) > #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) + ( SUBSTR(A.SCHDUL_ENDDE,1,8) >= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) ) @@ -124,7 +125,7 @@ - AND #{searchCondition} LIKE '%' || #{searchKeyword} || '%' + AND SCHDUL_SE LIKE CONCAT(CONCAT('%', #{searchKeyword}), '%') diff --git a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_hsql.xml b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_hsql.xml index dccad79..690c427 100644 --- a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_hsql.xml +++ b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_hsql.xml @@ -46,7 +46,7 @@ A.ATCH_FILE_ID, TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + TO_CHAR(A.LAST_UPDT_PNTTM, 'YYYY-MM-DD') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, A.REPTIT_SE_CODE FROM LETTNSCHDULINFO A @@ -82,11 +82,12 @@ A.SCHDUL_IPCR_CODE, A.SCHDUL_CHARGER_ID, A.ATCH_FILE_ID, - A.FRST_REGIST_PNTTM, + TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + TO_CHAR(A.LAST_UPDT_PNTTM, 'YYYY-MM-DD') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, - A.REPTIT_SE_CODE + A.REPTIT_SE_CODE, + (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) USER_NM FROM LETTNSCHDULINFO A WHERE 1=1 AND A.SCHDUL_KND_CODE = '2' @@ -104,9 +105,9 @@ AND ( - ( SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) > #{schdulBgnde} AND SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) <= #{schdulEndde}) + ( SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) >= #{schdulBgnde} AND SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) <= #{schdulEndde}) OR - ( SUBSTRING(TO_CHAR(A.SCHDUL_ENDDE, 'YYYYMMDD'),1,8) > #{schdulBgnde} AND SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) <= #{schdulEndde}) + ( SUBSTRING(TO_CHAR(A.SCHDUL_ENDDE, 'YYYYMMDD'),1,8) >= #{schdulBgnde} AND SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) <= #{schdulEndde}) ) @@ -145,9 +146,9 @@ (SELECT ESNTL_ID FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) SCHDUL_CHARGER_NAME, A.ATCH_FILE_ID, A.REPTIT_SE_CODE, - A.FRST_REGIST_PNTTM, + TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + TO_CHAR(A.LAST_UPDT_PNTTM, 'YYYY-MM-DD') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID FROM LETTNSCHDULINFO A WHERE 1=1 @@ -170,9 +171,9 @@ A.SCHDUL_IPCR_CODE, A.SCHDUL_CHARGER_ID, A.ATCH_FILE_ID, - A.FRST_REGIST_PNTTM, + TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + TO_CHAR(A.LAST_UPDT_PNTTM, 'YYYY-MM-DD') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, A.REPTIT_SE_CODE FROM LETTNSCHDULINFO A @@ -254,9 +255,9 @@ A.SCHDUL_CHARGER_ID, (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) SCHDUL_CHARGER_NAME, A.ATCH_FILE_ID, - A.FRST_REGIST_PNTTM, + TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + TO_CHAR(A.LAST_UPDT_PNTTM, 'YYYY-MM-DD') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, A.REPTIT_SE_CODE FROM LETTNSCHDULINFO A diff --git a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_mysql.xml b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_mysql.xml index f2865f7..1481267 100644 --- a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_mysql.xml +++ b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_mysql.xml @@ -82,11 +82,12 @@ A.SCHDUL_IPCR_CODE, A.SCHDUL_CHARGER_ID, A.ATCH_FILE_ID, - A.FRST_REGIST_PNTTM, + DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + DATE_FORMAT(A.LAST_UPDT_PNTTM, '%Y-%m-%d') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, - A.REPTIT_SE_CODE + A.REPTIT_SE_CODE, + (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) USER_NM FROM LETTNSCHDULINFO A WHERE 1=1 AND A.SCHDUL_KND_CODE = '2' @@ -104,9 +105,9 @@ AND ( - ( SUBSTRING(DATE_FORMAT(A.SCHDUL_BEGINDE,'%Y%m%d'),1,8) > #{schdulBgnde} AND SUBSTRING(DATE_FORMAT(A.SCHDUL_BEGINDE,'%Y%m%d'),1,8) <= #{schdulEndde}) + ( SUBSTRING(DATE_FORMAT(A.SCHDUL_BEGINDE,'%Y%m%d'),1,8) >= #{schdulBgnde} AND SUBSTRING(DATE_FORMAT(A.SCHDUL_BEGINDE,'%Y%m%d'),1,8) <= #{schdulEndde}) OR - ( SUBSTRING(DATE_FORMAT(A.SCHDUL_ENDDE,'%Y%m%d'),1,8) > #{schdulBgnde} AND SUBSTRING(DATE_FORMAT(A.SCHDUL_BEGINDE,'%Y%m%d'),1,8) <= #{schdulEndde}) + ( SUBSTRING(DATE_FORMAT(A.SCHDUL_ENDDE,'%Y%m%d'),1,8) >= #{schdulBgnde} AND SUBSTRING(DATE_FORMAT(A.SCHDUL_BEGINDE,'%Y%m%d'),1,8) <= #{schdulEndde}) ) @@ -145,9 +146,9 @@ (SELECT ESNTL_ID FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) SCHDUL_CHARGER_NAME, A.ATCH_FILE_ID, A.REPTIT_SE_CODE, - A.FRST_REGIST_PNTTM, + DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + DATE_FORMAT(A.LAST_UPDT_PNTTM, '%Y-%m-%d') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID FROM LETTNSCHDULINFO A WHERE 1=1 @@ -170,9 +171,9 @@ A.SCHDUL_IPCR_CODE, A.SCHDUL_CHARGER_ID, A.ATCH_FILE_ID, - A.FRST_REGIST_PNTTM, + DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + DATE_FORMAT(A.LAST_UPDT_PNTTM, '%Y-%m-%d') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, A.REPTIT_SE_CODE FROM LETTNSCHDULINFO A @@ -254,9 +255,9 @@ A.SCHDUL_CHARGER_ID, (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) SCHDUL_CHARGER_NAME, A.ATCH_FILE_ID, - A.FRST_REGIST_PNTTM, + DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, - A.LAST_UPDT_PNTTM, + DATE_FORMAT(A.LAST_UPDT_PNTTM, '%Y-%m-%d') LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, A.REPTIT_SE_CODE FROM LETTNSCHDULINFO A diff --git a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_oracle.xml b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_oracle.xml index 5456708..c8fffeb 100644 --- a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_oracle.xml +++ b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_oracle.xml @@ -90,7 +90,8 @@ A.FRST_REGISTER_ID, A.LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, - A.REPTIT_SE_CODE + A.REPTIT_SE_CODE, + (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) USER_NM FROM LETTNSCHDULINFO A WHERE 1=1 AND A.SCHDUL_KND_CODE = '2' @@ -108,9 +109,9 @@ AND ( - ( SUBSTR(A.SCHDUL_BEGINDE,1,8) > #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) + ( SUBSTR(A.SCHDUL_BEGINDE,1,8) >= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) OR - ( SUBSTR(A.SCHDUL_ENDDE,1,8) > #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) + ( SUBSTR(A.SCHDUL_ENDDE,1,8) >= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) ) diff --git a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_tibero.xml b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_tibero.xml index b6274d2..586924a 100644 --- a/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_tibero.xml +++ b/src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_tibero.xml @@ -90,7 +90,8 @@ A.FRST_REGISTER_ID, A.LAST_UPDT_PNTTM, A.LAST_UPDUSR_ID, - A.REPTIT_SE_CODE + A.REPTIT_SE_CODE, + (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.SCHDUL_CHARGER_ID) USER_NM FROM LETTNSCHDULINFO A WHERE 1=1 AND A.SCHDUL_KND_CODE = '2' @@ -108,9 +109,9 @@ AND ( - ( SUBSTR(A.SCHDUL_BEGINDE,1,8) > #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) + ( SUBSTR(A.SCHDUL_BEGINDE,1,8) >= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) OR - ( SUBSTR(A.SCHDUL_ENDDE,1,8) > #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) + ( SUBSTR(A.SCHDUL_ENDDE,1,8) >= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) <= #{schdulEndde}) ) diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 1be3796..af9db05 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,4 +1,5 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp index 51c0949..3b8f7a1 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp @@ -66,7 +66,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp index f4556c0..795f288 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp @@ -110,7 +110,7 @@

게시글쓰기

- + diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeUpdt.jsp index f1a442a..afd75e6 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeUpdt.jsp @@ -88,7 +88,7 @@
-
+
@@ -112,7 +112,7 @@

게시글 수정

- + diff --git a/src/main/webapp/WEB-INF/jsp/cop/com/EgovBoardUseInfList.jsp b/src/main/webapp/WEB-INF/jsp/cop/com/EgovBoardUseInfList.jsp index 5245172..d66b986 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/com/EgovBoardUseInfList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/com/EgovBoardUseInfList.jsp @@ -66,7 +66,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/cop/com/EgovBoardUseInfRegist.jsp b/src/main/webapp/WEB-INF/jsp/cop/com/EgovBoardUseInfRegist.jsp index fda3a1a..791ce71 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/com/EgovBoardUseInfRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/com/EgovBoardUseInfRegist.jsp @@ -122,7 +122,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/cop/com/EgovTemplateUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cop/com/EgovTemplateUpdt.jsp index 72078d5..a4df2bb 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/com/EgovTemplateUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/com/EgovTemplateUpdt.jsp @@ -87,7 +87,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/cop/smt/sim/EgovIndvdlSchdulManageDailyList.jsp b/src/main/webapp/WEB-INF/jsp/cop/smt/sim/EgovIndvdlSchdulManageDailyList.jsp index 210151e..325bcc0 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/smt/sim/EgovIndvdlSchdulManageDailyList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/smt/sim/EgovIndvdlSchdulManageDailyList.jsp @@ -277,7 +277,13 @@ int iEndDay = cal.getActualMaximum(java.util.Calendar.DAY_OF_MONTH); out.print((String)egovMap.get("schdulNm")); out.println(""); %> - + + <% + out.print(""); + out.print((String)egovMap.get("userNm")); + out.println(""); + %> + <% } diff --git a/src/main/webapp/WEB-INF/jsp/cop/smt/sim/EgovIndvdlSchdulManageWeekList.jsp b/src/main/webapp/WEB-INF/jsp/cop/smt/sim/EgovIndvdlSchdulManageWeekList.jsp index 4390723..7664803 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/smt/sim/EgovIndvdlSchdulManageWeekList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/smt/sim/EgovIndvdlSchdulManageWeekList.jsp @@ -330,7 +330,20 @@ arrDateTitle[6] = "토요일"; %> - + <% + if(listResult != null){ + for(int j=0;j < listResult.size(); j++){ + egovMap = (EgovMap)listResult.get(j); + int iBeginDate = Integer.parseInt(((String)egovMap.get("schdulBgnde")).substring(0, 8)); + int iBeginEnd = Integer.parseInt(((String)egovMap.get("schdulEndde")).substring(0, 8)); + if(iUseDate >= iBeginDate && iUseDate <= iBeginEnd){ + out.print(""); + out.print((String)egovMap.get("userNm")); + out.println("
"); + } + } + } + %> <% diff --git a/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp b/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp index 10bdf32..1abe299 100644 --- a/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp @@ -53,7 +53,7 @@
  • - +   reply arrow @@ -111,7 +111,7 @@
    -
      + diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp index 447756c..cc553a5 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp @@ -54,7 +54,7 @@ String menuNo = ((String)session.getAttribute("menuNo")!=null)?(String)session.g
    • 알림마당
    -
    자료올리기
    +
    자료올리기