diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofMaterialsAddInfo.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofMaterialsAddInfo.java index 61c85496..8ff27024 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofMaterialsAddInfo.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofMaterialsAddInfo.java @@ -12,11 +12,11 @@ public class RoofMaterialsAddInfo { private String objectNo; //견적서 번호 private boolean roofApply; //적용 private int roofSeq; //순번 SEQ - private int roofType; //타입 + private String roofMatlCd; //타입 private int roofWidth; //넓이 private int roofHeight; //높이 private int roofHajebichi; //하제비치 - private int roofGap; //간격 + private String roofGap; //간격 private String roofLayout; //방식 private Date registDatetime; //생성일시 private Date lastEditDatetime; //수정일시 diff --git a/src/main/java/com/interplug/qcast/biz/master/MasterController.java b/src/main/java/com/interplug/qcast/biz/master/MasterController.java index 0eac1165..240015a9 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -102,15 +102,15 @@ public class MasterController { if (moduleTpCd == null || moduleTpCd.trim().isEmpty() || roofMatlCd == null || roofMatlCd.trim().isEmpty() || - trestleMkrCd == null || trestleMkrCd.trim().isEmpty() || - constMthdCd == null || constMthdCd.trim().isEmpty() || - roofBaseCd == null || roofBaseCd.trim().isEmpty() || - illuminationTp == null || illuminationTp.trim().isEmpty() || - instHt == null || instHt.trim().isEmpty() || - stdWindSpeed == null || stdWindSpeed.trim().isEmpty() || - stdSnowLd == null || stdSnowLd.trim().isEmpty() || - inclCd == null || inclCd.trim().isEmpty() || - constTp == null || constTp.trim().isEmpty()) { + trestleMkrCd == null || trestleMkrCd.trim().isEmpty() || + constMthdCd == null || constMthdCd.trim().isEmpty() || + roofBaseCd == null || roofBaseCd.trim().isEmpty() || + illuminationTp == null || illuminationTp.trim().isEmpty() || + instHt == null || instHt.trim().isEmpty() || + stdWindSpeed == null || stdWindSpeed.trim().isEmpty() || + stdSnowLd == null || stdSnowLd.trim().isEmpty() || + inclCd == null || inclCd.trim().isEmpty() || + constTp == null || constTp.trim().isEmpty()) { throw new QcastException(ErrorCode.INVALID_INPUT_VALUE); } return masterService.getTrestleDetailList(moduleTpCd, roofMatlCd, trestleMkrCd, constMthdCd, roofBaseCd, illuminationTp, instHt, stdWindSpeed, stdSnowLd, inclCd, constTp, mixMatlNo, roofPitch); diff --git a/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml b/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml index 681c57aa..978841bc 100644 --- a/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml +++ b/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml @@ -11,7 +11,7 @@ , cbs.roof_angle_set , crma.roof_apply , crma.roof_seq - , crma.roof_type + , crma.roof_matl_cd , crma.roof_width , crma.roof_height , crma.roof_hajebichi @@ -59,7 +59,7 @@ object_no , roof_apply , roof_seq - , roof_type + , roof_matl_cd , roof_width , roof_height , roof_hajebichi @@ -72,7 +72,7 @@ #{objectNo} , #{roofApply} , #{roofSeq} - , #{roofType} + , #{roofMatlCd} , #{roofWidth} , #{roofHeight} , #{roofHajebichi} @@ -86,7 +86,8 @@ /* sqlid : com.interplug.qcast.canvasBasicSetting.deleteRoofMaterialsAdd Canvas 지붕재추가 Setting 삭제 */ DELETE FROM TB_CANVAS_ROOF_MATERIALS_ADD - WHERE object_no = #{objectNo} + WHERE object_no = #{objectNo} + AND roof_seq = 1 \ No newline at end of file