java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

식품군 점수 수정

Browse Source
dev_bert
kyebyungha 3 years ago
parent 1c8383bda7
commit 05c6724019
5 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File

41
src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml
Unescape View File

@ -1066,15 +1066,15 @@
,ROUND(dbc.vitamind*x.weight,2) AS vitamind
,ROUND(dbc.vitamine*x.weight,2) AS vitamine
,ROUND(dbc.zinc*x.weight,2) AS zn
,IF(dbc.grain IS NULL, 0, ROUND(dbc.grain*x.weight,2)) AS dqi_food_1
,IF(dbc.vegetable IS NULL, 0, ROUND(dbc.vegetable*x.weight,2)) AS dqi_food_2
,IF(dbc.fruit IS NULL, 0, ROUND(dbc.fruit*x.weight,2)) AS dqi_food_3
,IF(dbc.meat IS NULL, 0, ROUND(dbc.meat*x.weight,2)) AS dqi_food_4
,IF(dbc.poultry IS NULL, 0, ROUND(dbc.poultry*x.weight,2)) AS dqi_food_5
,IF(dbc.seafood IS NULL, 0, ROUND(dbc.seafood*x.weight,2)) AS dqi_food_6
,IF(dbc.turbulence IS NULL, 0, ROUND(dbc.turbulence*x.weight,2)) AS dqi_food_7
,IF(dbc.dairy IS NULL, 0, ROUND(dbc.dairy*x.weight,2)) AS dqi_food_8
,IF(dbc.bean IS NULL, 0, ROUND(dbc.bean*x.weight,2)) AS dqi_food_9
,IF(dbc.grain = 'Y', ROUND(dbc.srv*x.weight,2),0) AS dqi_food_1
,IF(dbc.vegetable = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_2
,IF(dbc.fruit = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_3
,IF(dbc.meat = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_4
,IF(dbc.poultry = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_5
,IF(dbc.seafood = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_6
,IF(dbc.turbulence = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_7
,IF(dbc.dairy = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_8
,IF(dbc.bean = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_9
,0 AS dqi_food_10
,0 AS dqi_food_11
,0 AS dqi_food_12
@ -1360,7 +1360,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
@ -1375,8 +1375,7 @@
FROM (
SELECT t.dn_no
,b.weight
,t.srv
,t.rem
,t.eat_qty
,t.reg_dt
FROM tbl_bf_daily_nutrition_1 t
left join tbl_bf_growth_body b
@ -1621,15 +1620,15 @@
,ROUND(dbc.vitamind*x.weight,2) AS vitamind
,ROUND(dbc.vitamine*x.weight,2) AS vitamine
,ROUND(dbc.zinc*x.weight,2) AS zn
,IF(dbc.grain IS NULL, 0, ROUND(dbc.grain*x.weight,2)) AS dqi_food_1
,IF(dbc.vegetable IS NULL, 0, ROUND(dbc.vegetable*x.weight,2)) AS dqi_food_2
,IF(dbc.fruit IS NULL, 0, ROUND(dbc.fruit*x.weight,2)) AS dqi_food_3
,IF(dbc.meat IS NULL, 0, ROUND(dbc.meat*x.weight,2)) AS dqi_food_4
,IF(dbc.poultry IS NULL, 0, ROUND(dbc.poultry*x.weight,2)) AS dqi_food_5
,IF(dbc.seafood IS NULL, 0, ROUND(dbc.seafood*x.weight,2)) AS dqi_food_6
,IF(dbc.turbulence IS NULL, 0, ROUND(dbc.turbulence*x.weight,2)) AS dqi_food_7
,IF(dbc.dairy IS NULL, 0, ROUND(dbc.dairy*x.weight,2)) AS dqi_food_8
,IF(dbc.bean IS NULL, 0, ROUND(dbc.bean*x.weight,2)) AS dqi_food_9
,IF(dbc.grain ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_1
,IF(dbc.vegetable ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_2
,IF(dbc.fruit ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_3
,IF(dbc.meat ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_4
,IF(dbc.poultry ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_5
,IF(dbc.seafood ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_6
,IF(dbc.turbulence ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_7
,IF(dbc.dairy ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_8
,IF(dbc.bean ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_9
,0 AS dqi_food_10
,0 AS dqi_food_11
,0 AS dqi_food_12

10
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl
Unescape View File

@ -390,7 +390,7 @@
},
go_popup_self4: function() {
$('#popup_self3').removeClass('open');
this.ajax_insert_self()
this.ajax_insert_self();
},
ajax_insert_self: function(){
var self = {}
@ -456,6 +456,14 @@
// form Data 객체 생성
formData.append("attachedImage",img.files[0]);
formData.append('fileData',JSON.stringify(self));
if($('#menu_nm').val() =="") {
Swal.fire({text:"이유식명이 입력되지 않았습니다"});
return;
}
if($('#srv_self').val() =="") {
Swal.fire({text:"몇 인분인지? 입력되지 않았습니다"});
return;
}
$.ajax({
url:'${URL_ROOT}/m/bf_daily_nutrition/ajax_insert_self.do?1=1',

8
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl
Unescape View File

@ -267,8 +267,12 @@
console.log("last-child select");
});
<#if model['rm']['milk_tp'] == 88>
$(".milk_input").hide();
<#if model['rm']['milk_tp']? has_content >
<#if model['rm']['milk_tp']! == 88>
$(".milk_input").hide();
</#if>
<#else>
</#if>
function save_set(col, val, title){

1
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl
Unescape View File

@ -223,7 +223,6 @@
<script type="text/javascript">
var frmCommerce = {
init: function(){
SNUtil.initInputAction()

2
src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl
Unescape View File

@ -97,6 +97,7 @@
<!-- nutrition_subMain_suggest -->
<div class="nutrition_subMain_suggest">
<h2>영양추천</h2>
<!--
<div class="nutrition_subMain_suggest_in">
<h3>연관제품</h3>
<ul class="nutrition_subMain_suggest_list">
@ -132,6 +133,7 @@
</li>
</ul>
</div>
-->
<div class="nutrition_subMain_suggest_in">
<h3>연관식재료</h3>
<ul class="nutrition_subMain_suggest_list">

Write Preview
Loading…
Cancel
Save