Procházet zdrojové kódy

접근이력 7주일 디폴트 조회

huiwonseo před 4 roky
rodič
revize
fc5412ebbc

+ 11 - 0
src/main/java/com/lemon/lifecenter/common/LifeCenterFunction.java

@@ -188,6 +188,17 @@ public class LifeCenterFunction {
         return df.format( cal.getTime() );
     }
     
+    public static String getPrevNextDate( String ymd, int val ) throws ParseException {
+        DateFormat df = new SimpleDateFormat( "yyyy-MM-dd" );
+        Date date = df.parse( ymd );
+        
+        Calendar cal = Calendar.getInstance();
+        cal.setTime( date );
+        cal.add( Calendar.DATE, val );
+        
+        return df.format( cal.getTime() );
+    }
+    
     public static String getPrevDate( String ymd ) throws ParseException {
         DateFormat df = new SimpleDateFormat( "yyyy-MM-dd" );
         Date date = df.parse( ymd );

+ 12 - 0
src/main/java/com/lemon/lifecenter/controller/MenuAccessController.java

@@ -1,5 +1,6 @@
 package com.lemon.lifecenter.controller;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,6 +13,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.lemon.lifecenter.common.LifeCenterConfigVO;
 import com.lemon.lifecenter.common.LifeCenterController;
+import com.lemon.lifecenter.common.LifeCenterFunction;
 import com.lemon.lifecenter.common.LifeCenterPaging;
 import com.lemon.lifecenter.dto.RoleDTO;
 import com.lemon.lifecenter.service.RoleService;
@@ -29,6 +31,16 @@ public class MenuAccessController extends LifeCenterController {
     public ModelAndView list( @ModelAttribute("dto") final RoleDTO dto,
             @RequestParam(value="page", required=false, defaultValue="1") int page ) {
         
+        if( dto.getStartDate().equals( dto.getEndDate() ) && dto.getStartDate().equals( "" ) ) {
+            try {
+                dto.setStartDate( LifeCenterFunction.getPrevNextDate( LifeCenterFunction.getNow( "yyyy-MM-dd" ), -7 ) );
+                dto.setEndDate( LifeCenterFunction.getNow( "yyyy-MM-dd" ) );
+            } catch (ParseException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+        
         dto.setLimit( ( Integer.valueOf( page ) - 1 ) * config.pageDataSize );
         dto.setLimitMax( config.pageDataSize );
         

+ 4 - 4
src/main/resources/application.properties

@@ -6,8 +6,8 @@ spring.mvc.view.suffix=.jsp
 #spring.datasource.url=jdbc:cubrid:localhost:30000:LIFE_CENTER:::?charset=UTF-8
 spring.datasource.driver-class-name=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #spring.datasource.url=jdbc:log4jdbc:cubrid:61.97.184.187:30000:LIFE_CENTER:::?charset=UTF-8
-spring.datasource.url=jdbc:log4jdbc:cubrid:118.67.133.187:30000:LIFE_CENTER:::?charset=UTF-8
-#spring.datasource.url=jdbc:log4jdbc:cubrid:localhost:30000:LIFE_CENTER:::?charset=UTF-8
+#spring.datasource.url=jdbc:log4jdbc:cubrid:118.67.133.187:30000:LIFE_CENTER:::?charset=UTF-8
+spring.datasource.url=jdbc:log4jdbc:cubrid:localhost:30000:LIFE_CENTER:::?charset=UTF-8
 #spring.datasource.driver-class-name=cubrid.jdbc.driver.CUBRIDDriver
 #spring.datasource.url=jdbc:cubrid:10.175.153.104:30000:LIFE_CENTER:::?altHosts=10.175.153.105:30000&charset=UTF-8
 #
@@ -16,8 +16,8 @@ mybatis.config-location=classpath:mybatis-config.xml
 
 
 
-spring.datasource.username=dba
-spring.datasource.password=#zo240s!
+spring.datasource.username=hcms
+spring.datasource.password=@Aser()02@#
 spring.datasource.sql-script-encoding=UTF-8
 
 

+ 5 - 2
src/main/webapp/WEB-INF/jsp/history/list.jsp

@@ -9,10 +9,13 @@ var startDate = "<c:out value='${startDate}'/>";
 var endDate   = "<c:out value='${endDate}'/>";
 
     $(function() {
+//         startDate = moment().subtract("7","d").format("YYYY-MM-DD"); 
+//         endDate   = moment().format("YYYY-MM-DD");
+        
         $("input[name=\"startDate\"]").daterangepicker({
             singleDatePicker : true,
             showDropdowns : true,
-//             startDate : "<c:out value='${startDate}'/>",
+            startDate : "<c:out value='${startDate}'/>",
             locale : {
                 //format : "M/DD hh:mm A"
                 format : "YYYY-MM-DD"
@@ -21,7 +24,7 @@ var endDate   = "<c:out value='${endDate}'/>";
         $("input[name=\"endDate\"]").daterangepicker({
             singleDatePicker : true,
             showDropdowns : true,
-//             startDate : "<c:out value='${endDate}'/>",
+            startDate : "<c:out value='${endDate}'/>",
             locale : {
                 //format : "M/DD hh:mm A"
                 format : "YYYY-MM-DD"