From 9bd2fe2b7ca69ba91cc1ced65220dd73b4bcd1b8 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Thu, 12 May 2022 11:56:58 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EC=B6=95=EC=88=98=EC=9C=A0=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=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                           | 25 ++++++++++---------
 .../com.backoffice.m.bf_daily_nutrition.xml   |  2 +-
 .../memory/com.backoffice.m.memory.memory.xml |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 06e5545..b427870 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. 남은 작업 기록&#10;2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정">
+    <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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -255,14 +256,7 @@
       <workItem from="1652058308312" duration="456000" />
       <workItem from="1652060536329" duration="3124000" />
       <workItem from="1652100883750" duration="5459000" />
-      <workItem from="1652321382844" duration="1871000" />
-    </task>
-    <task id="LOCAL-00019" summary="index_bottom 공유관련 html 스크립트 분리">
-      <created>1649334044809</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1649334044809</updated>
+      <workItem from="1652321382844" duration="2559000" />
     </task>
     <task id="LOCAL-00020" summary="index_bottom 공유관련 html 스크립트 분리-2">
       <created>1649339670142</created>
@@ -600,7 +594,14 @@
       <option name="project" value="LOCAL" />
       <updated>1652106845798</updated>
     </task>
-    <option name="localTasksCounter" value="68" />
+    <task id="LOCAL-00068" summary="1. 젖병 기록 수정">
+      <created>1652323538975</created>
+      <option name="number" value="00068" />
+      <option name="presentableId" value="LOCAL-00068" />
+      <option name="project" value="LOCAL" />
+      <updated>1652323538976</updated>
+    </task>
+    <option name="localTasksCounter" value="69" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -620,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="- 기본음악파일 삭제불가처리" />
     <MESSAGE value="소셜회원가입 오류수정" />
     <MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
     <MESSAGE value="아이디 저장기능 적용" />
@@ -645,6 +645,7 @@
     <MESSAGE value="연동완료후 이동 URL 수정-2" />
     <MESSAGE value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
     <MESSAGE value="1. 남은 작업 기록&#10;2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="1. 남은 작업 기록&#10;2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정" />
+    <MESSAGE value="1. 젖병 기록 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="1. 젖병 기록 수정" />
   </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 2a24abc..0c48276 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
@@ -386,7 +386,7 @@
 					 (
 						 SELECT ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
 						 FROM  tbl_bf_daily_nutrition_2 tn1
-						 LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
+						 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
 					 )
 					 WHEN cis_1.cd_no = 'BF_NU_TP_3' 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 4312c2c..97de0a3 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
@@ -237,7 +237,7 @@
 				when c.cd_no = 'BF_NU_TP_2' THEN
 					(select ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
 					 from tbl_bf_daily_nutrition_2 tn1
-					 left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
+					 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
 					)
 				when c.cd_no = 'BF_NU_TP_3' THEN