공지사항 파일 목록 리스트 추가

src/main/java/com/oqpo/api/entity/oper/NticeEntity.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Getter
 @Setter
@@ -35,5 +36,6 @@ public class NticeEntity implements Serializable {
     private String supplyChk;
 
     private NticeTargetEntity nticeTargetEntity;
+    private List<FileEntity> fileEntity ;
 
 }

src/main/java/com/oqpo/api/service/oper/NticeService.java

@@ -1,9 +1,11 @@
 package com.oqpo.api.service.oper;
 
 
+import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.oper.NticeEntity;
 import com.oqpo.api.entity.oper.NticeTargetEntity;
 import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.oper.NticeMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.web.dto.request.GridRequest;
@@ -17,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -26,6 +29,10 @@ public class NticeService extends CommonService {
     @Autowired
     private NticeMapper nticeMapper;
 
+    @Autowired
+    private FileMapper fileMapper;
+
+
     /*
       공지 검색 리스트 조회
      */
@@ -113,10 +120,19 @@ public class NticeService extends CommonService {
     }
 
     /*
-   공지 정보 가져오기
+   공지 정보 가져오기  selectFileList
     */
     public NticeResponse selectNticeInfo(String nticeNo) throws Exception {
-        return NticeResponse.toDTO(nticeMapper.selectNticeInfo(nticeNo));
+        NticeEntity nticeEntity = nticeMapper.selectNticeInfo(nticeNo) ;
+        List<FileEntity> nFileList = null;
+
+        if (!"".equals(nticeEntity.getFileNo())) {
+            nFileList = fileMapper.selectFileList(nticeEntity.getFileNo()) ;
+        } else {
+            nFileList = new ArrayList<FileEntity>();
+        }
+
+        return NticeResponse.toDTO(nticeEntity, nFileList);
     }
 
     /*

src/main/java/com/oqpo/api/web/dto/response/oper/ntice/NticeResponse.java

@@ -1,10 +1,15 @@
 package com.oqpo.api.web.dto.response.oper.ntice;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.oper.NticeEntity;
+import com.oqpo.api.web.dto.response.session.SessionResponse;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Getter
 @Setter
 @Builder
@@ -63,7 +68,10 @@ public class NticeResponse {
     @ApiModelProperty(value = "공급사대상여부")
     private String supplyChk;
 
-    public static NticeResponse toDTO(NticeEntity entity) {
+    @ApiModelProperty(value = "파일번호")
+    private List<FileInfo> fileNoList;
+
+    public static NticeResponse toDTO(NticeEntity entity, List<FileEntity> fileInfoList) {
         if (entity == null) return null;
         return NticeResponse.builder()
                 .nticeNo(entity.getNticeNo())
@@ -79,10 +87,40 @@ public class NticeResponse {
                 .notiStDay(entity.getNotiStDay())
                 .notiEdDay(entity.getNotiEdDay())
                 .fileNo(entity.getFileNo() == null ? "" : entity.getFileNo())
+                .fileNoList(fileInfoList.stream()
+                        .map(m -> FileInfo.builder()
+                                .fileNo(m.getFileNo())
+                                .fileSeq(m.getFileSeq())
+                                .filePath(m.getFilePath())
+                                .fileNm(m.getFileNm())
+                                .fileOrgNm(m.getFileOrgNm())
+                                .build())
+                        .collect(Collectors.toList()))
                 .viewCnt(entity.getViewCnt())
                 .brandChk(entity.getBrandChk() == null ? "N" : entity.getBrandChk())
                 .shopChk(entity.getShopChk() == null ? "N" : entity.getShopChk())
                 .supplyChk(entity.getSupplyChk() == null ? "N" : entity.getSupplyChk())
                 .build();
     }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class FileInfo {
+        @ApiModelProperty(value = "파일번호")
+        private String fileNo;
+
+        @ApiModelProperty(value = "파일순번")
+        private Integer fileSeq;
+
+        @ApiModelProperty(value = "파일경로")
+        private String filePath;
+
+        @ApiModelProperty(value = "파일명")
+        private String fileNm;
+
+        @ApiModelProperty(value = "원파일명")
+        private String fileOrgNm;
+    }
 }
+