From ea686fead1f125a91f7a66c15a4b981d55e14b51 Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Wed, 2 Mar 2022 22:57:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EC=95=84=20=EA=B8=B0=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../M_Bf_daily_nutritionBOImpl.java | 4 +- .../m/bf_growth/M_Bf_growthController.java | 4 +- .../com.backoffice.m.bf_daily_nutrition.xml | 57 ++++++++++++++----- .../include_bf_nu_tp_11.ftl | 12 ---- .../m/bf_daily_nutrition/include_bottom.ftl | 3 +- .../view_bf_daily_nutrition_11.ftl | 19 ++++++- .../WEB-INF/views/ftl/m/index/index.ftl | 1 + 7 files changed, 65 insertions(+), 35 deletions(-) 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 e96b9b1..c4ad070 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 @@ -122,7 +122,7 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B result = generalDAO.update("update_bf_daily_nutrition", paramMap); for(int i = 1; i < BF_NU_TP_MAX; i++) { - generalDAO.insert("delete_bf_daily_nutrition_" + i + "_by_dn_no", paramMap); + generalDAO.delete("delete_bf_daily_nutrition_" + i + "_by_dn_no", paramMap); } String nutirition_cd_no = RenaStringUtil.getData(paramMap, "nutirition_cd_no"); @@ -132,7 +132,7 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B break; } } - + generalDAO.delete("delete_bf_daily_nutrition_memo", paramMap); generalDAO.commitTransaction(); } catch (SQLException e) { throw e; diff --git a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java index 3557557..0c2176a 100644 --- a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java +++ b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java @@ -147,7 +147,7 @@ public class M_Bf_growthController extends AbstractControllerManager{ int m = rm_child.getInt("m"); - if(m<60) { + // if(m<60) { // 당일 균형 판정 Calendar cal = Calendar.getInstance(); SimpleDateFormat format = new SimpleDateFormat ("yyyy-MM-dd"); @@ -249,7 +249,7 @@ public class M_Bf_growthController extends AbstractControllerManager{ monthly.add(data); } - } + // } DataMap.putToModel(model, "today", today); DataMap.putToModel(model, "daily", daily); 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 21fad3e..f7a2b84 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 @@ -7,8 +7,7 @@ ,x.afterbirthday ,x.fed_rs ,x.emo_pre - ,x.emo_post - + ,x.emo_post ,x.lacto ,x.fdv ,x.eat_qty @@ -18,7 +17,10 @@ ,x.brs ,x.srv ,x.rem + ,m.memo FROM tbl_bf_daily_nutrition_1 x + LEFT JOIN tbl_bf_daily_nutrition_memo m + ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -30,18 +32,18 @@ ,x.afterbirthday ,x.fed_rs ,x.emo_pre - ,x.emo_post - + ,x.emo_post ,x.db_dn_no ,x.lacto ,x.eat_qty ,x.bm ,x.bs - ,x.rem - + ,x.rem ,dn.prd_nm + ,m.memo FROM tbl_bf_daily_nutrition_2 x LEFT JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -53,8 +55,7 @@ ,x.afterbirthday ,x.fed_rs ,x.emo_pre - ,x.emo_post - + ,x.emo_post ,x.bm /* ,DATE_FORMAT(x.bm, '%h') As h @@ -68,8 +69,10 @@ ,x.weight ,dn.prd_nm ,x.eat_qty + ,m.memo FROM tbl_bf_daily_nutrition_3 x LEFT JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -85,11 +88,12 @@ ,x.cup_cd_no ,x.eat_qty - ,x.db_dn_no - + ,x.db_dn_no ,dn.prd_nm + ,m.memo FROM tbl_bf_daily_nutrition_4 x LEFT JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -109,7 +113,9 @@ ,x.sleep_s_m ,x.sleep_h ,x.sleep_m + ,m.memo FROM tbl_bf_daily_nutrition_5 x + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -120,13 +126,14 @@ DATE_FORMAT(x.birthday, '%Y.%m.%d') AS birthday ,x.afterbirthday ,x.emo_pre - ,x.emo_post - + ,x.emo_post ,x.rest_rs ,x.rest_tp ,x.rest_qty ,x.rest_color + ,m.memo FROM tbl_bf_daily_nutrition_6 x + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -138,7 +145,6 @@ ,x.afterbirthday ,x.emo_pre ,x.emo_post - ,x.label ,x.vac_rs ,x.vac_alg_tp @@ -146,11 +152,11 @@ ,x.m ,x.d ,x.db_dvs_no - ,x.memo - + ,m.memo ,dv.dv_disease AS disease ,dv.dv_type AS type FROM tbl_bf_daily_nutrition_7 x + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no LEFT JOIN tbl_db_vac_schedule dvs ON x.db_dvs_no=dvs.dvs_no LEFT JOIN tbl_db_vac dv ON dvs.dv_no=dv.dv_no WHERE 1 = 1 @@ -173,8 +179,10 @@ ,x.db_dn_no ,dn.prd_nm + ,m.memo FROM tbl_bf_daily_nutrition_8 x LEFT JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -195,8 +203,10 @@ ,x.db_dhb_no ,x.weight ,hb.name + ,m.memo FROM tbl_bf_daily_nutrition_9 x LEFT JOIN tbl_db_home_bf hb ON hb.dhb_no = x.db_dhb_no + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -220,12 +230,14 @@ when db_dbc_tp = 'sf' then df.prd_nm end ) prd_nm + ,m.memo from tbl_bf_daily_nutrition_10 x left join tbl_db_bf_commerce dn on dn.dbc_no = x.db_dbc_no left join tbl_db_sf_commerce df on df.dbc_no = x.db_dbc_no + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -239,7 +251,9 @@ ,hosp_nm ,doctor_nm ,checkup + ,m.memo FROM tbl_bf_daily_nutrition_11 x + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -252,7 +266,9 @@ ,disturb_min ,disturb_sec ,daily_life + ,m.memo FROM tbl_bf_daily_nutrition_12 x + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -263,7 +279,9 @@ DATE_FORMAT(x.birthday, '%Y.%m.%d') AS birthday ,x.afterbirthday ,achievement + ,m.memo FROM tbl_bf_daily_nutrition_13 x + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -279,7 +297,9 @@ ,x.brs ,x.blq ,x.brq + ,m.memo FROM tbl_bf_daily_nutrition_14 x + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -291,7 +311,9 @@ ,x.afterbirthday ,x.temperature ,x.etc_symptom + ,m.memo FROM tbl_bf_daily_nutrition_15 x + LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no WHERE 1 = 1 AND x.dn_no = #dn_no# AND x.smc_no = #smc_no# @@ -1122,6 +1144,11 @@ ,#memo# ) + + + DELETE FROM tbl_bf_daily_nutrition_memo + WHERE dn_no = #dn_no# + - + @@ -147,6 +147,7 @@