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 bfa220f5..b90ad2c2 100644 --- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java +++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java @@ -2313,6 +2313,9 @@ public class PwrGnrSimService { elm = doc.getElementById("standardWindSpeedId"); elm.text(StringUtils.defaultString(data.getStandardWindSpeedId())); + elm = doc.getElementById("pwrGnrSimTypeName"); + elm.text(StringUtils.defaultString(data.getPwrGnrSimTypeName())); + boolean isUnchanged = Arrays.stream(pwrGnrSimList).allMatch(value -> value == "00"); if (!isUnchanged) { // 변경된값 확인 @@ -2502,8 +2505,10 @@ public class PwrGnrSimService { pwrGnrSimResponse.setFrcPwrGnrList(pwrGnrSimResponse.getHatsudenryouAllSnow()); } else if ("B".equals(estimateRequest.getPwrGnrSimType())) { pwrGnrSimResponse.setFrcPwrGnrList(pwrGnrSimResponse.getHatsudenryouPeakcutAll()); + pwrGnrSimResponse.setPwrGnrSimTypeName(message.getMessage("common.message.simulation.pwrGnrSimType.B")); } else if ("D".equals(estimateRequest.getPwrGnrSimType())) { pwrGnrSimResponse.setFrcPwrGnrList(pwrGnrSimResponse.getHatsudenryouPeakcutAllSnow()); + pwrGnrSimResponse.setPwrGnrSimTypeName(message.getMessage("common.message.simulation.pwrGnrSimType.D")); } pwrGnrSimResponse.setIntFrcPwrGnrList( 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 8c00017a..4ecceb36 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 @@ -30,6 +30,9 @@ public class PwrGnrSimResponse { @Schema(description = "list 종류") private String pwrGnrSimType; + @Schema(description = "list 종류명") + private String pwrGnrSimTypeName; + @Schema(description = "물건번호") private String objectNo; diff --git a/src/main/resources/message/message_ja.properties b/src/main/resources/message/message_ja.properties index 2d1153ad..71ebbebf 100644 --- a/src/main/resources/message/message_ja.properties +++ b/src/main/resources/message/message_ja.properties @@ -88,4 +88,8 @@ common.message.writeToConfirm:\u4F5C\u6210\u89E3\u9664\u3092\u5B9F\u884C\u3057\u common.message.password.init.success:\u30D1\u30B9\u30EF\u30FC\u30C9 [{0}] \u306B\u521D\u671F\u5316\u3055\u308C\u307E\u3057\u305F\u3002 common.message.no.edit.save:\u3053\u306E\u6587\u66F8\u306F\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002 common.message.plan.save.limit:\u8A08\u753B\u60C5\u5831\u306F\u6700\u592710\u307E\u3067\u4FDD\u5B58\u3067\u304D\u307E\u3059\u3002 -common.message.plan.delete.limit:\u8A08\u753B\u60C5\u5831\u306F\u5C11\u306A\u304F\u3068\u30821\u3064\u5B58\u5728\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 \ No newline at end of file +common.message.plan.delete.limit:\u8A08\u753B\u60C5\u5831\u306F\u5C11\u306A\u304F\u3068\u30821\u3064\u5B58\u5728\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +common.message.simulation.pwrGnrSimType.A:\u7A4D\u96EA\u8003\u616E\u306A\u3057(\u30D4\u30FC\u30AF\u30AB\u30C3\u30C8\u306A\u3057\u767A\u96FB\u91CF) +common.message.simulation.pwrGnrSimType.B:\u7A4D\u96EA\u8003\u616E\u306A\u3057(\u30D4\u30FC\u30AF\u30AB\u30C3\u30C8\u3042\u308A\u767A\u96FB\u91CF) +common.message.simulation.pwrGnrSimType.C:\u7A4D\u96EA\u8003\u616E\u3042\u308A(\u30D4\u30FC\u30AF\u30AB\u30C3\u30C8\u306A\u3057\u767A\u96FB\u91CF) +common.message.simulation.pwrGnrSimType.D:\u7A4D\u96EA\u8003\u616E\u3042\u308A(\u30D4\u30FC\u30AF\u30AB\u30C3\u30C8\u3042\u308A\u767A\u96FB\u91CF) \ No newline at end of file diff --git a/src/main/resources/message/message_ko.properties b/src/main/resources/message/message_ko.properties index 04e1b907..c47d9870 100644 --- a/src/main/resources/message/message_ko.properties +++ b/src/main/resources/message/message_ko.properties @@ -88,4 +88,8 @@ common.message.writeToConfirm:\uC791\uC131 \uD574\uC81C\uB97C \uC2E4\uD589\uD558 common.message.password.init.success:\uBE44\uBC00\uBC88\uD638 [{0}]\uB85C \uCD08\uAE30\uD654 \uB418\uC5C8\uC2B5\uB2C8\uB2E4. common.message.no.edit.save:This document cannot be changed. common.message.plan.save.limit:You can only add up to 10 plan information. -common.message.plan.delete.limit:There must be at least one plan information. \ No newline at end of file +common.message.plan.delete.limit:There must be at least one plan information. +common.message.simulation.pwrGnrSimType.A:\uC801\uC124 \uACE0\uB824 \uC5C6\uC74C(\uD53C\uD06C\uCEF7 \uC5C6\uB294 \uBC1C\uC804\uB7C9) +common.message.simulation.pwrGnrSimType.B:\uC801\uC124 \uACE0\uB824 \uC5C6\uC74C(\uD53C\uD06C\uCEF7 \uC788\uB294 \uBC1C\uC804\uB7C9) +common.message.simulation.pwrGnrSimType.C:\uC801\uC124 \uACE0\uB824 \uC788\uC74C(\uD53C\uD06C\uCEF7 \uC5C6\uB294 \uBC1C\uC804\uB7C9) +common.message.simulation.pwrGnrSimType.D:\uC801\uC124 \uACE0\uB824 \uC788\uC74C(\uD53C\uD06C\uCEF7 \uC788\uB294 \uBC1C\uC804\uB7C9) \ No newline at end of file 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 320ac219..1991c81b 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 diff --git a/src/main/resources/template/pdf/pdf_download_simulation_detail_template.html b/src/main/resources/template/pdf/pdf_download_simulation_detail_template.html index 454258fa..2488cb58 100644 --- a/src/main/resources/template/pdf/pdf_download_simulation_detail_template.html +++ b/src/main/resources/template/pdf/pdf_download_simulation_detail_template.html @@ -536,6 +536,9 @@ +
+ ● +