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 @@
     <update id="updateHajebichRoofMaterialsAdd" parameterType="com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingResponse">
         /* 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}
     </update>

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

src/main/resources/mappers/user/userMapper.xml

@@ -296,19 +296,22 @@
 
     <insert id="setStoreNorthModuleSave" parameterType="com.interplug.qcast.biz.user.dto.StoreRequest" >
         /* 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()
             );
     </insert>