diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c6de2d4..bdf11c4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,11 +9,10 @@
-
+
-
-
-
+
+
@@ -221,7 +220,7 @@
-
+
1645354476031
@@ -482,7 +481,14 @@
1650286771669
-
+
+ 1650292837211
+
+
+
+ 1650292837211
+
+
@@ -502,7 +508,6 @@
-
@@ -527,6 +532,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
index 55a50f9..4fa267d 100644
--- a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
+++ b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
@@ -158,8 +158,7 @@ public class M_Member_envController extends AbstractControllerManager{
}
@RequestMapping(value="setting_env_viewnm")
- public String setting_env_viewnm(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response
- , RedirectAttributes ra) {
+ public String setting_env_viewnm(@ModelAttribute("model") ModelMap model, HttpServletRequest request, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request);
String view_nm = RenaStringUtil.getData(paramMap, "view_nm");
@@ -187,6 +186,21 @@ public class M_Member_envController extends AbstractControllerManager{
} else if(view_nm.equals("view_set_music")) { //음악설정
List music_list = member_envBO.select_music_list(paramMap);
DataMap.putToModel(model, "music_list", music_list);
+ } else if(view_nm.equals("view_d_day")) { //D-Day 등록
+ DataMap dataMap = new DataMap();
+
+ //세팅된 년도,월이 없으면
+ if(paramMap.get("viewYear") == null || paramMap.get("viewMonth") == null) {
+ String viewYear = DateUtil.getTodayAddDate(0,"yyyy");
+ String viewMonth = DateUtil.getTodayAddDate(0,"MM");
+
+ dataMap.put("viewYear", viewYear);
+ dataMap.put("viewMonth", viewMonth);
+ } else {
+ dataMap.put("viewYear", paramMap.get("viewYear"));
+ dataMap.put("viewMonth", paramMap.get("viewMonth"));
+ }
+ DataMap.putToModel(model, "today", dataMap);
}
DataMap.putToModel(model, "rm_mem", rm_mem);
@@ -794,7 +808,6 @@ public class M_Member_envController extends AbstractControllerManager{
* D-Day 신규 등록
* @param model
* @param request
- * @param response
* @return
*/
@RequestMapping(value="ajax_insert_dday")
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl
index e20e50e..9da8f09 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl
@@ -75,12 +75,13 @@