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

이유식레시피, 시판이유식 자동검색 적용

Browse Source
dev_bert
jonghwan76 3 years ago
parent 0f1ef5dd79
commit 91915f2640
7 changed files with 62 additions and 35 deletions
Show Stats Download Patch File Download Diff File

32
.idea/workspace.xml
Unescape View File

@ -9,17 +9,14 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="부모정보 입력 생년월일표시오류 수정">
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week_20220327.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/runConfigurations.xml" beforeDir="false" />
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="한글파일명 음악파일 업로드이슈 수정">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.sms.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.sms.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -191,6 +188,9 @@
<workItem from="1648230232646" duration="27000" />
<workItem from="1648280563733" duration="10279000" />
<workItem from="1648351480256" duration="22180000" />
<workItem from="1648430275073" duration="49000" />
<workItem from="1648430348136" duration="702000" />
<workItem from="1648431787209" duration="7761000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -227,7 +227,14 @@
<option name="project" value="LOCAL" />
<updated>1648370835819</updated>
</task>
<option name="localTasksCounter" value="6" />
<task id="LOCAL-00006" summary="한글파일명 음악파일 업로드이슈 수정">
<created>1648391088065</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1648391088065</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -252,6 +259,7 @@
<MESSAGE value="메인페이지 챗봇 관련 수정" />
<MESSAGE value="아이 사진 업로드 오류" />
<MESSAGE value="SNS 탈퇴 로그인 불가 처리 메시지" />
<option name="LAST_COMMIT_MESSAGE" value="SNS 탈퇴 로그인 불가 처리 메시지" />
<MESSAGE value="한글파일명 음악파일 업로드이슈 수정" />
<option name="LAST_COMMIT_MESSAGE" value="한글파일명 음악파일 업로드이슈 수정" />
</component>
</project>

27
src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
Unescape View File

@ -361,6 +361,7 @@
<select id="select_bf_daily_nutrition_list_by_day" resultClass="dataMap" parameterClass="dataMap">
SELECT x.*
,(select group_concat(tm.memo) from tbl_bf_daily_nutrition_memo tm where tm.dn_no = x.dn_no) as memo
,REPLACE(append_src_img_file.mt_file_local_url, '/cdn001/', '') AS append_src_img_file_url
,REPLACE(append_src_img_file.mt_file_nm, '/cdn001/', '') AS append_src_img_file_nm
,REPLACE(append_300_img_file.mt_file_local_url, '/cdn001/', '') AS append_300_img_file_url
@ -381,15 +382,27 @@
FROM tbl_bf_daily_nutrition_3 tn1 left outer join tbl_db_nutrient tn on tn1.db_dn_no = tn.dn_no WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_5' THEN
(
SELECT ifnull(concat( (ifnull(sleep_h,0) - ifnull(sleep_s_h,0)), '시 ', (ifnull(sleep_m,0) - ifnull(sleep_s_m,0)), '분'), '')
FROM tbl_bf_daily_nutrition_5 tn1 WHERE tn1.dn_no = x.dn_no
( SELECT
concat(
(case when sleep_tp = 15 then '낮잠' when sleep_tp = 16 then '밤잠' end),
' ',
ifnull(concat( (ifnull(sleep_h,0) - ifnull(sleep_s_h,0)), '시 ', (ifnull(sleep_m,0) - ifnull(sleep_s_m,0)), '분'), '')
)
FROM tbl_bf_daily_nutrition_5 tn1
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_6' THEN
(
SELECT ifnull(tn2.title,'') FROM tbl_bf_daily_nutrition_6 tn1
INNER JOIN tbl_code_item_str tn2 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
WHERE tn1.dn_no = x.dn_no
( SELECT
concat(
(case when rest_tp = 19 then '대변량' when rest_tp = 20 then '소변량' end),
' ',
ifnull(tn2.title,'')
)
FROM tbl_bf_daily_nutrition_6 tn1
INNER JOIN tbl_code_item_str tn2
on tn2.cg_cd = 'BF_FECES_QTY'
and tn1.rest_qty = tn2.val_1
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_7' THEN
(

2
src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
Unescape View File

@ -126,7 +126,7 @@
WHERE a.smc_no = #smc_no#
and b.reg_dt between STR_TO_DATE(#startDate#, '%Y-%m-%d %H:%i:%s') and STR_TO_DATE(#endDate#, '%Y-%m-%d %H:%i:%s')
GROUP BY DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H:%i:')
ORDER BY b.reg_dt
ORDER BY add_degree desc
) XA
</select>

15
src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl
Unescape View File

@ -22,7 +22,7 @@
<div class="swiper-wrapper">
<div class="swiper-slide active">
<a href="#foodInfo_subMain_list01">전체</a>
<p>간편하게 먹는 건강한 이유식</p>
<p>간편하게 먹는 건강한 이유식1</p>
</div>
<!--<div class="swiper-slide">
<a href="#foodInfo_subMain_list01">전체</a>
@ -104,12 +104,13 @@
}
$(document).ready(function(){
$('#prd_nm').autocomplete({
minLength: 1,
source: function call_ajax(){
list_more('Y');
}
});
$("#prd_nm").keyup(function() { list_more('Y'); });
// $('#prd_nm').autocomplete({
// minLength: 1,
// source: function call_ajax(){
// list_more('Y');
// }
// });
});
function ajax_data(keyword){

13
src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl
Unescape View File

@ -111,12 +111,13 @@
}
$(document).ready(function(){
$('#prd_nm').autocomplete({
minLength: 1,
source: function call_ajax(){
list_more('Y');
}
});
$("#prd_nm").keyup(function() { list_more('Y'); });
// $('#prd_nm').autocomplete({
// minLength: 1,
// source: function call_ajax(){
// list_more('Y');
// }
// });
});
function ajax_data(keyword){

4
src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
Unescape View File

@ -224,7 +224,8 @@
<div class="img_preview">
<#if (item['nutirition_cd_no_title'])?has_content>
<#assign nutirition_cd_no_title = item['nutirition_cd_no_title']>
<#assign time_text = item['time_val']!>
<#assign memo = item['memo']!>
<#assign time_text = item['time_val']!>
</#if>
<img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/child/child_pic_02.png</#if>" alt="사진영역">
</div>
@ -237,6 +238,7 @@
<div class="info_recode" onclick="location.href='${URL_ROOT}/m/bf_daily_nutrition/view_bf_daily_nutrition.do?dn_no=${item['dn_no']}'">
<p>기록내용</p>
<span>
${memo}<br/>
${time_text}
</span>
</div>

4
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl
Unescape View File

@ -58,9 +58,11 @@
<div class="chart memory_daily_chart" data-percent="62.5">
<div class="container">
<#assign idx = 0>
<!-- conic-gradient(from 시작각도deg, 색상, 범위각도deg, 배경색(투명) 0) -->
<#list model['time_list'] as item>
<div class="data" title="${item.title}" style="background: conic-gradient(from ${item['start_degree']!}deg, #${item['category']!} ${item['add_degree']!}deg, #00ff0000 0)"></div>
<#assign idx = idx + 1>
<div class="data" title="${item.title}" style="z-index:${idx};background: conic-gradient(from ${item['start_degree']!}deg,#${item['category']!} ${item['add_degree']!}deg, #00ff0000 0)"></div>
</#list>
<span class="center"></span>
</div>

Write Preview
Loading…
Cancel
Save