Skip to content

Commit

Permalink
egovframe-simple-homepage-template v4.2.0 FINAL
Browse files Browse the repository at this point in the history
  • Loading branch information
@eGovFrameSupport
eGovFrameSupport committed Feb 28, 2024
1 parent a761731 commit 25432ca
Show file tree
Hide file tree
Showing 22 changed files with 125 additions and 76 deletions.
57 changes: 33 additions & 24 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</licenses>

<properties>
<spring.maven.artifact.version>5.3.20</spring.maven.artifact.version>
<org.egovframe.rte.version>4.1.0</org.egovframe.rte.version>
<spring.maven.artifact.version>5.3.27</spring.maven.artifact.version>
<org.egovframe.rte.version>4.2.0</org.egovframe.rte.version>
</properties>

<repositories>
Expand Down Expand Up @@ -71,15 +71,15 @@
<version>${org.egovframe.rte.version}</version>
</dependency>
<dependency>
<groupId>org.egovframe.rte</groupId>
<artifactId>org.egovframe.rte.fdl.crypto</artifactId>
<version>${org.egovframe.rte.version}</version>
</dependency>
<groupId>org.egovframe.rte</groupId>
<artifactId>org.egovframe.rte.fdl.crypto</artifactId>
<version>${org.egovframe.rte.version}</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -122,24 +122,24 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
<version>1.23.0</version>
</dependency>

<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.2</version>
<version>2.7.2</version>
<classifier>jdk8</classifier>
</dependency>

<!-- mysql driver -->

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.29</version>
<version>8.0.33</version>
</dependency>


<!-- oracle 10g driver -->
<!--
<dependency>
Expand Down Expand Up @@ -176,7 +176,6 @@
</dependency>
-->

<!-- log4jdbc driver -->
<dependency>
<groupId>com.googlecode.log4jdbc</groupId>
<artifactId>log4jdbc</artifactId>
Expand Down Expand Up @@ -205,8 +204,20 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>71.1</version>
<version>73.2</version>
</dependency>

<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.1.3</version>
</dependency>

</dependencies>

<build>
Expand All @@ -215,26 +226,24 @@
<finalName>sht_webapp</finalName>
<pluginManagement>
<plugins>
<plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
<version>1.9.13</version>
<version>1.10.7</version>
<configuration>
<container>
<containerId>tomcat8x</containerId>
<type>embedded</type>
</container>
<configuration>
<properties>
<cargo.servlet.port>8080</cargo.servlet.port>
</properties>
<property name="cargo.servlet.port" value="8080"/>
</configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down Expand Up @@ -266,7 +275,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.2</version>
<version>2.7.2</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -280,7 +289,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.17.0</version>
<version>3.21.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -289,7 +298,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.1.2</version>
<configuration>
<skipTests>true</skipTests>
<forkMode>once</forkMode>
Expand All @@ -312,7 +321,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
Expand All @@ -322,7 +331,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.4</version>
<reportSets>
<reportSet>
<id>sunlink</id>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/egovframework/let/cop/bbs/web/EgovBBSManageController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/egovframework/let/cop/smt/sim/web/EgovIndvdlSchdulManageController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <String, Object> 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"));
Expand Down Expand Up @@ -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 <String, Object> 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"));
Expand Down
7 changes: 4 additions & 3 deletions ...in/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_altibase.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -108,9 +109,9 @@
<if test="searchMode == &quot;WEEK&quot;">

AND (
( SUBSTR(A.SCHDUL_BEGINDE,1,8) &gt; #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) &lt;= #{schdulEndde})
( SUBSTR(A.SCHDUL_BEGINDE,1,8) &gt;= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) &lt;= #{schdulEndde})
OR
( SUBSTR(A.SCHDUL_ENDDE,1,8) &gt; #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) &lt;= #{schdulEndde})
( SUBSTR(A.SCHDUL_ENDDE,1,8) &gt;= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) &lt;= #{schdulEndde})
)

</if>
Expand Down
9 changes: 5 additions & 4 deletions ...main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_cubrid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -108,9 +109,9 @@
<if test="searchMode == &quot;WEEK&quot;">

AND (
( SUBSTR(A.SCHDUL_BEGINDE,1,8) &gt; #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) &lt;= #{schdulEndde})
( SUBSTR(A.SCHDUL_BEGINDE,1,8) &gt;= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) &lt;= #{schdulEndde})
OR
( SUBSTR(A.SCHDUL_ENDDE,1,8) &gt; #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) &lt;= #{schdulEndde})
( SUBSTR(A.SCHDUL_ENDDE,1,8) &gt;= #{schdulBgnde} AND SUBSTR(A.SCHDUL_BEGINDE,1,8) &lt;= #{schdulEndde})
)

</if>
Expand All @@ -124,7 +125,7 @@
<if test="searchKeyword != null and searchKeyword != ''">


AND #{searchCondition} LIKE '%' || #{searchKeyword} || '%'
AND SCHDUL_SE LIKE CONCAT(CONCAT('%', #{searchKeyword}), '%')


</if>
Expand Down
25 changes: 13 additions & 12 deletions src/main/resources/egovframework/mapper/let/cop/smt/sim/EgovIndvdlSchdulManage_SQL_hsql.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand All @@ -104,9 +105,9 @@
<if test="searchMode == &quot;WEEK&quot;">

AND (
( SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) &gt; #{schdulBgnde} AND SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) &lt;= #{schdulEndde})
( SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) &gt;= #{schdulBgnde} AND SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) &lt;= #{schdulEndde})
OR
( SUBSTRING(TO_CHAR(A.SCHDUL_ENDDE, 'YYYYMMDD'),1,8) &gt; #{schdulBgnde} AND SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) &lt;= #{schdulEndde})
( SUBSTRING(TO_CHAR(A.SCHDUL_ENDDE, 'YYYYMMDD'),1,8) &gt;= #{schdulBgnde} AND SUBSTRING(TO_CHAR(A.SCHDUL_BEGINDE, 'YYYYMMDD'),1,8) &lt;= #{schdulEndde})
)

</if>
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 25432ca

Please sign in to comment.