From e1002544857df89a272d3de433ace73c8f6da5fa Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Mon, 9 May 2022 23:21:02 +0900
Subject: [PATCH] =?UTF-8?q?1.=20D-Day=20=EC=97=86=EC=9D=84=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EB=A7=81=ED=81=AC=20=EB=90=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=202.=20=EA=B0=84=EC=8B=9D=EA=B8=B0=EB=A1=9D?=
 =?UTF-8?q?=EC=A0=9C=ED=92=88=20=ED=99=88=EC=A0=95=EB=B3=B4=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 30 +++++++-------
 .../com.backoffice.m.bf_daily_nutrition.xml   | 13 +++++-
 .../memory/com.backoffice.m.memory.memory.xml | 12 +++++-
 .../WEB-INF/views/ftl/m/index/index.ftl       | 40 +++++++++++--------
 4 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 934d4fe..54abce2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="연동완료후 이동 URL 수정">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="연동완료후 이동 URL 수정-2">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <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" />
+      <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/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -254,14 +255,8 @@
       <workItem from="1651850876348" duration="8000" />
       <workItem from="1651995870891" duration="2261000" />
       <workItem from="1652058308312" duration="456000" />
-      <workItem from="1652060536329" duration="2801000" />
-    </task>
-    <task id="LOCAL-00016" summary="카카오,네이버 로그인 연동 설정 - 개발사이트(가온앤 아이디)">
-      <created>1649163766799</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1649163766799</updated>
+      <workItem from="1652060536329" duration="3124000" />
+      <workItem from="1652100883750" duration="4593000" />
     </task>
     <task id="LOCAL-00017" summary="데이터 연동작업">
       <created>1649174166224</created>
@@ -599,7 +594,14 @@
       <option name="project" value="LOCAL" />
       <updated>1652066405558</updated>
     </task>
-    <option name="localTasksCounter" value="65" />
+    <task id="LOCAL-00065" summary="연동완료후 이동 URL 수정-2">
+      <created>1652066536512</created>
+      <option name="number" value="00065" />
+      <option name="presentableId" value="LOCAL-00065" />
+      <option name="project" value="LOCAL" />
+      <updated>1652066536512</updated>
+    </task>
+    <option name="localTasksCounter" value="66" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -619,7 +621,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="d-day 체크리스트 사항 수정" />
     <MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
     <MESSAGE value="- 체크리스트 오류사항 수정" />
     <MESSAGE value="- 기본음악파일 삭제불가처리" />
@@ -644,6 +645,7 @@
     <MESSAGE value="메모리 &gt; 주간 중복 동일 카테고리 간격제거" />
     <MESSAGE value="연동계정 취소하기시 확인 창" />
     <MESSAGE value="연동완료후 이동 URL 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="연동완료후 이동 URL 수정" />
+    <MESSAGE value="연동완료후 이동 URL 수정-2" />
+    <option name="LAST_COMMIT_MESSAGE" value="연동완료후 이동 URL 수정-2" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index ddeae49..e0e69dd 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
@@ -391,9 +391,18 @@
 					 )
 					 WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
 					 (
-						SELECT ifnull(concat(ifnull(tn.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취'),'')
+						SELECT
+							concat(
+									case
+										when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
+										when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
+										end
+									,' '
+									,tn1.eat_qty, 'ml 섭취'
+								)
 						FROM tbl_bf_daily_nutrition_3 tn1 
-						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no 
+					    LEFT OUTER JOIN tbl_db_nutrient tb ON tn1.db_dn_no = tb.dn_no
+						LEFT OUTER JOIN tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
 						WHERE tn1.dn_no = x.dn_no
 					 )
 					 WHEN cis_1.cd_no = 'BF_NU_TP_5' THEN
diff --git a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
index d157d0c..4312c2c 100644
--- a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
+++ b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
@@ -242,9 +242,17 @@
 					)
 				when c.cd_no = 'BF_NU_TP_3' THEN
 					(select
-						 concat(ifnull(tn.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취')
+						 concat(
+								 case
+									 when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
+									 when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
+									 end
+							 ,' '
+							 ,tn1.eat_qty, 'ml 섭취'
+							 )
 					 from tbl_bf_daily_nutrition_3 tn1
-							  left outer join tbl_db_nutrient tn on tn1.db_dn_no = tn.dn_no
+					 left outer join tbl_db_nutrient tb on tn1.db_dn_no = tb.dn_no
+					 left outer join tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
 					 where tn1.dn_no = b.dn_no
 					)
 				when c.cd_no = 'BF_NU_TP_5' THEN
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
index ac09378..9f2ff63 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
@@ -88,48 +88,45 @@
 													<h2>${item['name']!} (${item['gender_ko']!})</h2>
 													<p>${(item['past_day'])!}일 (${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일/${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)</p>
 													<p class="d_day">
+
+													<#if item['d_day_year']? has_content>
+														<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
+													<#else>
+														<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day">
+													</#if>
+
 														<#if item['day100'] gt 0>
 															<#if item['diff_d_day'] gt item['day100'] || item['diff_d_day'] lt 0>
 																100일 D-${(item['day100'])!}일,${item['day100date']!}
 															<#elseif item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
 															</#if>
 														<#elseif item['day200'] gt 0>
 															<#if item['diff_d_day'] gt item['day200'] || item['diff_d_day'] lt 0>
 																200일 D-${(item['day200'])!}일,${item['day200date']!}
 															<#elseif item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
 															</#if>
 														<#elseif item['day300'] gt 0>
 															<#if item['diff_d_day'] gt item['day300'] || item['diff_d_day'] lt 0>
 																300일 D-${(item['day300'])!}일,${item['day300date']!}
 															<#elseif item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
 															</#if>
 														<#elseif item['day365'] gt 0>
 															<#if item['diff_d_day'] gt item['day365'] || item['diff_d_day'] lt 0>
 																첫돌 D-${(item['day365'])!}일,${item['day365date']!}
 															<#elseif item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
 															</#if>
 														<#elseif item['day365'] lt 0>
 															<#if item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
 															<#else>
 																설정된 D-Day가 없습니다.
 															</#if>
 														</#if>
-
+														</a>
 													</p>
 												</div>
 												<div class="main_pofile_img">
@@ -373,7 +370,7 @@
 	var smc_index = 0;
 
 	<#if (model['lm_child'])?has_content>
-		smc_index = parseInt("${model['smc_index']}");
+	smc_index = parseInt("${model['smc_index']}");
 	</#if>
 
 	// main_pofile_slider 프로필 슬라이드
@@ -508,6 +505,15 @@
 			clickable: true
 		},
 	});
+
+	function fncGoDday(d_day_year, d_day_month) {
+		if(d_day_year == null) {
+			location.href = "${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day";
+		} else {
+			location.href = "${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=" + d_day_year + "&viewMonth=" + d_day_month;
+		}
+
+	}
 </script>