diff --git a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java index 679f1815..ee3e8378 100644 --- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java +++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java @@ -299,6 +299,8 @@ public class PwrGnrSimService { pwrGnrSimRes.setStandardWindSpeedId(planInfo.getStandardWindSpeedId()); pwrGnrSimRes.setRoofModuleList(roofGroupModuleList); pwrGnrSimRes.setPcsList(pcsGroupList); + pwrGnrSimRes.setObjectName(planInfo.getObjectName()); + pwrGnrSimRes.setObjectNameOmit(planInfo.getObjectNameOmit()); return pwrGnrSimRes; } diff --git a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimPlanResponse.java b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimPlanResponse.java index 1dc1b535..61dc1eef 100644 --- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimPlanResponse.java +++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimPlanResponse.java @@ -35,4 +35,11 @@ public class PwrGnrSimPlanResponse { @Schema(description = "일사량 관측지점명") private String areaName; + // 물건정보 정보 + @Schema(description = "물건명") + private String objectName; + + @Schema(description = "경칭") + private String objectNameOmit; + } diff --git a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimResponse.java b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimResponse.java index b6bcf272..8c00017a 100644 --- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimResponse.java +++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimResponse.java @@ -68,4 +68,11 @@ public class PwrGnrSimResponse { @Schema(description = "안내문구") private String guideInfo = ""; + + // 물건정보 정보 + @Schema(description = "물건명") + private String objectName; + + @Schema(description = "경칭") + private String objectNameOmit; } diff --git a/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml b/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml index 6d98517b..e12fed3b 100644 --- a/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml +++ b/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml @@ -17,6 +17,8 @@ , (SELECT PREF_NAME FROM T_SIMULATION_PREFECTURE WHERE PREF_ID = B.PREF_ID ) AS PREF_NAME , B1.AREA_ID /* 일사량 관측지점 */ , (SELECT AREA_NAME FROM T_SIMULATION_AREA WHERE AREA_ID = B1.AREA_ID ) AS AREA_NAME + , B.OBJECT_NAME /* 물건명 */ + , B.OBJECT_NAME_OMIT /* 물건명(영문) */ FROM T_PLAN A WITH (NOLOCK) INNER JOIN T_PLAN_INFO A1 WITH (NOLOCK) ON A.OBJECT_NO = A1.OBJECT_NO diff --git a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx index 3299e740..4e1ce477 100644 Binary files a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx and b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx differ diff --git a/src/main/resources/template/excel/excel_download_simulation_detail_template.xlsx b/src/main/resources/template/excel/excel_download_simulation_detail_template.xlsx index d763f39b..b13711a9 100644 Binary files a/src/main/resources/template/excel/excel_download_simulation_detail_template.xlsx and b/src/main/resources/template/excel/excel_download_simulation_detail_template.xlsx differ