diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java index f43a2f3..5b1f442 100644 --- a/src/main/java/com/backoffice/m/index/M_IndexController.java +++ b/src/main/java/com/backoffice/m/index/M_IndexController.java @@ -188,7 +188,7 @@ public class M_IndexController extends AbstractControllerManager{ List category_list = indexBO.select_code_list(paramMap); DataMap.putToModel(model, "category_list", category_list); - // 오늘 영양입력 조회 + // 이번 달 영양입력 조회 List lm_nutrition = bf_daily_nutritionBO.select_bf_daily_nutrition_list_by_day(paramMap); DataMap.putToModel(model, "lm_nutrition", lm_nutrition); diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml index 01a64ea..b86791c 100644 --- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml +++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml @@ -522,8 +522,8 @@ WHEN TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()) 0 THEN '방금 전' WHEN TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()) 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()), '분 전') WHEN TIMESTAMPDIFF(HOUR, x.reg_dt, NOW()) 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, x.reg_dt, NOW()), '시간 전') - WHEN TIMESTAMPDIFF(DAY, x.reg_dt, NOW()) 30 THEN CONCAT(TIMESTAMPDIFF(DAY, x.reg_dt, NOW()), '일 전') - ELSE CONCAT(TIMESTAMPDIFF(MONTH, x.reg_dt, NOW()), '달 전') + WHEN TIMESTAMPDIFF(DAY, x.reg_dt, NOW()) 30 THEN "" + ELSE "" END AS ago FROM tbl_bf_daily_nutrition x WHERE 1 =1 diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl index acb313d..de06d10 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl @@ -17,7 +17,7 @@ /* 퍼블리싱 수정 css */ .main_cont_camera { padding-top:50px; background: none; padding-bottom: 100px; } - .main_cont_camera li { position:relative; width:100%; padding-bottom:125px; text-align:center; background: none; display: flex; } + .main_cont_camera li { position:relative; width:100%; padding-bottom:5rem; text-align:center; background: none; display: flex; } .main_cont_camera li:last-child { padding-bottom:50px; background: none; } .main_cont_camera .img_preview { position:relative; overflow:hidden; width: 70px; height: 70px; margin: 0 43px 0 20px; background:#fff; border:5px solid #fff; border-radius:20px; box-shadow: 0 0 6px rgba(0, 0, 0, 0.2); } .main_cont_camera .img_preview:after { @@ -282,12 +282,18 @@