diff --git a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java index 06d7c02..ba45b55 100644 --- a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java +++ b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java @@ -14,11 +14,13 @@ public interface M_Bf_growthBO { public abstract DataMap select_bf_growth_vac_baseday(DataMap paramMap) throws Exception; public abstract DataMap select_bf_growth_vac_by_label(DataMap paramMap) throws Exception; public abstract List select_bf_health_checkup_list(DataMap paramMap) throws Exception; + public abstract List select_bf_health_checkup_list_prvs(DataMap paramMap) throws Exception; public abstract List select_bf_vac_schedule_list(DataMap paramMap) throws Exception; - + public abstract List select_bf_vac_schedule_list_prvs(DataMap paramMap) throws Exception; + public abstract List select_bf_growth_sleep_statistics(DataMap paramMap) throws Exception; public abstract List select_bf_growth_sleep_list(DataMap paramMap) throws Exception; - + public abstract List select_bf_growth_rest_statistics(DataMap paramMap) throws Exception; public abstract List select_bf_growth_rest_by_rest_tp_limit2(DataMap paramMap) throws Exception; public abstract List select_bf_growth_rest_list(DataMap paramMap) throws Exception; diff --git a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java index 61439ad..ff9c251 100644 --- a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java @@ -71,7 +71,6 @@ public class M_Bf_growthBOImpl extends AbstractBOManager implements M_Bf_growthB } catch (SQLException e) { throw e; } return lm; } - public List select_bf_growth_rest_statistics(DataMap paramMap) throws Exception{ @@ -128,6 +127,16 @@ public class M_Bf_growthBOImpl extends AbstractBOManager implements M_Bf_growthB } catch (SQLException e) { throw e; } return lm; } + + public List select_bf_health_checkup_list_prvs(DataMap paramMap) throws Exception{ + List lm = null; + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + lm = generalDAO.select_to_list("select_bf_health_checkup_list_prvs", paramMap); + } catch (SQLException e) { throw e; } + return lm; + } + public List select_bf_vac_schedule_list(DataMap paramMap) throws Exception{ List lm = null; try { @@ -135,8 +144,17 @@ public class M_Bf_growthBOImpl extends AbstractBOManager implements M_Bf_growthB lm = generalDAO.select_to_list("select_bf_vac_schedule_list", paramMap); } catch (SQLException e) { throw e; } return lm; - } - + } + + public List select_bf_vac_schedule_list_prvs(DataMap paramMap) throws Exception{ + List lm = null; + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + lm = generalDAO.select_to_list("select_bf_vac_schedule_list_prvs", paramMap); + } catch (SQLException e) { throw e; } + return lm; + } + public DataMap select_bf_health_noti_count (DataMap paramMap) throws Exception{ DataMap rm = null; try { 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 af581df..f2a3b67 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 @@ -612,12 +612,15 @@ public class M_Bf_growthController extends AbstractControllerManager{ DataMap rm_child = init_child(model, request, paramMap); paramMap.put("smc_no", rm_child.get("smc_no")); List lm_health_checkup = bf_growthBO.select_bf_health_checkup_list(paramMap); //smc_no + List lm_health_chekcup_prvs = bf_growthBO.select_bf_health_checkup_list_prvs(paramMap); + DataMap rm_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap); DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti); DataMap.putToModel(model, "rm_health_noti", rm_health_noti); DataMap.putToModel(model, "rm_child", rm_child); DataMap.putToModel(model, "rm_health_checkup", lm_health_checkup); + DataMap.putToModel(model, "rm_health_chekcup_prvs", lm_health_chekcup_prvs); } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} @@ -626,7 +629,7 @@ public class M_Bf_growthController extends AbstractControllerManager{ return redirect_url; } - + @RequestMapping(value="vac_schedule") public String vac_schedule(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response , RedirectAttributes ra) { @@ -643,13 +646,15 @@ public class M_Bf_growthController extends AbstractControllerManager{ DataMap rm_child = init_child(model, request, paramMap); paramMap.put("smc_no", rm_child.get("smc_no")); List lm_vac_schedule = bf_growthBO.select_bf_vac_schedule_list(paramMap); //smc_no + List lm_vac_schedule_prvs = bf_growthBO.select_bf_vac_schedule_list_prvs(paramMap); + DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); DataMap rm_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap); DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti); DataMap.putToModel(model, "rm_health_noti", rm_health_noti); DataMap.putToModel(model, "rm_child", rm_child); - DataMap.putToModel(model, "rm_vac_schedule", lm_vac_schedule); - + DataMap.putToModel(model, "rm_vac_schedule", lm_vac_schedule); + DataMap.putToModel(model, "rm_vac_schedule_prvs", lm_vac_schedule_prvs); } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} 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 d6178b2..4c75c4d 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 @@ -355,24 +355,44 @@ - - + + + + + +