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 0ee90b1..3fcffd0 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
@@ -861,7 +861,7 @@
,ROUND(dn2.vitd*x.weight,2) AS vitamind
,ROUND(dn2.vite*x.weight,2) AS vitamine
,ROUND(dn2.zn*x.weight,2) AS zn
- ,IFNULL(x.srv-x.rem,0) AS dqi_food_1
+ ,IFNULL(x.eat_qty,0) AS dqi_food_1
,0 AS dqi_food_2
,0 AS dqi_food_3
,0 AS dqi_food_4
@@ -877,6 +877,7 @@
FROM (
SELECT dn_no
,weight
+ ,eat_qty
,srv
,rem
,reg_dt
@@ -884,10 +885,10 @@
WHERE smc_no=#smc_no#
- AND DATE(t.reg_dt) = current_date()-interval 1 day
- AND DATE(t.reg_dt)=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",WEEK(t.reg_dt))=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",MONTH(t.reg_dt)) = #reg_dt#
+ AND DATE(reg_dt) = current_date()-interval 1 day
+ AND DATE(reg_dt)=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",WEEK(reg_dt))=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",MONTH(reg_dt)) = #reg_dt#
)x
LEFT JOIN tbl_db_milk_nutirition2 dn2 ON 1=1
@@ -898,36 +899,36 @@
'홈메이드이유식' AS category
,x.name
,x.weight
- ,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
,x.reg_dt
FROM (
SELECT x.*
@@ -941,18 +942,55 @@
FROM tbl_bf_daily_nutrition_9
WHERE smc_no=#smc_no#
AND db_dhb_no IS NOT NULL
+ AND db_dhb_tp ='bf'
- AND DATE(t.reg_dt) = current_date()-interval 1 day
- AND DATE(t.reg_dt)=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",WEEK(t.reg_dt))=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",MONTH(t.reg_dt)) = #reg_dt#
+ AND DATE(reg_dt) = current_date()-interval 1 day
+ AND DATE(reg_dt)=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",WEEK(reg_dt))=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",MONTH(reg_dt)) = #reg_dt#
)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,
+ ROUND(SUM(tdi.enerc),2) as enerc,
+ ROUND(SUM(tdi.chotdf),2) as chotdf,
+ ROUND(SUM(tdi.sugar),2) as sugar,
+ ROUND(SUM(tdi.fibtg),2) as fibtg,
+ ROUND(SUM(tdi.procnp),2) as procnp,
+ ROUND(SUM(tdi.fat),2) as fat,
+ ROUND(SUM(tdi.na),2) as na,
+ ROUND(SUM(tdi.vitaminb1),2) as vitaminb1,
+ ROUND(SUM(tdi.vitaminb2),2) as vitaminb2,
+ ROUND(SUM(tdi.niacin),2) as niacin,
+ ROUND(SUM(tdi.ca),2) as ca,
+ ROUND(SUM(tdi.k),2) as k,
+ ROUND(SUM(tdi.fe),2) as fe,
+ ROUND(SUM(tdi.vitamina),2) as vitamina,
+ ROUND(SUM(tdi.vitaminc),2) as vitaminc,
+ ROUND(SUM(tdi.vitamind),2) as vitamind,
+ ROUND(SUM(tdi.vitamine),2) as vitamine,
+ ROUND(SUM(tdi.zn),2) as zn,
+ ROUND(SUM(tdi.dqi_food_1),2) as dqi_food_1,
+ ROUND(SUM(tdi.dqi_food_2),2) as dqi_food_2,
+ ROUND(SUM(tdi.dqi_food_3),2) as dqi_food_3,
+ ROUND(SUM(tdi.dqi_food_4),2) as dqi_food_4,
+ ROUND(SUM(tdi.dqi_food_5),2) as dqi_food_5,
+ ROUND(SUM(tdi.dqi_food_6),2) as dqi_food_6,
+ ROUND(SUM(tdi.dqi_food_7),2) as dqi_food_7,
+ ROUND(SUM(tdi.dqi_food_8),2) as dqi_food_8,
+ ROUND(SUM(tdi.dqi_food_9),2) as dqi_food_9,
+ ROUND(SUM(tdi.dqi_food_10),2) as dqi_food_10,
+ ROUND(SUM(tdi.dqi_food_11),2) as dqi_food_11,
+ ROUND(SUM(tdi.dqi_food_12),2) 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
)
@@ -962,40 +1000,41 @@
'홈메이드이유식' AS category
,x.name
,x.weight
- ,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
,x.reg_dt
FROM (
SELECT x.*
,hb.dhb_cd
+ ,hb.dhb_no
,hb.name
FROM(
SELECT dn_no
@@ -1005,12 +1044,13 @@
FROM tbl_bf_daily_nutrition_9
WHERE smc_no=#smc_no#
AND db_dhb_no IS NOT NULL
+ AND db_dhb_tp ='sf'
- AND DATE(t.reg_dt) = current_date()-interval 1 day
- AND DATE(t.reg_dt)=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",WEEK(t.reg_dt))=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",MONTH(t.reg_dt)) = #reg_dt#
+ AND DATE(reg_dt) = current_date()-interval 1 day
+ AND DATE(reg_dt)=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",WEEK(reg_dt))=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",MONTH(reg_dt)) = #reg_dt#
)x
LEFT JOIN tbl_db_home_sf hb ON hb.dhb_no = x.db_dhb_no
@@ -1069,10 +1109,10 @@
and db_dbc_tp ='bf'
- AND DATE(t.reg_dt) = current_date()-interval 1 day
- AND DATE(t.reg_dt)=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",WEEK(t.reg_dt))=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",MONTH(t.reg_dt)) = #reg_dt#
+ AND DATE(reg_dt) = current_date()-interval 1 day
+ AND DATE(reg_dt)=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",WEEK(reg_dt))=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",MONTH(reg_dt)) = #reg_dt#
)x
LEFT JOIN tbl_db_bf_commerce dbc ON x.db_dbc_no=dbc.dbc_no
@@ -1128,10 +1168,10 @@
and db_dbc_tp ='sf'
- AND DATE(t.reg_dt) = current_date()-interval 1 day
- AND DATE(t.reg_dt)=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",WEEK(t.reg_dt))=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",MONTH(t.reg_dt)) = #reg_dt#
+ AND DATE(reg_dt) = current_date()-interval 1 day
+ AND DATE(reg_dt)=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",WEEK(reg_dt))=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",MONTH(reg_dt)) = #reg_dt#
)x
LEFT JOIN tbl_db_sf_commerce dbc ON x.db_dbc_no=dbc.dbc_no
@@ -1186,10 +1226,10 @@
and db_dn_tp ='bf'
- AND DATE(t.reg_dt) = current_date()-interval 1 day
- AND DATE(t.reg_dt)=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",WEEK(t.reg_dt))=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",MONTH(t.reg_dt)) = #reg_dt#
+ AND DATE(reg_dt) = current_date()-interval 1 day
+ AND DATE(reg_dt)=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",WEEK(reg_dt))=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",MONTH(reg_dt)) = #reg_dt#
)x
LEFT JOIN tbl_db_nutrient dn ON x.db_dn_no=dn.dn_no
@@ -1244,10 +1284,10 @@
and db_dn_tp ='sf'
- AND DATE(t.reg_dt) = current_date()-interval 1 day
- AND DATE(t.reg_dt)=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",WEEK(t.reg_dt))=#reg_dt#
- AND CONCAT(YEAR(t.reg_dt),"/",MONTH(t.reg_dt)) = #reg_dt#
+ AND DATE(reg_dt) = current_date()-interval 1 day
+ AND DATE(reg_dt)=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",WEEK(reg_dt))=#reg_dt#
+ AND CONCAT(YEAR(reg_dt),"/",MONTH(reg_dt)) = #reg_dt#
)x
LEFT JOIN tbl_db_sf_commerce dn ON dn.dbc_no = x.db_dn_no