Merge pull request 'dev' (#297) from dev into dev-deploy

Reviewed-on: #297

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<ApiPcsModuleItemIdRequest> moduleList;

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<ApiPcsSerQtyRoofSurfaceModuleDto> moduleList;
 }

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -404,7 +404,14 @@
                 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 아이템만 */
+               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
     </select>