diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java index 401e80c0..ad6d62a0 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java @@ -24,12 +24,12 @@ public class CanvasBasicSettingController { private final CanvasBasicSettingService canvasBasicSettingService; @Operation(description = "Canvas Basic Setting 정보를 조회 한다.") - @GetMapping("/canvas-basic-settings/by-object/{objectNo}/{roofSeq}") - public List selectCanvasBasicSetting(@PathVariable String objectNo, @PathVariable String roofSeq) { + @GetMapping("/canvas-basic-settings/by-object/{objectNo}") + public List selectCanvasBasicSetting(@PathVariable String objectNo) { - log.debug("Basic Setting 조회 ::::: " + objectNo + " " + roofSeq); + log.debug("Basic Setting 조회 ::::: " + objectNo); - return canvasBasicSettingService.selectCanvasBasicSetting(objectNo, roofSeq); + return canvasBasicSettingService.selectCanvasBasicSetting(objectNo); } @Operation(description = "Canvas Basic Setting 정보를 등록 한다.") diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java index ec8ed1ba..d8db856f 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java @@ -15,7 +15,7 @@ public interface CanvasBasicSettingMapper { public CanvasBasicSettingInfo getCanvasBasicSettingCnt(String objectNo); // Canvas Basic Setting 조회(objectNo) - public List selectCanvasBasicSetting(String objectNo, String roofSeq); + public List selectCanvasBasicSetting(String objectNo); // Canvas Basic Setting 등록 public void insertCanvasBasicSetting(CanvasBasicSettingInfo csi); diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java index 239f6af1..0c41cea2 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java @@ -22,8 +22,8 @@ public class CanvasBasicSettingService { private final CanvasBasicSettingMapper canvasBasicSettingMapper; // Canvas Basic Setting 조회(objectNo) - public List selectCanvasBasicSetting(String objectNo, String roofSeq) { - return canvasBasicSettingMapper.selectCanvasBasicSetting(objectNo, roofSeq); + public List selectCanvasBasicSetting(String objectNo) { + return canvasBasicSettingMapper.selectCanvasBasicSetting(objectNo); } // Canvas Basic Setting 등록 diff --git a/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml b/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml index 3b1f2871..09454668 100644 --- a/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml +++ b/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml @@ -28,8 +28,8 @@ FROM TB_CANVAS_BASIC_SETUP cbs LEFT JOIN TB_CANVAS_ROOF_MATERIALS_ADD crma ON cbs.object_no = crma.object_no - WHERE cbs.object_no = #{objectNo} - AND crma.roof_seq = #{roofSeq} + WHERE crma.roof_apply = 1 + AND cbs.object_no = #{objectNo}