From 4d421aeba899e28c4f32793aeecda66d31a47fc6 Mon Sep 17 00:00:00 2001 From: isol2011 Date: Mon, 11 Jul 2022 18:46:38 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=98=81=EC=96=91?= =?UTF-8?q?=EC=86=8C=EA=B3=84=EC=82=B0=EA=B8=B0class=EB=A5=BC=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=98=80=EC=9D=84=20=EB=95=8C=20=EC=84=AD?= =?UTF-8?q?=EC=B7=A8=EB=9F=89=20=EC=A0=95=ED=99=95=ED=95=98=EA=B2=8C=20?= =?UTF-8?q?=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8A=94=EA=B0=80=20-=20DB=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=ED=9B=84=20=EA=B2=80=EC=A6=9D=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=A4=91=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/FoodScoreCalculation.java | 44 +++++--- .../logic/NutrientScoreCalculation.java | 38 +++---- .../bf/com.backoffice.admin.bf.bf_score.xml | 102 ++++++++++++------ .../com.backoffice.m.bf_daily_nutrition.xml | 4 +- .../view_bf_daily_nutrition_10.ftl | 2 +- 5 files changed, 122 insertions(+), 68 deletions(-) diff --git a/src/main/java/com/backoffice/logic/FoodScoreCalculation.java b/src/main/java/com/backoffice/logic/FoodScoreCalculation.java index 7ea0e1e..e9c5101 100644 --- a/src/main/java/com/backoffice/logic/FoodScoreCalculation.java +++ b/src/main/java/com/backoffice/logic/FoodScoreCalculation.java @@ -646,7 +646,7 @@ public class FoodScoreCalculation { private String get_milk_light(double score) { if(label==0) { if(score==0) - return Light.red.name(); + return Light.yellow.name(); else if(score==10 || score==5) return Light.yellow.name(); else if(score==15) @@ -676,12 +676,21 @@ public class FoodScoreCalculation { */ private String get_grains_light(double score) { if(label != -1) { - if(score==0) - return Light.red.name(); - else if(score==1.25) - return Light.yellow.name(); - else if(score==2.5 || score==5.0) - return Light.green.name(); + if(label==0){ + if(score==0) + return Light.yellow.name(); + else if(score==1.25) + return Light.yellow.name(); + else if(score==2.5 || score==5.0) + return Light.green.name(); + }else{ + if(score==0) + return Light.red.name(); + else if(score==1.25) + return Light.yellow.name(); + else if(score==2.5 || score==5.0) + return Light.green.name(); + } } return null; } @@ -693,12 +702,21 @@ public class FoodScoreCalculation { */ private String get_else_light(double score) { if(label != -1) { - if(score==0) - return Light.red.name(); - else if(score==2.5) - return Light.yellow.name(); - else if(score==5) - return Light.green.name(); + if(label==0){ + if(score==0) + return Light.yellow.name(); + else if(score==2.5) + return Light.yellow.name(); + else if(score==5) + return Light.green.name(); + }else{ + if(score==0) + return Light.red.name(); + else if(score==2.5) + return Light.yellow.name(); + else if(score==5) + return Light.green.name(); + } } return null; } diff --git a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java index d0c8524..8cce8d8 100644 --- a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java +++ b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java @@ -123,43 +123,43 @@ public class NutrientScoreCalculation { public static void main(String[] args) { DataMap data = new DataMap(); // 아기 개월 - data.put("month", 11); + data.put("month", 26); // 에너지 - data.put("enerc", 120.381); + data.put("enerc", 130.0); // 탄수화물 - data.put("chotdf", 24.401); + data.put("chotdf", 14.0); // 단백질 - data.put("procnp", 4.36); + data.put("procnp", 5.0); // 지방 - data.put("fat", 0.22476); + data.put("fat", 6.0); // 총당류 - data.put("sugar", 1.08); + data.put("sugar", 6.0); // 총식이섬유 - data.put("fibtg", 0.4381); + data.put("fibtg", 0.0); // 나트륨 - data.put("na", 7.14286); + data.put("na", 100.0); // 비타민b1 - data.put("vitaminb1", 0.0904762); + data.put("vitaminb1", 0.15); // 비타민b2 - data.put("vitaminb2", 0.05114); + data.put("vitaminb2", 0.25); // 니아신 - data.put("niacin", 0); + data.put("niacin", 1.7); // 칼슘 - data.put("ca", 4.095238); + data.put("ca", 150.0); // 칼륨 - data.put("k", 130.4762); + data.put("k", 180.0); // 철 - data.put("fe", 0.4819048); + data.put("fe", 2.9); // 비타민a - data.put("vitamina", 0); + data.put("vitamina", 130.0); // 비타민c - data.put("vitaminc", 4.28571); + data.put("vitaminc", 14.0); // 비타민d - data.put("vitamind", 0); + data.put("vitamind", 2.5); // 비타민e - data.put("vitamine", 0); + data.put("vitamine", 2.5); // 아연 - data.put("zn", 0.13143); + data.put("zn", 1.0); NutrientScoreCalculation cal = new NutrientScoreCalculation(data); DataMap score = cal.getScore(); diff --git a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml index f00b8a2..c1f6f28 100644 --- a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml +++ b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml @@ -1402,36 +1402,36 @@ ( SELECT x.reg_dt - ,ROUND(SUM(di.enerc*dbi.rate_100*weight),2) AS enerc - ,ROUND(SUM(di.chotdf*dbi.rate_100*weight),2) AS chotdf - ,ROUND(SUM(di.procnp*dbi.rate_100*weight),2) AS procnp - ,ROUND(SUM(di.fat*dbi.rate_100*weight),2) AS fat - ,ROUND(SUM(di.sugar*dbi.rate_100*weight),2) AS sugar - ,ROUND(SUM(di.fibtg*dbi.rate_100*weight),2) AS fibtg - ,ROUND(SUM(di.na*dbi.rate_100*weight),2) AS na - ,ROUND(SUM(di.vitaminb1*dbi.rate_100*weight),2) AS vitaminb1 - ,ROUND(SUM(di.vitaminb2*dbi.rate_100*weight),2) AS vitaminb2 - ,ROUND(SUM(di.niacin*dbi.rate_100*weight),2) AS niacin - ,ROUND(SUM(di.ca*dbi.rate_100*weight),2) AS ca - ,ROUND(SUM(di.k*dbi.rate_100*weight),2) AS k - ,ROUND(SUM(di.fe*dbi.rate_100*weight),2) AS fe - ,ROUND(SUM(di.vitamina*dbi.rate_100*weight),2) AS vitamina - ,ROUND(SUM(di.vitaminc*dbi.rate_100*weight),2) AS vitaminc - ,ROUND(SUM(di.vitamind*dbi.rate_100*weight),2) AS vitamind - ,ROUND(SUM(di.vitamine*dbi.rate_100*weight),2) AS vitamine - ,ROUND(SUM(di.zn*dbi.rate_100*weight),2) AS zn - ,ROUND(SUM(di.dqi_food_1*dbi.rate_100*weight*100),2) AS dqi_food_1 - ,ROUND(SUM(di.dqi_food_2*dbi.rate_100*weight*100),2) AS dqi_food_2 - ,ROUND(SUM(di.dqi_food_3*dbi.rate_100*weight*100),2) AS dqi_food_3 - ,ROUND(SUM(di.dqi_food_4*dbi.rate_100*weight*100),2) AS dqi_food_4 - ,ROUND(SUM(di.dqi_food_5*dbi.rate_100*weight*100),2) AS dqi_food_5 - ,ROUND(SUM(di.dqi_food_6*dbi.rate_100*weight*100),2) AS dqi_food_6 - ,ROUND(SUM(di.dqi_food_7*dbi.rate_100*weight*100),2) AS dqi_food_7 - ,ROUND(SUM(di.dqi_food_8*dbi.rate_100*weight*100),2) AS dqi_food_8 - ,ROUND(SUM(di.dqi_food_9*dbi.rate_100*weight*100),2) AS dqi_food_9 - ,ROUND(SUM(di.dqi_food_10*dbi.rate_100*weight*100),2) AS dqi_food_10 - ,ROUND(SUM(di.dqi_food_11*dbi.rate_100*weight*100),2) AS dqi_food_11 - ,ROUND(SUM(di.dqi_food_12*dbi.rate_100*weight*100),2) AS dqi_food_12 + ,ROUND(SUM(di.enerc*weight),2) AS enerc + ,ROUND(SUM(di.chotdf*weight),2) AS chotdf + ,ROUND(SUM(di.procnp*weight),2) AS procnp + ,ROUND(SUM(di.fat*weight),2) AS fat + ,ROUND(SUM(di.sugar*weight),2) AS sugar + ,ROUND(SUM(di.fibtg*weight),2) AS fibtg + ,ROUND(SUM(di.na*weight),2) AS na + ,ROUND(SUM(di.vitaminb1*weight),2) AS vitaminb1 + ,ROUND(SUM(di.vitaminb2*weight),2) AS vitaminb2 + ,ROUND(SUM(di.niacin*weight),2) AS niacin + ,ROUND(SUM(di.ca*weight),2) AS ca + ,ROUND(SUM(di.k*weight),2) AS k + ,ROUND(SUM(di.fe*weight),2) AS fe + ,ROUND(SUM(di.vitamina*weight),2) AS vitamina + ,ROUND(SUM(di.vitaminc*weight),2) AS vitaminc + ,ROUND(SUM(di.vitamind*weight),2) AS vitamind + ,ROUND(SUM(di.vitamine*weight),2) AS vitamine + ,ROUND(SUM(di.zn*weight),2) AS zn + ,ROUND(SUM(di.dqi_food_1*weight),2) AS dqi_food_1 + ,ROUND(SUM(di.dqi_food_2*weight),2) AS dqi_food_2 + ,ROUND(SUM(di.dqi_food_3*weight),2) AS dqi_food_3 + ,ROUND(SUM(di.dqi_food_4*weight),2) AS dqi_food_4 + ,ROUND(SUM(di.dqi_food_5*weight),2) AS dqi_food_5 + ,ROUND(SUM(di.dqi_food_6*weight),2) AS dqi_food_6 + ,ROUND(SUM(di.dqi_food_7*weight),2) AS dqi_food_7 + ,ROUND(SUM(di.dqi_food_8*weight),2) AS dqi_food_8 + ,ROUND(SUM(di.dqi_food_9*weight),2) AS dqi_food_9 + ,ROUND(SUM(di.dqi_food_10*weight),2) AS dqi_food_10 + ,ROUND(SUM(di.dqi_food_11*weight),2) AS dqi_food_11 + ,ROUND(SUM(di.dqi_food_12*weight),2) AS dqi_food_12 FROM ( SELECT x.* ,hb.dhb_cd @@ -1455,12 +1455,46 @@ )x LEFT JOIN tbl_db_home_bf hb ON hb.dhb_no = x.db_dhb_no )x - LEFT JOIN tbl_db_ingre di ON di.dhb_cd = x.dhb_cd - LEFT JOIN tbl_db_home_bf_ingre dbi ON dbi.dhb_cd = di.dhb_cd + LEFT JOIN ( + select + tdi.dhb_cd, + SUM(tdi.enerc) as enerc, + SUM(tdi.chotdf) as chotdf, + SUM(tdi.sugar) as sugar, + SUM(tdi.fibtg) as fibtg, + SUM(tdi.procnp) as procnp, + SUM(tdi.fat) as fat, + SUM(tdi.na) as na, + SUM(tdi.vitaminb1) as vitaminb1, + SUM(tdi.vitaminb2) as vitaminb2, + SUM(tdi.niacin) as niacin, + SUM(tdi.ca) as ca, + SUM(tdi.k) as k, + SUM(tdi.fe) as fe, + SUM(tdi.vitamina) as vitamina, + SUM(tdi.vitaminc) as vitaminc, + SUM(tdi.vitamind) as vitamind, + SUM(tdi.vitamine) as vitamine, + SUM(tdi.zn) as zn, + SUM(tdi.dqi_food_1) as dqi_food_1, + SUM(tdi.dqi_food_2) as dqi_food_2, + SUM(tdi.dqi_food_3) as dqi_food_3, + SUM(tdi.dqi_food_4) as dqi_food_4, + SUM(tdi.dqi_food_5) as dqi_food_5, + SUM(tdi.dqi_food_6) as dqi_food_6, + SUM(tdi.dqi_food_7) as dqi_food_7, + SUM(tdi.dqi_food_8) as dqi_food_8, + SUM(tdi.dqi_food_9) as dqi_food_9, + SUM(tdi.dqi_food_10) as dqi_food_10, + SUM(tdi.dqi_food_11) as dqi_food_11, + SUM(tdi.dqi_food_12) as dqi_food_12 + from + tbl_db_ingre tdi + group by + dhb_cd + ) di on di.dhb_cd = x.dhb_cd GROUP BY x.dn_no ) - - UNION ALL ( SELECT 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 16f337c..6297f31 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 @@ -1371,7 +1371,9 @@ ,#allergy_cd_no# ,#db_dhb_no# ,#db_dhb_tp# - ,#eat_qty#/100 + + ,#eat_qty#/(SELECT srv from tbl_db_home_bf where dhb_no=(#db_dhb_no#)) + ,#eat_qty# ) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl index c3da13f..e0e0dc4 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl @@ -227,7 +227,7 @@ var company = result.list[i].company; var barcode = result.list[i].barcode; var imgurl1 = result.list[i].imgurl1; - html +='
  • 섭취량 이미지' + prd_nm + '
    • '; + html +='
  • 섭취량 이미지' + prd_nm + '
    • '; } var ul_board = $('#ul_board');