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 768242c..0653eee 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 @@ -180,22 +180,23 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ String birthday = RenaStringUtil.getData(rm_child, "birthday"); String baseday = RenaStringUtil.getData(rm, "baseday"); int afterbirthday = DateUtil.compareDateWithFormat(birthday, baseday, DateUtil.F_YYYYMMDDDash, DateUtil.F_YYYYMMDDDot); - int label=0; - if(afterbirthday<=31) label=1; - else if(afterbirthday<=63) label=2; - else if(afterbirthday<=95) label=3; - else if(afterbirthday<=158) label=4; - else if(afterbirthday<=221) label=5; - else if(afterbirthday<=408) label=6; - else if(afterbirthday<=502) label=7; - else if(afterbirthday<=596) label=8; - else if(afterbirthday<=752) label=9; - else if(afterbirthday<=1125) label=10; - else if(afterbirthday<=1870) label=11; - else if(afterbirthday<=4103) label=12; - else if(afterbirthday<=4476) label=13; - else if(afterbirthday<=4849) label=14; - paramMap.put("label", label); +// int label=0; +// if(afterbirthday<=31) label=1; +// else if(afterbirthday<=63) label=2; +// else if(afterbirthday<=95) label=3; +// else if(afterbirthday<=158) label=4; +// else if(afterbirthday<=221) label=5; +// else if(afterbirthday<=408) label=6; +// else if(afterbirthday<=502) label=7; +// else if(afterbirthday<=596) label=8; +// else if(afterbirthday<=752) label=9; +// else if(afterbirthday<=1125) label=10; +// else if(afterbirthday<=1870) label=11; +// else if(afterbirthday<=4103) label=12; +// else if(afterbirthday<=4476) label=13; +// else if(afterbirthday<=4849) label=14; +// paramMap.put("label", label); + paramMap.put("label", rm_child.get("past_month")); List lm_vac = bf_daily_nutritionBO.select_db_vac_list(paramMap); DataMap.putToModel(model, "lm_vac", lm_vac); 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 b643525..0b6881b 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 @@ -1596,7 +1596,7 @@ ,dv_no ,round FROM tbl_db_vac_schedule - WHERE start_label#label# AND #label#end_label + WHERE start_label#label# AND #label#end_label )x LEFT JOIN tbl_db_vac dv ON dv.dv_no = x.dv_no LEFT JOIN tbl_bf_daily_nutrition_7 dn ON dn.db_dvs_no = x.dvs_no diff --git a/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml b/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml index e7500b8..3b85967 100644 --- a/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml +++ b/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml @@ -394,7 +394,7 @@ @@ -459,7 +459,7 @@ on fb.smc_no = #smc_no# where smc_no = #smc_no# and now() >= date_add(date_add(fb.birthday,interval start_label month), INTERVAL -3 DAY) - and date_add(fb.birthday,interval dvs.end_label month) >= now() + and date_add(date_add(fb.birthday,interval dvs.end_label month), interval -1 day) >= now() order by recmnd_from_dt , dvs.dv_no, dvs.round