From 2325369064a7905ba5e626a8386d634bf5951837 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Mon, 13 Jan 2025 16:34:28 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=B6=95=EB=A9=B4=ED=95=A0=EB=8B=B9?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanvasBasicSettingController.java | 6 ++--- .../CanvasBasicSettingMapper.java | 4 +++ .../CanvasBasicSettingService.java | 11 ++++---- .../dto/CanvasBasicSettingInfo.java | 1 + .../dto/RoofAllocationInfo.java | 26 +++++++++++++++++++ 5 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofAllocationInfo.java 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 635a0b8d..87e5ab71 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java @@ -45,11 +45,11 @@ public class CanvasBasicSettingController { @Operation(description = "지붕면 할당 정보를 등록 한다.") @PostMapping("/roof-allocation-settings/") @ResponseStatus(HttpStatus.CREATED) - public Map insertRoofAllocSetting(@RequestBody CanvasBasicSettingInfo csi) throws QcastException { + public Map insertRoofAllocSetting(@RequestBody CanvasBasicSettingInfo rai) throws QcastException { - log.debug("지붕면 할당 등록 ::::: " + csi.getObjectNo()); + log.debug("지붕면 할당 등록 ::::: " + rai.getObjectNo()); - return canvasBasicSettingService.insertRoofAllocSetting(csi); + return canvasBasicSettingService.insertRoofAllocSetting(rai); } @Operation(description = "Canvas 지붕재추가 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 b96d2e03..b1093124 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingInfo; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingResponse; +import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofAllocationInfo; import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofMaterialsAddInfo; @Mapper @@ -31,6 +32,9 @@ public interface CanvasBasicSettingMapper { // Canvas 지붕재추가 Setting 수정 public void updateRoofMaterialsAdd(RoofMaterialsAddInfo rma); + + // 지붕면 할당 Setting 등록 + public void insertRoofAllocation(RoofAllocationInfo rai); // Canvas 지붕재추가 Setting 삭제 public void deleteRoofMaterialsAdd(String objectNo); 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 280915bc..0dea0b36 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingInfo; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingResponse; +import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofAllocationInfo; import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofMaterialsAddInfo; import com.interplug.qcast.config.Exception.ErrorCode; import com.interplug.qcast.config.Exception.QcastException; @@ -98,15 +99,15 @@ public class CanvasBasicSettingService { // 기존 지붕재추가 정보 삭제 후 insert canvasBasicSettingMapper.deleteRoofMaterialsAdd(csi.getObjectNo()); - int roofSeq = 0; + //int roofSeq = 0; // for-each 루프를 사용하여 지붕재추가 Setting - for (RoofMaterialsAddInfo rma : csi.getRoofMaterialsAddList()) { + for (RoofAllocationInfo rai : csi.getRoofAllocationList()) { - rma.setObjectNo(csi.getObjectNo()); - rma.setRoofSeq(roofSeq++); //roofSeq는 순차적으로 새로 생성하여 insert + rai.setObjectNo(csi.getObjectNo()); + //rma.setRoofSeq(roofSeq++); //roofSeq는 순차적으로 새로 생성하여 insert // 신규 지붕재추가 정보 insert - canvasBasicSettingMapper.insertRoofMaterialsAdd(rma); + canvasBasicSettingMapper.insertRoofAllocation(rai); } response.put("objectNo", csi.getObjectNo()); response.put("returnMessage", "common.message.confirm.mark"); diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java index b0152ba3..20f78902 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java @@ -18,4 +18,5 @@ public class CanvasBasicSettingInfo { private Date lastEditDatetime; //수정일시 private List roofMaterialsAddList; + private List RoofAllocationList; } \ No newline at end of file diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofAllocationInfo.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofAllocationInfo.java new file mode 100644 index 00000000..87e18992 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofAllocationInfo.java @@ -0,0 +1,26 @@ +package com.interplug.qcast.biz.canvasBasicSetting.dto; + +import java.sql.Date; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class RoofAllocationInfo { + + private String objectNo; //견적서 번호 + private boolean roofApply; //적용 + private Integer roofSeq; //순번 SEQ + private String roofMatlCd; //타입 + private Integer roofWidth; //넓이 + private Integer roofHeight; //높이 + private Integer roofHajebichi; //하제비치 + private String roofGap; //간격 + private String roofLayout; //방식 + private Integer roofPitch; //경사도 + private Float roofAngle; //각도 + private Date registDatetime; //생성일시 + private Date lastEditDatetime; //수정일시 + +}