dev

src/main/java/com/its/op/controller/its/facility/TbFcltFailController.java

@@ -81,6 +81,15 @@ public class TbFcltFailController {
         return this.service.findAllTypeListByDate(type, true, fromDay, toDay);
     }
 
+
+    @ApiOperation(value = "그룹별 시설물 장애 현황 조회(완료항목 포함)", response = TbFcltFailDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/list/type/all/group/{group}/{fromDay}/{toDay}", produces = {"application/json; charset=utf8"})
+    public List<TbFcltFailDto> findAllGroupTypeListByDate(@PathVariable("group") final String group,
+                                                     @PathVariable("fromDay") final String fromDay,
+                                                     @PathVariable("toDay") final String toDay) {
+        return this.service.findAllGroupTypeListByDate(group, fromDay, toDay);
+    }
+
     @ApiOperation(value = "유형별 시설물 장애 관리 목록 조회(완료항목제외)", response = TbFcltFailDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/type/mng/{type}/{fromDay}/{toDay}", produces = {"application/json; charset=utf8"})
     public List<TbFcltFailDto> findRegTypeListByDate(@PathVariable("type") final String type,

src/main/java/com/its/op/dao/repository/its/facility/TbFcltFailRepository.java

@@ -45,4 +45,7 @@ public interface TbFcltFailRepository extends JpaRepository<TbFcltFail, String>,
     @Modifying
     @Query(value = "UPDATE TB_FCLT_FAIL SET STEP_CD = 'ACT2', END_DT = :endDt WHERE FAIL_NO = :failNo", nativeQuery = true)
     Integer updateComplete(@Param("failNo") String failNo, @Param("endDt") String endDt);
+
+    @Query("select p from TbFcltFail p, TbFcltInfr m where m.fcltType in (select cd.cmmnCd from TbCmmnCd cd where cd.cmmnClsfCd = :group) and m.fcltNmbr = p.fcltNmbr and p.strDt between :fromDt and :toDt")
+    List<TbFcltFail> findListGroupTypeAll(@Param("group") String group, @Param("fromDt") String fromDt, @Param("toDt") String toDt);
 }

src/main/java/com/its/op/service/its/facility/TbFcltFailService.java

@@ -216,6 +216,22 @@ public class TbFcltFailService {
         return result;
     }
 
+    /**
+     * 시설물 그룹별 장애 현황 전체 조회
+     * @param group
+     * @param fromDay
+     * @param toDay
+     * @return
+     */
+    public List<TbFcltFailDto> findAllGroupTypeListByDate(String group, String fromDay, String toDay) {
+        List<TbFcltFailDto> result = new ArrayList<>();
+        List<TbFcltFail> data = this.repo.findListGroupTypeAll(group, fromDay + "000000", toDay + "235959");
+        for (TbFcltFail entity : data) {
+            result.add(entity.toDto());
+        }
+        return result;
+    }
+
     public UsageCountDto findUsageId(String failNo) {
         UsageCountDto result = UsageCountDto.builder()
                 .count(0)