From 408cc75a31d0b8c35f167fea8156280375b11e41 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 20 Mar 2026 10:27:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[1764]=EB=B6=81=EC=AA=BD=20=EB=A9=B4=20?= =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=82=AC=EC=96=91=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=98=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/object/objectMapper.xml | 2 +- src/main/resources/mappers/user/userMapper.xml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/resources/mappers/object/objectMapper.xml b/src/main/resources/mappers/object/objectMapper.xml index d988f82b..6ccd9396 100644 --- a/src/main/resources/mappers/object/objectMapper.xml +++ b/src/main/resources/mappers/object/objectMapper.xml @@ -384,7 +384,7 @@ , ISNULL(P.PREF_NAME, '') AS PREF_NAME , ISNULL(PA.AREA_NAME, '') AS AREA_NAME , (SELECT COUNT(1) FROM T_PLAN WHERE OBJECT_NO = O.OBJECT_NO AND DEL_FLG = '0' AND DRAWING_ESTIMATE_CREATE_DATE IS NOT NULL) AS ESTIMATE_TOT_CNT - , (SELECT DEL_FLG FROM M_SALES_STORE_NORTH_MODULE WHERE SALE_STORE_ID = O.SALE_STORE_ID) AS SALE_STORE_NORTH_FLG + , (SELECT NORTH_MODULE_FLG FROM M_SALES_STORE_INFO WHERE SALE_STORE_ID = O.SALE_STORE_ID) AS SALE_STORE_NORTH_FLG FROM T_OBJECT O WITH (NOLOCK) INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK) ON O.OBJECT_NO = OI.OBJECT_NO diff --git a/src/main/resources/mappers/user/userMapper.xml b/src/main/resources/mappers/user/userMapper.xml index f338dc87..c89ac6bd 100644 --- a/src/main/resources/mappers/user/userMapper.xml +++ b/src/main/resources/mappers/user/userMapper.xml @@ -296,19 +296,22 @@ /* sqlid : com.interplug.qcast.user.setStoreNorthModuleSave */ - MERGE INTO M_SALES_STORE_NORTH_MODULE AS A + MERGE INTO M_SALES_STORE_INFO AS A USING ( SELECT #{saleStoreId} AS SALE_STORE_ID ) AS D ON A.SALE_STORE_ID = D.SALE_STORE_ID WHEN MATCHED THEN UPDATE SET - DEL_FLG = #{northModuleFlg} + NORTH_MODULE_FLG = #{northModuleFlg} + , LAST_EDIT_DATETIME = GETDATE() WHEN NOT MATCHED THEN INSERT ( SALE_STORE_ID - , DEL_FLG + , NORTH_MODULE_FLG + , LAST_EDIT_DATETIME ) VALUES ( #{saleStoreId} , #{northModuleFlg} + , GETDATE() ); -- 2.47.2 From 1b4e64b5270e7e1543293fe5e0fffd21f1efe32c Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 20 Mar 2026 10:54:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[1763]=ED=8A=B9=EC=A0=95=20=EC=A7=80?= =?UTF-8?q?=EB=B6=95=EC=9E=AC=EB=A5=BC=20=EC=82=AC=EC=9A=A9=ED=95=B4=20Pla?= =?UTF-8?q?n=EC=9D=84=20=EB=B3=B5=EC=82=AC=ED=96=88=EC=9D=84=20=EB=95=8C?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=EA=B0=80=20=ED=91=9C=EC=8B=9C=EB=90=98?= =?UTF-8?q?=EA=B3=A0,=20=EC=A7=80=EB=B6=95=EC=9E=AC=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EA=B0=80=20=EC=98=AC=EB=B0=94=EB=A5=B4=EA=B2=8C=20=EC=A0=84?= =?UTF-8?q?=EB=8B=AC=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvasBasicSettingMapper.xml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml b/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml index a69b1c96..32678f6a 100644 --- a/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml +++ b/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml @@ -107,9 +107,9 @@ , #{roofApply} , #{roofSeq} , #{roofMatlCd} - , #{roofWidth} - , #{roofHeight} - , #{roofHajebichi} + , ISNULL(#{roofWidth}, 0) + , ISNULL(#{roofHeight}, 0) + , ISNULL(#{roofHajebichi}, 0) , #{roofGap} , #{roofLayout} , #{roofPitch} @@ -131,9 +131,9 @@ SET roof_apply = #{roofApply} , roof_seq = #{roofSeq} , roof_matl_cd = #{roofMatlCd} - , roof_width = #{roofWidth} - , roof_height = #{roofHeight} - , roof_hajebichi = #{roofHajebichi} + , roof_width = ISNULL(#{roofWidth}, 0) + , roof_height = ISNULL(#{roofHeight}, 0) + , roof_hajebichi = ISNULL(#{roofHajebichi}, 0) , roof_gap = #{roofGap} , roof_layout = #{roofLayout} , roof_pitch = #{roofPitch} @@ -174,9 +174,9 @@ , #{roofApply} , #{roofSeq} , #{roofMatlCd} - , #{roofWidth} - , #{roofHeight} - , #{roofHajebichi} + , ISNULL(#{roofWidth}, 0) + , ISNULL(#{roofHeight}, 0) + , ISNULL(#{roofHajebichi}, 0) , #{roofGap} , #{roofLayout} , #{roofPitch} @@ -208,9 +208,9 @@ , #{roofApply} , #{roofSeq} , #{roofMatlCd} - , #{roofWidth} - , #{roofHeight} - , #{roofHajebichi} + , ISNULL(#{roofWidth}, 0) + , ISNULL(#{roofHeight}, 0) + , ISNULL(#{roofHajebichi}, 0) , #{roofGap} , #{roofLayout} , #{roofPitch} @@ -230,7 +230,7 @@ /* sqlid : updateHajebichRoofMaterialsAdd */ UPDATE TB_CANVAS_ROOF_MATERIALS_ADD - SET roof_hajebichi = #{roofHajebichi} + SET roof_hajebichi = ISNULL(#{roofHajebichi}, 0) WHERE object_no = #{objectNo} AND plan_no = #{planNo} -- 2.47.2