From 893a353ad52e551530a75e5285d8c6ef26ea41d2 Mon Sep 17 00:00:00 2001 From: isol2011 Date: Tue, 26 Jul 2022 16:19:38 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=8B=9D=ED=92=88?= =?UTF-8?q?=EA=B5=B0=20=EC=A0=90=EC=88=98=20=EC=A3=BC=EA=B0=84=20=EC=9B=94?= =?UTF-8?q?=EA=B0=84=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m/bf_growth/M_Bf_growthController.java | 78 ++++++++++--------- 1 file changed, 43 insertions(+), 35 deletions(-) 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 0223148..d6a253d 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 @@ -416,64 +416,72 @@ public class M_Bf_growthController extends AbstractControllerManager{ daily.add(data); } - + // 주간 균형 판정 List weak_lm = scoreBO.select_weekly_list_for_graph(paramMap); - - for(DataMap week : weak_lm) { - List lm = scoreBO.select_daily_total(week); - + + for (DataMap week : weak_lm) { + List lm = scoreBO.change_graph_to_daily_list(week); + long totalNutrition = 0; long totalFood = 0; - - for(DataMap dm : lm) { - NutrientScoreCalculation nut = new NutrientScoreCalculation(dm); - DataMap nut_score = nut.getScore(); - FoodScoreCalculation food = new FoodScoreCalculation(dm); - DataMap food_score = food.getScore(); - totalNutrition += nut_score.getLong("totalNutrition"); - totalFood += food_score.getLong("totalFood"); + + for (DataMap dm : lm) { + List lm2 = scoreBO.select_daily_total(dm); + for (DataMap dm2 : lm2) { + NutrientScoreCalculation nut = new NutrientScoreCalculation(dm2); + DataMap nut_score = nut.getScore(); + FoodScoreCalculation food = new FoodScoreCalculation(dm2); + DataMap food_score = food.getScore(); + totalNutrition += nut_score.getLong("totalNutrition"); + totalFood += food_score.getLong("totalFood"); + } } - // 1주일 중 기록한 날짜 수 - int day = lm.size(); - + // 1주일 중 기록한 날짜 수 +// int day = lm.size(); + int day = week.getInt("count"); + DataMap data = new DataMap(); data.put("reg_dt",RenaStringUtil.getData(week, "week_str")); data.put("totalNutrition", Math.round(totalNutrition/day)); data.put("totalFood", Math.round(totalFood/day)); - + weekly.add(data); - } - + // 월간 균형 판정 List month_lm = scoreBO.select_monthly_list_graph(paramMap); - + for(DataMap month : month_lm) { - List lm = scoreBO.select_daily_total(month); - + List lm = scoreBO.change_graph_to_daily_list(month); + + long totalNutrition = 0; long totalFood = 0; - + for(DataMap dm : lm) { - NutrientScoreCalculation nut = new NutrientScoreCalculation(dm); - DataMap nut_score = nut.getScore(); - FoodScoreCalculation food = new FoodScoreCalculation(dm); - DataMap food_score = food.getScore(); - - totalNutrition += nut_score.getLong("totalNutrition"); - totalFood += food_score.getLong("totalFood"); + List lm2 = scoreBO.select_daily_total(dm); + for (DataMap dm2 : lm2) { + NutrientScoreCalculation nut = new NutrientScoreCalculation(dm2); + DataMap nut_score = nut.getScore(); + FoodScoreCalculation food = new FoodScoreCalculation(dm2); + DataMap food_score = food.getScore(); + + totalNutrition += nut_score.getLong("totalNutrition"); + totalFood += food_score.getLong("totalFood"); + } } - // 한달 중 기록한 날짜 수 - int day = lm.size(); - + // 한달 중 기록한 날짜 수 +// int day = lm.size(); + int day = month.getInt("count"); + DataMap data = new DataMap(); data.put("reg_dt",RenaStringUtil.getData(month, "month_str")); data.put("totalNutrition", Math.round(totalNutrition/day)); data.put("totalFood", Math.round(totalFood/day)); - + monthly.add(data); - + } }