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

Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf.git into devs

Browse Source
dev_bert
kyebyungha 3 years ago
parent a01e2c001b be752ab7f1
commit 11acbaf654
5 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File

45
.idea/workspace.xml
Unescape View File

@ -9,10 +9,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. 젖병 기록 수정">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="기록정보 홈화면 표시오류 수정">
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -256,21 +255,7 @@
<workItem from="1652058308312" duration="456000" />
<workItem from="1652060536329" duration="3124000" />
<workItem from="1652100883750" duration="5459000" />
<workItem from="1652321382844" duration="2559000" />
</task>
<task id="LOCAL-00020" summary="index_bottom 공유관련 html 스크립트 분리-2">
<created>1649339670142</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1649339670142</updated>
</task>
<task id="LOCAL-00021" summary="D-Day 관리기능 적용">
<created>1649494087226</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1649494087226</updated>
<workItem from="1652321382844" duration="7258000" />
</task>
<task id="LOCAL-00022" summary="D-Day 관리기능 적용-2">
<created>1649519729954</created>
@ -601,7 +586,21 @@
<option name="project" value="LOCAL" />
<updated>1652323538976</updated>
</task>
<option name="localTasksCounter" value="69" />
<task id="LOCAL-00069" summary="유축수유표시 오류 수정">
<created>1652324219016</created>
<option name="number" value="00069" />
<option name="presentableId" value="LOCAL-00069" />
<option name="project" value="LOCAL" />
<updated>1652324219016</updated>
</task>
<task id="LOCAL-00070" summary="기록정보 홈화면 표시오류 수정">
<created>1652340136434</created>
<option name="number" value="00070" />
<option name="presentableId" value="LOCAL-00070" />
<option name="project" value="LOCAL" />
<updated>1652340136434</updated>
</task>
<option name="localTasksCounter" value="71" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -621,8 +620,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="소셜회원가입 오류수정" />
<MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
<MESSAGE value="아이디 저장기능 적용" />
<MESSAGE value="체크리스트 오류 수정" />
<MESSAGE value="계정연동 취소하기 기능적용-1" />
@ -646,6 +643,8 @@
<MESSAGE value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
<MESSAGE value="1. 남은 작업 기록&#10;2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정" />
<MESSAGE value="1. 젖병 기록 수정" />
<option name="LAST_COMMIT_MESSAGE" value="1. 젖병 기록 수정" />
<MESSAGE value="유축수유표시 오류 수정" />
<MESSAGE value="기록정보 홈화면 표시오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="기록정보 홈화면 표시오류 수정" />
</component>
</project>

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

@ -379,12 +379,14 @@
WHEN cis_1.cd_no = 'BF_NU_TP_1' THEN
(
SELECT ifnull(concat(ifnull(eat_qty,0), 'ml'),'') FROM tbl_bf_daily_nutrition_1 tn1
INNER JOIN tbl_db_nutrient tn on tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_2' THEN
(
SELECT ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
SELECT
case when tn1.milk_tp = 87 then ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
else ifnull(concat('유축수유', ' ', eat_qty, 'ml'),'')
end
FROM tbl_bf_daily_nutrition_2 tn1
LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no and tn1.milk_tp = 87
WHERE tn1.dn_no = x.dn_no
@ -413,7 +415,6 @@
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
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_6' THEN
@ -424,7 +425,6 @@
ifnull(tn2.title,'')
)
FROM tbl_bf_daily_nutrition_6 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
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
)
@ -432,7 +432,6 @@
(
SELECT ifnull(tv.dv_disease,'')
FROM tbl_bf_daily_nutrition_7 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
INNER JOIN tbl_db_vac_schedule tn2 on tn1.db_dvs_no = tn2.dvs_no
INNER JOIN tbl_db_vac tv on tn2.dv_no = tv.dv_no
WHERE tn1.dn_no = x.dn_no
@ -449,7 +448,6 @@
tn1.eat_qty, 'ml 섭취'
)
FROM tbl_bf_daily_nutrition_9 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
LEFT OUTER JOIN tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
WHERE tn1.dn_no = x.dn_no
@ -463,7 +461,6 @@
when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '')
end , tn1.eat_qty, 'ml 섭취' )
FROM tbl_bf_daily_nutrition_10 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no
LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no
WHERE tn1.dn_no = x.dn_no
@ -472,35 +469,30 @@
(
SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사:', doctor_nm, ', 증상: ', checkup),'')
FROM tbl_bf_daily_nutrition_11 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_12' THEN
(
SELECT ifnull(daily_life, '')
FROM tbl_bf_daily_nutrition_12 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_13' THEN
(
SELECT achievement
FROM tbl_bf_daily_nutrition_13 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_14' THEN
(
SELECT ifnull(concat(ifnull(blq + brq,0), 'ml'),'')
FROM tbl_bf_daily_nutrition_14 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_15' THEN
(
SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,''))
FROM tbl_bf_daily_nutrition_15 tn1
INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
END AS time_val
@ -529,8 +521,7 @@
AND x.nutirition_cd_no != ''
) x
LEFT JOIN tbl_code_item_str cis_1 ON cis_1.cd_no = x.nutirition_cd_no ) z
WHERE z.time_val is not null
ORDER BY dn_no DESC
ORDER BY dn_no DESC
</select>
<select id="select_bf_daily_nutrition_list_count" resultClass="Integer" parameterClass="dataMap">

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

@ -235,7 +235,10 @@
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_2' THEN
(select ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
(select
case when tn1.milk_tp = 87 then ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
else ifnull(concat('유축수유', ' ', eat_qty, 'ml'),'')
end
from tbl_bf_daily_nutrition_2 tn1
left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no and tn1.milk_tp = 87
WHERE tn1.dn_no = b.dn_no

2
src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl
Unescape View File

@ -5,7 +5,7 @@
<div class="wrap">
<header class="header_wrapper">
<a href="javascript:back.return_url();" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">아기 정보 등록</h1>
<h1 class="header_title"><#if item??>아기 정보 변경<#else>아기 정보 등록</#if></h1>
<a href="#" class="side_Rbtn hidden"></a>
</header>
<main class="m_child_profile" id="top_move">

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl
Unescape View File

@ -15,7 +15,7 @@
<a href="${URL_ROOT}/m/member_env/setting_nm.do?return_url=setting&view_nm=view_set_account" class="more_item">계정 관리</a>
</div>
<div class="list_item">
<a href="${URL_ROOT}/m/bf_family_baby/list_bf_family_baby.do?return_url=setting" class="more_item">아기 정보 변경</a>
<a href="${URL_ROOT}/m/bf_family_baby/list_bf_family_baby.do?return_url=setting" class="more_item">아기정보 입력/변경</a>
</div>
</div>

Write Preview
Loading…
Cancel
Save