Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/interplug/qcast/biz/master/MasterController.java

@@ -180,7 +180,8 @@ public class MasterController {
       @RequestBody List<ApiTrestleDetailRequest> reqList) {
     ArrayList<ApiResponse<ApiTrestleDetailResponse>> results = new ArrayList<>();
     for (ApiTrestleDetailRequest req : reqList) {
-      ApiResponse<ApiTrestleDetailResponse> result =
+
+      ApiResponse<ApiTrestleDetailResponse> response =
           masterService.getTrestleDetailList(
               req.getModuleTpCd(),
               req.getRoofMatlCd(),
@@ -195,7 +196,15 @@ public class MasterController {
               req.getConstTp(),
               req.getMixMatlNo(),
               req.getRoofPitch());
-      results.add(result);
+
+      ApiTrestleDetailResponse data = response.getData();
+      data.setRoofIndex(req.getRoofIndex()); // roofIndex 추가하기 위함
+      ApiResultResponse resultCode = response.getResult();
+
+      ApiResponse<ApiTrestleDetailResponse> resultResponse = new ApiResponse<>();
+      resultResponse.setData(data);
+      resultResponse.setResult(resultCode);
+      results.add(resultResponse);
     }
     return results;
   }

src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailRequest.java

@@ -59,4 +59,7 @@ public class ApiTrestleDetailRequest {
 
   @Schema(description = "하제(망둥어)피치")
   private Integer roofPitch;
+
+  @Schema(description = "지붕index 번호")
+  private String roofIndex;
 }

src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailResponse.java

@@ -13,6 +13,9 @@ import lombok.Setter;
 @Schema(description = "Api 가대 상세 조회 응답 객체")
 public class ApiTrestleDetailResponse {
 
+  @Schema(description = "지붕index")
+  private String roofIndex;
+
   @Schema(description = "랙여부")
   private String rackYn;