From 24a14963a3424cac3d08916fea8be4d8334f902e Mon Sep 17 00:00:00 2001 From: isol2011 Date: Tue, 2 Aug 2022 20:18:05 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=A7=81=EC=A0=91?= =?UTF-8?q?=EB=A7=8C=EB=93=A0=20=EC=9D=B4=EC=9C=A0=EC=8B=9D=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=EC=8B=9C=20=EC=98=81=EC=96=91=EC=A0=90=EC=88=98=20?= =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EB=B3=80=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bf/com.backoffice.admin.bf.bf_score.xml | 70 +++++++++---------- .../view_bf_daily_nutrition_9.ftl | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) 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 9c11ce6..3911c60 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 @@ -1087,7 +1087,7 @@ '시판이유식' AS category ,dbc.prd_nm AS name ,x.weight - ,ROUND(0*x.weight,2) AS enerc + ,ROUND(dbc.calorie*x.weight,2) AS enerc ,ROUND(dbc.carbohydrate*x.weight,2) AS chotdf ,ROUND(dbc.protein*x.weight,2) AS procnp ,ROUND(dbc.province*x.weight,2) AS fat @@ -1203,7 +1203,7 @@ '간식' AS category ,dn.prd_nm AS name ,weight - ,ROUND(0*x.weight,2) AS enerc + ,ROUND(dn.calorie*x.weight,2) AS enerc ,ROUND(dn.carbohydrate*x.weight,2) AS chotdf ,ROUND(dn.protein*x.weight,2) AS procnp ,ROUND(dn.province*x.weight,2) AS fat @@ -1568,36 +1568,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 @@ -1684,7 +1684,7 @@ ( SELECT x.reg_dt - ,ROUND(0*x.weight,2) AS enerc + ,ROUND(dbc.calorie*x.weight,2) AS enerc ,ROUND(dbc.carbohydrate*x.weight,2) AS chotdf ,ROUND(dbc.protein*x.weight,2) AS procnp ,ROUND(dbc.province*x.weight,2) AS fat @@ -1791,8 +1791,8 @@ ( SELECT x.reg_dt - ,ROUND(0*x.weight,2) AS enerc - ,ROUND(0*x.weight,2) AS chotdf + ,ROUND(nvl(dn.calorie,0)*x.weight,2) AS enerc + ,ROUND(nvl(dn.carbohydrate,0)*x.weight,2) AS chotdf ,ROUND(nvl(dn.protein,0)*x.weight,2) AS procnp ,ROUND(nvl(dn.province,0)*x.weight,2) AS fat ,ROUND(nvl(dn.sugar,0)*x.weight,2) AS sugar diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl index c7d4e27..a88b2ac 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl @@ -58,7 +58,7 @@ <#if model['lm_lastest_lac']? has_content> <#list model['lm_lastest_lac'] as item> -
${item['prd_nm']!}      [${item['reg_dt']!}]
+
${item['prd_nm']!}      [${item['reg_dt']!}]