From 37e736d62786394fdd888fb5e409b06cfa04a5e0 Mon Sep 17 00:00:00 2001
From: Unknown <hanguft@gmail.com>
Date: Wed, 20 Jul 2022 18:28:58 +0900
Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EB=A9=94=EB=AA=A8?=
 =?UTF-8?q?=EB=A6=AC=20=EC=9B=94=EA=B0=84=20=EC=9E=90=EC=A0=95=EC=97=90=20?=
 =?UTF-8?q?=EA=B1=B8=EC=B3=90=EC=9E=88=EB=8A=94=20=EA=B8=B0=EB=A1=9D=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EC=95=88=EB=90=98=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=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

---
 .../memory/com.backoffice.m.memory.memory.xml | 54 +++++++++++++++----
 1 file changed, 43 insertions(+), 11 deletions(-)

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 c65a78f..2879b04 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
@@ -3,24 +3,49 @@
 <sqlMap namespace="com.backoffice.m.memory">
 	<select id="select_week" resultClass="dataMap" parameterClass="dataMap">
 		SELECT
+			@rownum := @rownum + 1 AS no,
 		    XA.dn_no,
-			XA.day,
-			XA.dd,
-			XA.hour,
-			XA.val_1,
-			XA.color_cd,
-			XA.title,
-			CASE WHEN (XA.hour * 3.4) + (add_degree * 3.4) > 340 then (100-hour) * 3.4
-			ELSE XA.add_degree
-			END as add_degree,
+			case
+				when mod(@rownum,2) = 0 then DATE_ADD(XA.day, interval 1 day)
+				else XA.day
+				end as day
+			,case
+				when mod(@rownum,2) = 0 then XA.dd + 1
+				else XA.dd
+				end as dd
+			,case
+				when mod(@rownum,2) = 0 then 0
+				else XA.hour
+				end as hour
+			,XA.val_1
+			,XA.color_cd
+			,XA.title
+			,
+			case
+				when mod(@rownum,2) = 0 then (
+					case
+						when (XA.hour+((XA.add_degree/340)*100)) > 100 then (340 * (((XA.hour+((XA.add_degree/340)*100))-100)/100))
+						else 0
+					end
+				)
+				else (
+					case
+						when (XA.hour+((XA.add_degree/340)*100)) > 100 then 340 - (340 * (XA.hour/100))
+						else XA.add_degree
+					end
+				)
+				end
+			AS add_degree,
 			XA.cnt,
 			XA.time_val
-		FROM
+		FROM (
+			SELECT @rownum := 0
+			) TMP,
 			(
 			SELECT
 				DATE_FORMAT(b.reg_dt, '%Y-%m-%d') as day,
 				DATE_FORMAT(b.reg_dt, '%d') as dd,
-				DATE_FORMAT(b.reg_dt, '%H') * 4.15 as hour,
+				(Date_format(b.reg_dt, '%H') + (Date_format(b.reg_dt, '%i')/60))*4.15 AS hour,
 				LPAD(c.val_1, 2, '0') as val_1,
 				(select color_cd from tbl_code_item ts where ts.val_1 = c.cd_no) as color_cd,
 				c.title as title,
@@ -227,6 +252,13 @@
 			group by dn_no, DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H'), DATE_FORMAT(b.reg_dt, '%H'), DATE_FORMAT(b.reg_dt, '%d'), LPAD(c.val_1, 2, '0')
 			order by DATE_FORMAT(b.reg_dt, '%Y-%m-%d') asc, DATE_FORMAT(b.reg_dt, '%H') asc, DATE_FORMAT(b.reg_dt, '%d') asc, LPAD(c.val_1, 2, '0') asc
 		) XA
+		CROSS JOIN (
+		SELECT 1 AS NO
+
+		UNION ALL
+
+		SELECT 2
+		) DAT
 		where XA.time_val is not null
 	</select>