From 79019bccb0f77f37684f1d27a2e3ce49e5649821 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Mon, 18 Apr 2022 23:40:37 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=9C=A0=EC=8B=9D=EB=8B=B9=20?=
 =?UTF-8?q?=ED=99=88=20=EA=B8=B0=EB=A1=9D=EC=9D=B4=EB=AF=B8=EC=A7=80=20?=
 =?UTF-8?q?=EB=85=B8=EC=B6=9C=EB=B3=80=EA=B2=BD(=EC=B5=9C=EC=B4=88=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=EB=90=9C=EA=B2=83=EC=9C=BC=EB=A1=9C),=20?=
 =?UTF-8?q?=EC=9D=B4=ED=9B=84=EC=97=90=20=EB=8C=80=ED=91=9C=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=95=B4?=
 =?UTF-8?q?=EC=95=BC=ED=95=A8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 29 ++++++++++---------
 .../com.backoffice.m.bf_daily_nutrition.xml   | 28 ++++++++----------
 .../WEB-INF/views/ftl/m/index/index.ftl       |  2 +-
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e4ae13d..c6de2d4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,17 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="회원가입 밸리데이션 및 유효성체크 보완 - 2">
+    <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/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/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.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_phone_confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.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" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.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/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" 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/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" />
@@ -227,7 +221,7 @@
       <workItem from="1650099253570" duration="21674000" />
       <workItem from="1650210956375" duration="846000" />
       <workItem from="1650243545918" duration="874000" />
-      <workItem from="1650278800214" duration="7789000" />
+      <workItem from="1650278800214" duration="13150000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -481,7 +475,14 @@
       <option name="project" value="LOCAL" />
       <updated>1650124395162</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="공유기능 퍼블리싱 및 기능 적용">
+      <created>1650286771669</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1650286771669</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -501,7 +502,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경" />
     <MESSAGE value="닉네임 변경기능 적용" />
     <MESSAGE value="계정 동기화 기능 수정" />
     <MESSAGE value="홈화면 퍼블리싱 기능 적용" />
@@ -526,6 +526,7 @@
     <MESSAGE value="메모리 공유기능 적용 - 카카오, URL복사" />
     <MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완" />
     <MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
-    <option name="LAST_COMMIT_MESSAGE" value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
+    <MESSAGE value="공유기능 퍼블리싱 및 기능 적용" />
+    <option name="LAST_COMMIT_MESSAGE" value="공유기능 퍼블리싱 및 기능 적용" />
   </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 7e87559..6d49e27 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
@@ -366,15 +366,12 @@
 		WHERE 1 = 1
 		  AND x.dn_no = #dn_no#
           AND x.smc_no = #smc_no#       
-    </select>        
-                
-    <select id="select_bf_daily_nutrition_list_by_day" resultClass="dataMap" parameterClass="dataMap">
+    </select>
+
+	<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
-			,REPLACE(append_300_img_file.mt_file_nm, '/cdn001/', '') AS append_300_img_file_nm
+			 ,(select group_concat(tm.memo) from tbl_bf_daily_nutrition_memo tm where tm.dn_no = x.dn_no) as memo
+			 ,(select file_seq from tbl_mt_file tf where mt_file_seq = x.file_seq limit 1) as file_seq
 			,cis_1.title AS nutirition_cd_no_title
 			,(select color_cd from tbl_code_item ts where ts.val_1 = cis_1.cd_no) as color_cd
 			,CASE
@@ -452,14 +449,14 @@
 				 (
 					SELECT ifnull(temperature,'') FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
 				 )
-			END AS time_val
+		END AS time_val
 		FROM
 		(
-			SELECT 
+			SELECT
 				 x.dn_no
-				,x.smc_no				
+				,x.smc_no
 				,DATE_FORMAT(x.baseday, '%Y.%m.%d') AS baseday
-				,x.append_src_img_file
+				,y.file_seq
 				,case
 					 when x.append_300_img_file = 0 then x.append_src_img_file
 					 else x.append_300_img_file
@@ -475,15 +472,14 @@
 					ELSE CONCAT(TIMESTAMPDIFF(MONTH, x.reg_dt, NOW()), '달 전')
 				END AS ago
 			FROM tbl_bf_daily_nutrition x
+			LEFT OUTER JOIN tbl_bf_daily_nutrition_attach y on x.dn_no = y.dn_no
 			WHERE 1 =1
-				AND x.smc_no = #smc_no# 
+				AND x.smc_no = #smc_no#
 				AND x.baseday = #base_dt#
 		) x
-		LEFT JOIN tbl_mt_file append_src_img_file ON x.append_src_img_file = append_src_img_file.mt_file_seq
-		LEFT JOIN tbl_mt_file append_300_img_file ON x.append_300_img_file = append_300_img_file.mt_file_seq
 		LEFT JOIN tbl_code_item_str cis_1 ON cis_1.cd_no = x.nutirition_cd_no
 		ORDER BY dn_no DESC
-    </select>
+	</select>
 
     <select id="select_bf_daily_nutrition_list_count" resultClass="Integer" parameterClass="dataMap">
 		SELECT COUNT(*)
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 ba3490a..a8e113c 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
@@ -269,7 +269,7 @@
 											<#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="사진영역">
+										<img src="<#if item['file_seq']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['file_seq']}<#else>${URL_STATIC_ROOT}/m/img/child/child_pic_02.png</#if>" alt="사진영역">
 									</div>
 									<div class="main_cont_circle" style="border-color: ${item['color_cd']};"></div>
 									<div class="main_cont_info">