가맹점, 브랜드, 공급사 첨부파일 가져오기 기능 추가

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

@@ -50,5 +50,6 @@ public class AfflEntity implements Serializable {
     private String joinDt;
 
     private List<AfflSaleInfoEntity> afflSaleInfo;
+    private List<FileEntity> fileEntity ;
 
 }

src/main/java/com/oqpo/api/entity/stinfo/BrandEntity.java

@@ -1,10 +1,12 @@
 package com.oqpo.api.entity.stinfo;
 
+import com.oqpo.api.entity.oper.FileEntity;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Getter
 @Setter
@@ -44,4 +46,6 @@ public class BrandEntity implements Serializable {
     private String sysChgDttm;
     private String sysChgId;
 
+    private List<FileEntity> fileEntity ;
+
 }

src/main/java/com/oqpo/api/entity/stinfo/SpplyEntity.java

@@ -1,5 +1,6 @@
 package com.oqpo.api.entity.stinfo;
 
+import com.oqpo.api.entity.oper.FileEntity;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -54,6 +55,10 @@ public class SpplyEntity implements Serializable {
     private String sysChgDttm;
     private String sysChgId;
 
+    private List<FileEntity> fileBookCopyEntity ;
+
+    private List<FileEntity> fileBsnsRegEntity ;
+
     List<SpplyMgrEntity> spplyMgrInfo ;
 
 }

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

@@ -3,8 +3,10 @@ package com.oqpo.api.service.oper;
 
 import com.oqpo.api.entity.oper.AfflEntity;
 import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
