From 02f3c9549ff918e6a8178d7579484b7c09999e59 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 7 Jan 2026 17:00:33 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=B6=81=EB=A9=B4=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=97=AC=EB=B6=80=20=EC=BB=AC=EB=9F=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/master/dto/pcs/ApiPcsRoofSurfaceRequest.java | 4 ++++ .../qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceDto.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsRoofSurfaceRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsRoofSurfaceRequest.java index 6a0fd7b0..cd11703c 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsRoofSurfaceRequest.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsRoofSurfaceRequest.java @@ -26,6 +26,10 @@ public class ApiPcsRoofSurfaceRequest { @NotNull private String roofSurfaceNorthYn; + @Schema(description = "북면모듈 설치여부") + @NotNull + private String roofSurfaceNorthModuleYn; + @Schema(description = "모듈아이템 List(도면에 설치된 모듈)") @NotNull private List moduleList; diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceDto.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceDto.java index 7aceec60..8d83f3b3 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceDto.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceDto.java @@ -22,6 +22,9 @@ public class ApiPcsSerQtyRoofSurfaceDto { @Schema(description = "북면 여부") private String roofSurfaceNorthYn; + @Schema(description = "북면모듈 설치여부") + private String roofSurfaceNorthModuleYn; + @Schema(description = "모듈아이템 List(도면에 설치된 모듈)") private List moduleList; } From 879af547fcb1eb6b094971dc35c2b4deffdebd35 Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 8 Jan 2026 10:54:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EC=9A=A9=EB=9F=89=20AND?= =?UTF-8?q?=20I.POWER=5FCOM=5FFLG=20=3D=20'1'=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/estimate/estimateMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 0899fd55..2a26647a 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -404,7 +404,7 @@ ON PE.ITEM_ID = I.ITEM_ID WHERE P.OBJECT_NO = #{objectNo} AND P.PLAN_NO = #{planNo} - AND I.POWER_COM_FLG = '1' /* PCS 아이템만 */ +-- AND I.POWER_COM_FLG = '1' /* PCS 아이템만 */ ) T From f4607d07e50226a269bcf2020803c59bf3030f05 Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 8 Jan 2026 16:58:53 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EC=9A=A9=EB=9F=89=20STOR?= =?UTF-8?q?AGE=5FBATTERY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/estimate/estimateMapper.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 2a26647a..ad352846 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -405,6 +405,13 @@ WHERE P.OBJECT_NO = #{objectNo} AND P.PLAN_NO = #{planNo} -- AND I.POWER_COM_FLG = '1' /* PCS 아이템만 */ + AND ( + CASE + WHEN I.POWER_COM_FLG = '1' THEN 1 + WHEN I.POWER_COM_FLG != '1' AND I.ITEM_GROUP = 'STORAGE_BATTERY' AND ISNULL(I.PNOW_W, 0) > 0 THEN 1 + ELSE 0 + END + ) = 1 ) T