diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index 66a2d928..050c290b 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -3237,10 +3237,12 @@ public class EstimateService { throw new QcastException(ErrorCode.NOT_FOUND, message.getMessage("common.message.no.data")); } else { - // 지역코드 셋팅 + // 물건정보 셋팅 response.setObjectNo(estimateRequest.getObjectNo()); response.setPlanNo(estimateRequest.getPlanNo()); + response.setObjectName(estimateRequest.getObjectName()); response.setAreaId(estimateResponse.getAreaId()); + response.setConType(estimateResponse.getConType()); // 지붕면 정보 목록 조회 List roofList = estimateMapper.selectSimulationEstimateRoofList(estimateRequest); diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java index f6264ba6..d2a35cd7 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java @@ -197,6 +197,9 @@ public class EstimateResponse { @Schema(description = "지역명") private String areaName; + @Schema(description = "계약조건") + private String conType; + @Schema(description = "물건정보 비고") private String objectRemarks; diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/SimulationEstimateResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/SimulationEstimateResponse.java index bad984cb..7379e76e 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/SimulationEstimateResponse.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/SimulationEstimateResponse.java @@ -10,12 +10,18 @@ public class SimulationEstimateResponse { @Schema(description = "물건번호") private String objectNo; + @Schema(description = "안건명") + private String objectName; + @Schema(description = "플랜번호") private String planNo; @Schema(description = "지역코드") private String areaId; + @Schema(description = "계약조건") + private String conType; + @Schema(description = "지붕면 정보 목록") List roofList; diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 8d08a4a1..d7f94d6e 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -64,6 +64,7 @@ , B.SALE_STORE_ID AS SAP_SALE_STORE_ID , B.SAP_SALES_STORE_CD , OI.AREA_ID + , OI.CON_TYPE , ISNULL(OI.COLD_REGION_FLG, '0') AS COLD_REGION_FLG , ISNULL(OI.SALT_AREA_FLG, '0') AS SALT_AREA_FLG , SS.FIRST_AGENT_ID