From b10cfa989e9da9f45c2d2a34fe4f592857a9f05f Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Tue, 15 Mar 2022 23:54:58 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=84=EC=9C=A0=20/=20=EA=B0=84=EC=8B=9D=20?= =?UTF-8?q?=EC=B5=9C=EA=B7=BC=20=EC=9E=85=EB=A0=A5=EC=84=A0=ED=83=9D=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../M_Bf_daily_nutritionBO.java | 2 + .../M_Bf_daily_nutritionBOImpl.java | 14 +++++ .../M_Bf_daily_nutritionController.java | 17 +++-- .../com.backoffice.m.bf_daily_nutrition.xml | 62 +++++++++++++++++++ .../ftl/m/bf_daily_nutrition/include_top.ftl | 2 +- .../view_bf_daily_nutrition_2.ftl | 19 ++++-- .../view_bf_daily_nutrition_3.ftl | 8 ++- 7 files changed, 111 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java index 833d3ba..8847f47 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java @@ -13,6 +13,8 @@ public interface M_Bf_daily_nutritionBO { public abstract int select_bf_daily_nutrition_list_count(DataMap paramMap) throws Exception; public abstract List select_bf_daily_nutrition_list_by_day(DataMap paramMap) throws Exception; public abstract DataMap select_bf_daily_nutrition_by_dn_no(DataMap paramMap) throws Exception; + public abstract List select_lastest_nutrition_list(DataMap paramMap) throws Exception; + public abstract List select_bf_last_status(DataMap paramMap) throws Exception; public abstract List select_db_vac_list(DataMap paramMap) throws Exception; diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java index 69fead0..0086501 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java @@ -48,6 +48,20 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B return lm; } + public List select_lastest_nutrition_list(DataMap paramMap) throws Exception{ + List lm = null; + + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + String nutirition_cd_no = paramMap.getString("nutirition_cd_no"); + lm = generalDAO.select_to_list("select_lastest_nutrition_list_"+nutirition_cd_no.replace("BF_NU_TP_", ""), paramMap); + } catch (SQLException e) { + throw e; + } + + return lm; + } + public List select_db_vac_list(DataMap paramMap) throws Exception{ List lm = null; diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java index 628a3ee..6ca928b 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java @@ -147,7 +147,15 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ DataMap rm = bf_daily_nutritionBO.select_bf_daily_nutrition_by_dn_no(paramMap); if( rm.get("temperature") !=null) rm.put("temperature", rm.get("temperature").toString()); - + String nutirition_cd_no = RenaStringUtil.getData(rm, "nutirition_cd_no"); // BF_NU_TP_5 + paramMap.put("memo_fg_cd", nutirition_cd_no); + paramMap.put("nutirition_cd_no", nutirition_cd_no); + + if( nutirition_cd_no.replace("BF_NU_TP_","").equals("2") || nutirition_cd_no.replace("BF_NU_TP_","").equals("3") || + nutirition_cd_no.replace("BF_NU_TP_","").equals("9") || nutirition_cd_no.replace("BF_NU_TP_","").equals("10") ) { + List lm_lastest_lac= bf_daily_nutritionBO.select_lastest_nutrition_list(paramMap); + DataMap.putToModel(model, "lm_lastest_lac", lm_lastest_lac); + } List music_list = member_envBO.select_music_list(paramMap); DataMap.putToModel(model, "music_list", music_list); @@ -175,16 +183,15 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ List lm_vac = bf_daily_nutritionBO.select_db_vac_list(paramMap); DataMap.putToModel(model, "lm_vac", lm_vac); - - String nutirition_cd_no = RenaStringUtil.getData(rm, "nutirition_cd_no"); // BF_NU_TP_5 - - paramMap.put("memo_fg_cd", nutirition_cd_no); + List lm_memo_mst = bf_daily_nutritionBO.select_memo_master(paramMap); DataMap.putToModel(model, "lm_memo_mst", lm_memo_mst); List lm_memo_lst= bf_daily_nutritionBO.select_memo_list(paramMap); DataMap.putToModel(model, "lm_memo_lst", lm_memo_lst); + + if(RenaStringUtil.isNullOrEmpty(nutirition_cd_no) == false) { redirect_url = "m/bf_daily_nutrition/view_bf_daily_nutrition_" + nutirition_cd_no.replace("BF_NU_TP_", ""); }else { 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 1b6eada..5e82746 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 @@ -44,6 +44,20 @@ AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# + + + + + + + + + -
분유을 선택 하세요.
-
    - -
+ +
    +
+
${model['rm']['prd_nm']!}
@@ -268,6 +274,7 @@ $('#db_dn_no').val(val); $('#ul_board').empty(); } + diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl index b3e9501..00ab827 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl @@ -60,6 +60,12 @@

간식 종류

+ <#if model['lm_lastest_lac']? has_content> + <#list model['lm_lastest_lac'] as item> +
${item['prd_nm']!}
+ + +
@@ -118,7 +124,7 @@

- 검색 + 검색