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

육아기록 대표이미지 및 영양소 산정 계산

Browse Source
dev_bert
kyebyungha 3 years ago
parent 946c925766
commit b9066bafb2
4 changed files with 97 additions and 49 deletions
Show Stats Download Patch File Download Diff File

23
src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java
Unescape View File

@ -266,7 +266,7 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B
dm.put("file_tp", "10"); //육아기록
dm.put("rep_img_yn", "N");
//generalDAO.delete("delete_bf_daily_nutrition_img_by_b_no", dm); //삭제
generalDAO.delete("delete_bf_daily_nutrition_img_by_b_no", dm); //삭제
if(paramMap.get("share_tp").equals("Y") ) {
generalDAO.insert("insert_bf_daily_baord", paramMap);
@ -287,25 +287,26 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B
generalDAO.insert("insert_bf_daily_nutrition_img_by_b_no", dm);
}
}
dm.put("rep_img_yn", "Y");
dm.put("file_seq", paramMap.get("append_src_img_file"));
generalDAO.update("update_bf_daily_nutrition_img_by_b_no", dm); //대표 이미지수정
/*
if(paramMap.get("list_mt_file_seq") !=null) { //기존첨부파일
list_file_key = (ArrayList) paramMap.get("list_mt_file_seq");
if(list_file_key.size()>0) {
dm.put("dn_no", paramMap.get("dn_no"));
for(int idx = 0; idx < list_file_key.size(); idx++){
dm.put("file_seq", list_file_key.get(idx));
if(paramMap.get("share_tp").equals("Y") ) {
generalDAO.insert("insert_bf_board_img_by_b_no", dm);
if(!M_Util.null2Str(list_file_key.get(idx),"").equals("") ) {
dm.put("file_seq", list_file_key.get(idx));
if(paramMap.get("share_tp").equals("Y") ) {
generalDAO.insert("insert_bf_board_img_by_b_no", dm);
}
generalDAO.insert("insert_bf_daily_nutrition_img_by_b_no", dm);
}
generalDAO.insert("insert_bf_daily_nutrition_img_by_b_no", dm);
}
}
}
*/
dm.put("rep_img_yn", "Y");
dm.put("file_seq", paramMap.get("append_src_img_file"));
generalDAO.update("update_bf_daily_nutrition_img_by_b_no", dm); //대표 이미지수정
ArrayList list_hosp_file_key = (ArrayList) paramMap.get("list_hosp_file_key");

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