+import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.oper.AfflMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.service.CommonService;
@@ -20,6 +22,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -35,6 +38,10 @@ public class AfflService extends CommonService {
     @Autowired
     private UserMngMapper userMngMapper;
 
+    @Autowired
+    private FileMapper fileMapper;
+
+
     /*
       가맹점 리스트 조회
      */
@@ -95,8 +102,18 @@ public class AfflService extends CommonService {
 
     /* 가맹점 정보 */
     public AfflShopInfoResponse selectAfflShopInfo(String afflShopId) throws Exception {
-        return AfflShopInfoResponse.toDTO(afflMapper.selectAfflShopBaseInfo(afflShopId),
-                  afflMapper.selectAfflSaleTargetList(afflShopId));
+        AfflEntity entity = afflMapper.selectAfflShopBaseInfo(afflShopId);
+        List<AfflSaleInfoEntity> saleList = afflMapper.selectAfflSaleTargetList(afflShopId);
+        List<FileEntity> logFileList = null;
+
+        if (!"".equals(entity.getCmpnyLogoFileNo())) {
+            logFileList = fileMapper.selectFileList(entity.getCmpnyLogoFileNo()) ;
+        } else {
+            logFileList = new ArrayList<FileEntity>();
+        }
+
+        List<FileEntity> nFileList = null;
+        return AfflShopInfoResponse.toDTO(entity,saleList, logFileList );
     }
 
     /* 가맹점 저장 */

src/main/java/com/oqpo/api/service/stinfo/BrandService.java

@@ -2,10 +2,10 @@ package com.oqpo.api.service.stinfo;
 
 
 
-import com.oqpo.api.entity.oper.SaleMgrMgntEntity;
-import com.oqpo.api.entity.oper.UserMngEntity;
+import com.oqpo.api.entity.oper.*;
 import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.mapper.stinfo.BrandMapper;
 import com.oqpo.api.service.CommonService;
@@ -13,6 +13,7 @@ import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.oper.salemgr.SaveSaleMgrMgnlRequest;
 import com.oqpo.api.web.dto.request.stinfo.brand.SaveBrandInfolRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.oper.affl.AfflShopInfoResponse;
 import com.oqpo.api.web.dto.response.oper.salemgr.SaleMgrMgnInfoResponse;
 import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
 import com.oqpo.api.web.dto.response.stinfo.brand.BrandSearchListResponse;
@@ -24,6 +25,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,6 +41,9 @@ public class BrandService extends CommonService {
     @Autowired
     private UserMngMapper userMngMapper;
 
+    @Autowired
+    private FileMapper fileMapper;
+
     /*
       session 브랜드 리스트 조회
      */
@@ -106,7 +111,19 @@ public class BrandService extends CommonService {
 
     /* 브랜드 정보 */
     public BrandInfoResponse selectSaleMgrMgn(String brandId) throws Exception {
-        return BrandInfoResponse.toDTO(brandMapper.selectBrandInfo(brandId));
+
+        BrandEntity entity = brandMapper.selectBrandInfo(brandId);
+        List<FileEntity> logFileList = null;
+
+        if (!"".equals(entity.getBrandLogoFileNo())) {
+            logFileList = fileMapper.selectFileList(entity.getBrandLogoFileNo()) ;
+        } else {
+            logFileList = new ArrayList<FileEntity>();
+        }
+
+        List<FileEntity> nFileList = null;
+        return BrandInfoResponse.toDTO(entity,logFileList );
+
     }
 
     /* 브랜드 저장 */

src/main/java/com/oqpo/api/service/stinfo/SpplyService.java

@@ -3,10 +3,13 @@ package com.oqpo.api.service.stinfo;
 
 import com.oqpo.api.entity.oper.AfflEntity;
 import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
+import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.oper.UserMngEntity;
+import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.entity.stinfo.SpplyEntity;
 import com.oqpo.api.entity.stinfo.SpplyMgrEntity;
 import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.oper.AfflMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.mapper.stinfo.SupplyMapper;
@@ -18,6 +21,7 @@ import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.oper.affl.AfflSearchResponse;
 import com.oqpo.api.web.dto.response.oper.affl.AfflShopInfoResponse;
 import com.oqpo.api.web.dto.response.stinfo.affl.AfflShopBaseInfoSearchResponse;
+import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
 import com.oqpo.api.web.dto.response.stinfo.spply.SpplyInfoResponse;
 import com.oqpo.api.web.dto.response.stinfo.spply.SpplyPopSearchResponse;
 import com.oqpo.api.web.dto.response.stinfo.spply.SpplySearchResponse;
@@ -28,6 +32,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -43,6 +48,9 @@ public class SpplyService extends CommonService {
     @Autowired
     private UserMngMapper userMngMapper;
 
+    @Autowired
+    private FileMapper fileMapper;
+
     /*
       팝업 공급사 리스트 조회
      */
@@ -96,8 +104,27 @@ public class SpplyService extends CommonService {
 
     /* 공급사 정보 */
     public SpplyInfoResponse selectSpplyInfo(String brandId, String spplyId) throws Exception {
-        return SpplyInfoResponse.toDTO(supplyMapper.selectSpplyInfo(brandId, spplyId),
-                supplyMapper.selectSpplyMgrList(spplyId));
+
+        SpplyEntity entity = supplyMapper.selectSpplyInfo(brandId, spplyId);
+        List<SpplyMgrEntity> supplyList = supplyMapper.selectSpplyMgrList(spplyId);
+
+        List<FileEntity> bookCopyFileList = null;
+        List<FileEntity> bsnsRegNoFileList = null;
+
+        if (!"".equals(entity.getBbookCopyFileNo())) {
+            bookCopyFileList = fileMapper.selectFileList(entity.getBbookCopyFileNo()) ;
+        } else {
+            bookCopyFileList = new ArrayList<FileEntity>();
+        }
+
+        if (!"".equals(entity.getBsnsRegFileNo())) {
+            bsnsRegNoFileList = fileMapper.selectFileList(entity.getBsnsRegFileNo()) ;
+        } else {
+            bsnsRegNoFileList = new ArrayList<FileEntity>();
+        }
+
+
+        return SpplyInfoResponse.toDTO(entity,supplyList, bookCopyFileList, bsnsRegNoFileList) ;
     }
 
     /* 공급사 저장 */

src/main/java/com/oqpo/api/web/dto/response/oper/affl/AfflShopInfoResponse.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.oqpo.api.entity.CodeEntity;
 import com.oqpo.api.entity.oper.AfflEntity;
 import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
+import com.oqpo.api.entity.oper.FileEntity;
+import com.oqpo.api.web.dto.response.oper.ntice.NticeResponse;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
@@ -93,10 +95,13 @@ public class AfflShopInfoResponse {
     @ApiModelProperty(value = "기업형태명")
     private String corpTypeNm ;
 
+    @ApiModelProperty(value = "로그파일 정보")
+    private List<AfflShopInfoResponse.FileLogInfo> fileLogNoList;
+
     @ApiModelProperty(value = "영업담당자 리스트")
     private List<AfflSaleInfo> saleList;
 
-    public static AfflShopInfoResponse toDTO(AfflEntity entity, List<AfflSaleInfoEntity> afflSaleList) {
+    public static AfflShopInfoResponse toDTO(AfflEntity entity, List<AfflSaleInfoEntity> afflSaleList, List<FileEntity>  fileLogInfoList) {
         if (entity == null) return null;
         return AfflShopInfoResponse.builder()
                 .afflShopId(entity.getAfflShopId())
@@ -122,6 +127,15 @@ public class AfflShopInfoResponse {
                 .joinSttDt(entity.getJoinSttDt() == null ? "" : entity.getJoinSttDt())
                 .joinEndDt(entity.getJoinEndDt() == null ? "" : entity.getJoinEndDt())
                 .cmpnyLogoFileNo(entity.getCmpnyLogoFileNo() == null ? "" : entity.getCmpnyLogoFileNo())
+                .fileLogNoList(fileLogInfoList.stream()
+                        .map(m -> AfflShopInfoResponse.FileLogInfo.builder()
+                                .fileNo(m.getFileNo())
+                                .fileSeq(m.getFileSeq())
+                                .filePath(m.getFilePath())
+                                .fileNm(m.getFileNm())
+                                .fileOrgNm(m.getFileOrgNm())
+                                .build())
+                        .collect(Collectors.toList()))
                 .corpType(entity.getCorpType() == null ? "" : entity.getCorpType())
                 .corpTypeNm(entity.getCorpTypeNm() == null ? "" : entity.getCorpTypeNm())
                 .saleList(afflSaleList.stream()
@@ -162,5 +176,26 @@ public class AfflShopInfoResponse {
 
         @ApiModelProperty(value = "상태명")
         private String stNm;
+
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class FileLogInfo {
+        @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;
     }
 }

src/main/java/com/oqpo/api/web/dto/response/stinfo/brand/BrandInfoResponse.java

@@ -1,11 +1,16 @@
 package com.oqpo.api.web.dto.response.stinfo.brand;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.oper.SaleMgrMgntEntity;
 import com.oqpo.api.entity.stinfo.BrandEntity;
+import com.oqpo.api.web.dto.response.oper.affl.AfflShopInfoResponse;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 
 @Getter
 @Setter
@@ -101,13 +106,16 @@ public class BrandInfoResponse {
     @ApiModelProperty(value = "시스템변경자")
     private String sysChgId;
 
-    public static BrandInfoResponse toDTO(BrandEntity entity) {
+    @ApiModelProperty(value = "로그파일 정보")
+    private List<BrandInfoResponse.FileLogInfo> fileLogNoList;
+
+    public static BrandInfoResponse toDTO(BrandEntity entity, List<FileEntity>  fileLogInfoList) {
         if (entity == null) return null;
         return BrandInfoResponse.builder()
                 .brandId(entity.getBrandId())
                 .brandNm(entity.getBrandNm())
                 .stCd(entity.getStCd())
-                .stNm(entity.getStNm())
+                .stNm(entity.getStNm() == null ? "" :entity.getStNm())
                 .brandType(entity.getBrandType() == null ? "" :entity.getBrandType())
                 .brandTypeNm(entity.getBrandTypeNm() == null ? "" :entity.getBrandTypeNm())
                 .zipNo(entity.getZipNo() == null ? "" :entity.getZipNo())
@@ -126,6 +134,15 @@ public class BrandInfoResponse {
                 .owacNm(entity.getOwacNm() == null ? "" :entity.getOwacNm())
                 .afflShopId(entity.getAfflShopId() == null ? "" :entity.getAfflShopId())
                 .brandLogoFileNo(entity.getBrandLogoFileNo() == null ? "" :entity.getBrandLogoFileNo())
+                .fileLogNoList(fileLogInfoList.stream()
+                        .map(m -> BrandInfoResponse.FileLogInfo.builder()
+                                .fileNo(m.getFileNo())
+                                .fileSeq(m.getFileSeq())
+                                .filePath(m.getFilePath())
+                                .fileNm(m.getFileNm())
+                                .fileOrgNm(m.getFileOrgNm())
+                                .build())
+                        .collect(Collectors.toList()))
                 .bsnsRegNo(entity.getBsnsRegNo() == null ? "" :entity.getBsnsRegNo())
                 .corpRegNo(entity.getCorpRegNo() == null ? "" :entity.getCorpRegNo())
                 .oqBrandId(entity.getOqBrandId() == null ? "" :entity.getOqBrandId())
@@ -135,4 +152,24 @@ public class BrandInfoResponse {
                 .sysChgId(entity.getSysChgId())
                 .build();
     }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class FileLogInfo {
+        @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;
+    }
 }

src/main/java/com/oqpo/api/web/dto/response/stinfo/spply/SpplyInfoResponse.java

@@ -3,8 +3,10 @@ package com.oqpo.api.web.dto.response.stinfo.spply;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.oqpo.api.entity.oper.AfflEntity;
 import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
+import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.stinfo.SpplyEntity;
 import com.oqpo.api.entity.stinfo.SpplyMgrEntity;
+import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
@@ -135,10 +137,16 @@ public class SpplyInfoResponse {
     @ApiModelProperty(value = "수정자")
     private String sysChgId;
 
+    @ApiModelProperty(value = "통장사본파일 정보")
+    private List<SpplyInfoResponse.FileAddInfo> fileBookCopyNoList;
+
+    @ApiModelProperty(value = "사업자등록증파일  정보")
+    private List<SpplyInfoResponse.FileAddInfo> fileBsnsRegNoList;
+
     @ApiModelProperty(value = "공급사 담당자 리스트")
     private List<SpprMgrInfo> spplyMgrList;
 
-    public static SpplyInfoResponse toDTO(SpplyEntity entity, List<SpplyMgrEntity> spplyMgrList) {
+    public static SpplyInfoResponse toDTO(SpplyEntity entity, List<SpplyMgrEntity> spplyMgrList, List<FileEntity>  fileBookCopyInfoList, List<FileEntity>  fileBsnsRegNoInfoList) {
         if (entity == null) return null;
         return SpplyInfoResponse.builder()
                 .spplyId(entity.getSpplyId())
@@ -173,7 +181,25 @@ public class SpplyInfoResponse {
                 .acctNo(entity.getAcctNo() == null ? "" : entity.getAcctNo() )
                 .owacNm(entity.getOwacNm() == null ? "" :entity.getOwacNm() )
                 .bbookCopyFileNo(entity.getBbookCopyFileNo() == null ? "" : entity.getBbookCopyFileNo())
+                .fileBookCopyNoList(fileBookCopyInfoList.stream()
+                        .map(m -> SpplyInfoResponse.FileAddInfo.builder()
+                                .fileNo(m.getFileNo())
+                                .fileSeq(m.getFileSeq())
+                                .filePath(m.getFilePath())
+                                .fileNm(m.getFileNm())
+                                .fileOrgNm(m.getFileOrgNm())
+                                .build())
+                        .collect(Collectors.toList()))
                 .bsnsRegFileNo(entity.getBsnsRegFileNo() == null ? "" : entity.getBsnsRegFileNo())
+                .fileBsnsRegNoList(fileBsnsRegNoInfoList.stream()
+                        .map(m -> SpplyInfoResponse.FileAddInfo.builder()
+                                .fileNo(m.getFileNo())
+                                .fileSeq(m.getFileSeq())
+                                .filePath(m.getFilePath())
+                                .fileNm(m.getFileNm())
+                                .fileOrgNm(m.getFileOrgNm())
+                                .build())
+                        .collect(Collectors.toList()))
                 .latX(entity.getLatX() == null ? "" :entity.getLatX() )
                 .longY(entity.getLongY() == null ? "" : entity.getLongY() )
                 .sysRegDttm(entity.getSysRegDttm() == null ? "" :entity.getSysRegDttm() )
@@ -221,4 +247,24 @@ public class SpplyInfoResponse {
         private String assgnTaskNm;
 
     }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class FileAddInfo {
+        @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;
+    }
 }