배치면초기설정 화면 추가

src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -33,7 +34,7 @@ public class CanvasBasicSettingController {
   @Operation(description = "Canvas Basic Setting 정보를 등록 한다.")
   @PostMapping("/canvas-basic-settings")
   @ResponseStatus(HttpStatus.CREATED)
-  public String insertCanvasBasicSetting(@RequestBody CanvasBasicSettingInfo csi) {
+  public  Map<String, String> insertCanvasBasicSetting(@RequestBody CanvasBasicSettingInfo csi) {
 	  
 	  log.debug("Basic Setting 등록 ::::: " + csi.getObjectNo());
 	  

src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java

@@ -2,7 +2,9 @@ package com.interplug.qcast.biz.canvasBasicSetting;
 
 import lombok.RequiredArgsConstructor;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
@@ -21,7 +23,9 @@ public class CanvasBasicSettingService {
 	}
 
 	// Canvas Basic Setting 등록
-	public String insertCanvasBasicSetting(CanvasBasicSettingInfo csi) {
+	public Map<String, String> insertCanvasBasicSetting(CanvasBasicSettingInfo csi) {
+		
+		Map<String, String> response = new HashMap<>();
 
 		try {
 			
@@ -31,23 +35,26 @@ public class CanvasBasicSettingService {
 			// 기존 지붕재추가 정보 삭제 후 insert
 			canvasBasicSettingMapper.deleteRoofMaterialsAdd(csi.getObjectNo());
 			
-			//int roofSeq = 1;
+			int roofSeq = 1;
 			 // for-each 루프를 사용하여 지붕재추가 Setting
 	        for (RoofMaterialsAddInfo rma : csi.getRoofMaterialsAddList()) {
 	        	
 	        	rma.setObjectNo(csi.getObjectNo());
-	        	//rma.setRoofSeq(roofSeq++); //roofSeq는 순차적으로 새로 생성하여 insert
+	        	rma.setRoofSeq(roofSeq++); //roofSeq는 순차적으로 새로 생성하여 insert
 	            
 	        	// 신규 지붕재추가 정보 insert
 	            canvasBasicSettingMapper.insertRoofMaterialsAdd(rma);
 	        }
+	        response.put("objectNo", csi.getObjectNo());
+	        response.put("returnMessage", "common.message.confirm.mark");
 			
 		} catch (Exception e) {
-			System.out.println("오류 발생 : " + e.getMessage());
+			response.put("objectNo", csi.getObjectNo());
+			response.put("returnMessage", "common.message.save.error");
 		}
 
 		// 생성된 objectNo 반환
-		return csi.getObjectNo();
+		return response;
 
 	}
 

src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java

@@ -11,7 +11,6 @@ import lombok.Setter;
 public class CanvasBasicSettingInfo {
     
     private String  objectNo;			//견적서 번호
-    private int 	roofDrawingSet; 	//도면(치수)
     private int 	roofSizeSet; 		//치수(복사도/실측값/육지붕)
     private String 	roofAngleSet; 		//각도(경사/각도)
     private Date 	registDatetime; 	//생성일시

src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofMaterialsAddInfo.java

@@ -10,10 +10,12 @@ import lombok.Setter;
 public class RoofMaterialsAddInfo {
     
     private String  objectNo;			//견적서 번호
+    private boolean	roofApply; 			//적용
     private int 	roofSeq; 			//순번 SEQ
     private int 	roofType; 			//타입
     private int 	roofWidth; 			//넓이
     private int 	roofHeight; 		//높이
+    private int 	roofHajebichi; 		//하제비치
     private int 	roofGap; 			//간격
     private String 	roofLayout; 		//방식
     private Date 	registDatetime; 	//생성일시

src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml

@@ -7,13 +7,14 @@
             resultType="com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingResponse">
         /* sqlid : com.interplug.qcast.canvasBasicSetting.selectCanvasBasicSetting Canvas Basic Setting 조회 */
         SELECT cbs.object_no
-		     , cbs.roof_drawing_set
 		     , cbs.roof_size_set
 		     , cbs.roof_angle_set
+		     , crma.roof_apply
 		     , crma.roof_seq
 		     , crma.roof_type
 		     , crma.roof_width
 		     , crma.roof_height
+		     , crma.roof_hajebichi
 		     , crma.roof_gap
 		     , crma.roof_layout
 		  FROM TB_CANVAS_BASIC_SETUP cbs
@@ -29,8 +30,7 @@
 		   ON (target.object_no = source.object_no)
 		WHEN MATCHED THEN
 	    UPDATE 
-	       SET roof_drawing_set = #{roofDrawingSet}
+	       SET roof_size_set = #{roofSizeSet}
-	         , roof_size_set = #{roofSizeSet}
 	         , roof_angle_set = #{roofAngleSet}
 	         , last_edit_datetime = GETDATE()
 		
@@ -38,17 +38,17 @@
 	    INSERT 
 	              ( 
 					object_no
-			 	  , roof_drawing_set
 			 	  , roof_size_set
 			 	  , roof_angle_set
 	              , regist_datetime
+	              , last_edit_datetime
 	              )
 	       VALUES ( 
-					#{objectNo}
+					#{objectNo}	
-				  , #{roofDrawingSet}	
 	              , #{roofSizeSet}
 	              , #{roofAngleSet}
 	              , GETDATE()
+	              , GETDATE()
 	              );
     </insert>
     
@@ -57,23 +57,29 @@
 	    INSERT INTO TB_CANVAS_ROOF_MATERIALS_ADD
 	              ( 
 					object_no
+			 	  , roof_apply
 			 	  , roof_seq
 			 	  , roof_type
 			 	  , roof_width
 			 	  , roof_height
+			 	  , roof_hajebichi
 			 	  , roof_gap
 			 	  , roof_layout
 	              , regist_datetime
+	              , last_edit_datetime
 	              )
 	       VALUES ( 
 					#{objectNo}
+				  , #{roofApply}
 				  , #{roofSeq}
 	              , #{roofType}
 	              , #{roofWidth}
 	              , #{roofHeight}
+	              , #{roofHajebichi}
 	              , #{roofGap}
 	              , #{roofLayout}
 	              , GETDATE()
+	              , GETDATE()
 	              );
     </insert>