@ -1223,6 +1223,7 @@
and DATE(t.reg_dt) = current_date()
WHERE t.smc_no=#smc_no#
AND t.db_dhb_no IS NOT NULL
AND t.db_dhb_tp ='bf'
<!-- AND weight<![CDATA[>]]>0 -->
<isNotEmpty property="scope">
<isEqual property="scope" compareValue="yday">AND DATE(t.reg_dt) = current_date()-interval 1 day</isEqual>
@ -1237,6 +1238,7 @@
LEFT JOIN tbl_db_home_bf_ingre dbi ON dbi.dhb_cd = di.dhb_cd AND dbi.di_name=di.di_name
GROUP BY x.dn_no
)
UNION ALL
(
SELECT
@ -1282,6 +1284,7 @@
and DATE(t.reg_dt) = DATE(b.reg_dt)
WHERE t.smc_no=#smc_no#
AND t.db_dbc_no IS NOT NULL
AND t.db_dbc_tp ='bf'
<!-- AND t.weight<![CDATA[>]]>0 -->
<isNotEmpty property="scope">
<isEqual property="scope" compareValue="yday">AND DATE(t.reg_dt) = current_date()-interval 1 day</isEqual>
@ -1338,6 +1341,7 @@
and DATE(t.reg_dt) = current_date()
WHERE t.smc_no=#smc_no#
AND t.db_dn_no IS NOT NULL
AND t.db_dn_tp ='bf'
<!-- AND weight<![CDATA[>]]>0 -->
<isNotEmpty property="scope">
<isEqual property="scope" compareValue="yday">AND DATE(t.reg_dt) = current_date()-interval 1 day</isEqual>
@ -1348,6 +1352,63 @@
)x
LEFT JOIN tbl_db_nutrient dn ON x.db_dn_no=dn.dn_no
)
UNION ALL
(
SELECT
x.reg_dt
,ROUND(0*x.weight,2) AS enerc
,ROUND(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
,ROUND(nvl(dn.dietary_fiber,0)*x.weight,2) AS fibtg
,ROUND(nvl(dn.salt,0)*x.weight,2) AS na
,ROUND(nvl(dn.vitaminb1,0)*x.weight,2) AS vitaminb1
,ROUND(nvl(dn.vitaminb2,0)*x.weight,2) AS vitaminb2
,ROUND(nvl(dn.niacin,0)*x.weight,2) AS niacin
,ROUND(nvl(dn.calcium,0)*x.weight,2) AS ca
,ROUND(nvl(dn.potassium,0)*x.weight,2) AS k
,ROUND(nvl(dn.steel,0)*x.weight,2) AS fe
,ROUND(nvl(dn.vitamina,0)*x.weight,2) AS vitamina
,ROUND(nvl(dn.vitaminc,0)*x.weight,2) AS vitaminc
,ROUND(nvl(dn.vitamind,0)*x.weight,2) AS vitamind
,ROUND(nvl(dn.vitamine,0)*x.weight,2) AS vitamine
,ROUND(nvl(dn.zinc,0)*x.weight,2) AS zn
,0 AS dqi_food_1
,0 AS dqi_food_2
,IF(dn.bean = 'Y', ROUND(dn.srv*x.weight,2),0) AS dqi_food_3
,IF(dn.grain = 'Y', ROUND(dn.srv*x.weight,2),0) AS dqi_food_4
,0 AS dqi_food_5
,0 AS dqi_food_6
,IF(dn.vegetable = 'Y', ROUND(dn.srv*x.weight,2),0) AS dqi_food_7
,IF(dn.fruit = 'Y', ROUND(dn.srv*x.weight,2),0) AS dqi_food_8
,0 AS dqi_food_9
,0 AS dqi_food_10
,IF(dn.dairy = 'Y', ROUND(dn.srv*x.weight,2),0) AS dqi_food_11
,0 AS dqi_food_12
FROM (
SELECT t.dn_no
,t.db_dn_no
,t.reg_dt
,nvl(b.weight,1) as weight
FROM tbl_bf_daily_nutrition_3 t
left join tbl_bf_growth_body b
on t.smc_no = b.smc_no
and DATE(t.reg_dt) = DATE(b.reg_dt)
and DATE(t.reg_dt) = current_date()
WHERE t.smc_no=#smc_no#
AND t.db_dn_no IS NOT NULL
AND T.db_dn_tp = 'sf'
<!-- AND weight<![CDATA[>]]>0 -->
<isNotEmpty property="scope">
<isEqual property="scope" compareValue="yday">AND DATE(t.reg_dt) = current_date()-interval 1 day</isEqual>
<isEqual property="scope" compareValue="day">AND DATE(t.reg_dt)=#reg_dt#</isEqual>
<isEqual property="scope" compareValue="week">AND CONCAT(YEAR(t.reg_dt),"/",WEEK(t.reg_dt))=#reg_dt#</isEqual>
<isEqual property="scope" compareValue="month">AND CONCAT(YEAR(t.reg_dt),"/",MONTH(t.reg_dt)) = #reg_dt#</isEqual>
</isNotEmpty>
)x
LEFT JOIN tbl_db_sf_commerce dn ON x.db_dn_no=dn.dbc_no
)
UNION ALL
(
SELECT
@ -1385,13 +1446,13 @@
FROM (
SELECT dn_no
,db_dn_no
,eat_qty
,rem
,ROUND((eat_qty-rem)/100,2) AS weight
,nvl(eat_qty,0) eat_qty
,nvl(rem,0) as rem
,ROUND((nvl(eat_qty,0)-nvl(rem,0))/100,2) AS weight
,reg_dt
FROM tbl_bf_daily_nutrition_2
WHERE smc_no=#smc_no#
AND (eat_qty-rem)<![CDATA[>]]>0
AND (nvl(eat_qty,0)-nvl(rem,0))<![CDATA[>]]>0
AND db_dn_no IS NOT NULL
<isNotEmpty property="scope">
<isEqual property="scope" compareValue="yday">AND DATE(reg_dt) = current_date()-interval 1 day</isEqual>

36
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl
Unescape View File

@ -168,33 +168,19 @@
$("#append_src_img_file"+imgSeq).val('');
$('#img_preview'+imgSeq).attr('src', "${URL_ROOT}/m/img/main/main_cont_img_camera.png");
$(this).hide();
// 파일이 번호가 있으면 삭제
if( $('#mt_file_seq'+imgSeq).val() !="") {
$.ajax({
url:'${URL_ROOT}/m/bf_daily_nutrition/ajax_delete_bf_daily_nutrition_img.do?1=1',
type:'get',
data: {
"dn_no" : ${model['rm']['dn_no']!}
,"file_tp" : '10'
,"file_seq": $('#mt_file_seq'+imgSeq).val()
,"repReordImg" : $('#repReordImg').val()
},
dataType:'json',
error:function(request,status,error){
console.log(status);
is_loading = false;
},
success:function(result){
console.log(result);
is_loading = false;
}
});
}
$('#mt_file_seq'+imgSeq).val('');
});
$(".bi-star-fill").on('click', function () {
$("#repReordImg").val(Number(this.parentNode.htmlFor.replace('append_src_img_star0','')));
var imgSeq = Number(this.parentNode.htmlFor.replace('append_src_img_star0',''));
if($("#img_preview0"+imgSeq).attr("src").indexOf("main_cont_img_camera.png") >-1) {
Swal.fire({text: '대표이미지 먼저 업로드 해 주세요.'}).then((result) => {
$("#append_src_img_star0"+ $("#repReordImg").val())[0].checked = true;
$("#append_src_img_star0"+ imgSeq)[0].checked = false;
});
return;
}
$("#repReordImg").val(imgSeq);
$("#append_src_img_file").val($("#mt_file_seq0"+imgSeq).val());
});
// nutrition_camera 이미지 업로드

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

@ -233,21 +233,20 @@
var frmCommerce = {
init: function(){
SNUtil.initInputAction()
/*
$('#frmCommerce').on('submit',function(e){
if (!SNValidator.validateWithAlert('#frmCommerce')) {
if (!SNValidator.validateWithAlert('#frmCommerce')) {
e.preventDefault()
return;
}
}
this.ajax_insert_home()
e.preventDefault()
return;
}.bind(this))
*/
},
/*
ajax_insert_home: function(){
var data = {}
@ -270,15 +269,15 @@
console.log(result)
var RESULT = result.RESULT
if(RESULT == 0){ //0:RESULT_SUCCESS
debugger;
Swal.fire({text:"입력되었습니다"}).then((result) => { location.replace('./view_bf_commerce_input.do?smc_no=${(model["smc_no"])!}') })
Swal.fire({text:"입력되었습니다"}).then((result) => { location.replace('./view_bf_commerce_input.do?smc_no=${(model["smc_no"])!}'); })
}else{
Swal.fire({text:"등록되지 않았습니다"})
}
},
})
},
*/
ajax_delete_lac_commerce: function(df_no){
if(!df_no){return}
@ -368,6 +367,7 @@
if(RESULT == 0){ //0:RESULT_SUCCESS
$('#popup_self2').removeClass('open');
$("#db_dhb_no").val(result.dhb_no);
$("#prd_nm").text($("#prd_nm_sch2").val());
Swal.fire({text:"입력되었습니다"});
}else{
Swal.fire({text:"등록되지 않았습니다"});

Write Preview
Loading…
Cancel
Save