From 61e6c6e0b22b629fcda4fc50e4d32293acced2d4 Mon Sep 17 00:00:00 2001
From: isol2011 <soi2011@naver.com>
Date: Wed, 20 Jul 2022 11:00:58 +0900
Subject: [PATCH] =?UTF-8?q?[=EC=B6=94=EA=B0=80]=204.=20=EC=8B=9C=ED=8C=90?=
 =?UTF-8?q?=EC=9D=B4=EC=9C=A0=EC=8B=9D=20&=20=EA=B0=84=EC=8B=9D=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=ED=95=98=EB=A9=B4,=20=20=EC=8B=9D=ED=92=88?=
 =?UTF-8?q?=EB=AA=85=20+=20=EC=A0=9C=EC=A1=B0=EC=82=AC=20=EA=B9=8C?=
 =?UTF-8?q?=EC=A7=80=20=EB=82=98=EC=98=A4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com.backoffice.m.bf_daily_nutrition.xml                   | 2 ++
 .../views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl      | 2 +-
 .../views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl   | 4 ++++
 .../ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl   | 4 ++--
 .../ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl    | 2 +-
 .../ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl    | 4 ----
 6 files changed, 10 insertions(+), 8 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 80e1c55..752f79c 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
@@ -93,6 +93,7 @@
 		 	 x.db_dn_no
 			,dn.prd_nm 
 			,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 
 		WHERE  x.smc_no = #smc_no#  
@@ -289,6 +290,7 @@
 			  end  )  prd_nm 
 			,x.db_dbc_tp
 			,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %H:%i') reg_dt
+			,dn.company
 		from 	tbl_bf_daily_nutrition_10 x
 		left join tbl_db_bf_commerce dn 
 			on dn.dbc_no = x.db_dbc_no
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl
index 8a34f3e..bccbfd8 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl
@@ -74,7 +74,7 @@ function ajax_data(keyword){
 	                                var company = result.list[i].company;                                    
 	                                var barcode = result.list[i].barcode;
 	                                var imgurl1 = result.list[i].imgurl1;
-	                                html +='<li><a href="javascript:save_set(\'db_dn_no\', \'' + dn_no + '\', \'' + prd_nm + '\' ,\'bf\' );"><img src="' + imgurl1 + '" alt="섭취량 이미지" width="200px" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '</a></li>';
+	                                html +='<li><a href="javascript:save_set(\'db_dn_no\', \'' + dn_no + '\', \'' + prd_nm + '(' + company + ')' + '\' ,\'bf\' );"><img src="' + imgurl1 + '" alt="섭취량 이미지" width="200px" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '(' + company + ')' + '</a></li>';
 	                            }
 	                            
 	                            var ul_board = $('#ul_board');
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl
index 2b867f2..1282347 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl
@@ -1,3 +1,7 @@
+    <style>
+        .swal2-container{z-index: 9999999}
+    </style>
+
     <!-- modal-wrapper -->
     <div id="popup_self" class="modal-wrapper">
         <div class="modal_content" style="width: 400px;">
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl
index 95e4d93..54c4f82 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl
@@ -60,7 +60,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_dbc_no', '${item['db_dbc_no']!}', '${item['prd_nm']!}')">  ${item['prd_nm']!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[${item['reg_dt']!}]</a></div>
+				    	<div class="milk_sel"><a onclick="javascript:save_set('db_dbc_no', '${item['db_dbc_no']!}', '${item['prd_nm']!}(${item['company']!})')">  ${item['prd_nm']!} (${item['company']!}) [${item['reg_dt']!}]</a></div>
                 	</#list>
 				</#if>
 
@@ -227,7 +227,7 @@
 	                                var company = result.list[i].company;                                    
 	                                var barcode = result.list[i].barcode;                               
 	                                var imgurl1 = result.list[i].imgurl1;
-	                                html +='<li><a href="javascript:save_set(\'db_dbc_no\', \'' + dbc_no + '\', \'' + prd_nm + '\', \'bf\');"><img src="' + imgurl1 + '" alt="섭취량 이미지" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '</a></li>';
+	                                html +='<li><a href="javascript:save_set(\'db_dbc_no\', \'' + dbc_no + '\', \'' + prd_nm + '(' + company + ')' + '\', \'bf\');"><img src="' + imgurl1 + '" alt="섭취량 이미지" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '(' + company + ')' + '</a></li>';
 	                            }
 	                            
 	                            var ul_board = $('#ul_board');
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 52c7734..3d0353f 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['prd_nm']!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[${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['prd_nm']!} (${item['company']!}) [${item['reg_dt']!}]</a></div>
                     	</#list>
 					</#if>
 
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl
index cdef2a2..99587e6 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl
@@ -105,10 +105,6 @@
         </div>
         <!-- //홈메이드이유식-->
     </div>
-
-	<style>
-		.swal2-container{z-index: 9999999}
-	</style>
           
    <!-- modal-wrapper -->
     <div id="popup" class="modal-wrapper">