From a0ca28731657670d5f7ccdc897e2c4fe21703798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A0=95=EC=9D=B4=EC=86=94?= <isol2011@imcloud.co.kr>
Date: Sat, 6 Aug 2022 12:59:51 +0900
Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EA=B0=84=EC=8B=9D?=
 =?UTF-8?q?=EC=9E=85=EB=A0=A5=20-=20=EC=B5=9C=EA=B7=BC=20=EB=A8=B9?=
 =?UTF-8?q?=EC=97=88=EB=8D=98=20=EA=B0=84=EC=8B=9D=20=EC=A0=95=EC=83=81?=
 =?UTF-8?q?=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 내가 만든 간식이 최근 먹었던 리스트에 안나오는 버그 수정
 - 최근 먹었던 간식을 선택하고 기록을 누르면 에러 발생했던 문제 수정
---
 .../com.backoffice.m.bf_daily_nutrition.xml           | 11 +++++++++--
 .../bf_daily_nutrition/view_bf_daily_nutrition_3.ftl  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

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 0768690..01a64ea 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
@@ -96,11 +96,18 @@
      <select id="select_lastest_nutrition_list_3" resultClass="dataMap" parameterClass="dataMap">
 		SELECT 
 		 	 x.db_dn_no
-			,dn.prd_nm 
+			,(
+				case
+					when nvl(db_dn_tp,'bf') = 'bf' then dn.prd_nm
+					when db_dn_tp = 'sf' then sf.prd_nm
+				end
+			) prd_nm
+		    ,x.db_dn_tp
 			,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %H:%i') reg_dt
 			,dn.company
 		FROM tbl_bf_daily_nutrition_3 x
-		INNER JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no 
+		INNER JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no
+		INNER JOIN tbl_db_sf_commerce sf ON sf.dbc_no = x.db_dn_no
 		WHERE  x.smc_no = #smc_no#  
          ORDER BY x.reg_dt desc
          LIMIT 2
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl
index 82bdb2d..03e5d5f 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl
@@ -57,7 +57,7 @@
 
                     <#if model['lm_lastest_lac']? has_content>
 					    <#list model['lm_lastest_lac'] as item>
-					    	<div class="milk_sel"><a onclick="javascript:save_set('db_dn_no', '${item['db_dn_no']!}', '${item['prd_nm']!}(${item['company']!})')" >  ${item['prd_nm']!} (${item['company']!}) [${item['reg_dt']!}]</a></div>
+					    	<div class="milk_sel"><a onclick="javascript:save_set('db_dn_no', '${item['db_dn_no']!}', '${item['prd_nm']!}(${item['company']!})', '${item['db_dn_tp']}')" >  ${item['prd_nm']!} (${item['company']!}) [${item['reg_dt']!}]</a></div>
                     	</#list>
 					</#if>